php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 19:52:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,595 Commits 547 Branches 1,481 Tags
dfbcd4e20727b82e5e093d4e8f404aaefd9fbae5
Commit Graph

43799 Commits

Author SHA1 Message Date
Anatol Belski
a64c02fbb5 remove redundant includes 2016-10-20 11:42:23 +02:00
Anatol Belski
ab52afb932 fix Windows compilation 
php.h is included, it contains all the stuff needed and conflicts
otherwise.
 2016-10-20 11:42:23 +02:00
Leigh
f23e99dd07 Merge branch 'PHP-7.1' 2016-10-20 10:18:38 +01:00
Leigh
f5244f336a Merge branch 'PHP-7.0' into PHP-7.1 2016-10-20 10:18:16 +01:00
Leigh
c3361f16c7 Add php_random_int internal API 
This is the internal API compliment to `php_random_bytes`
 2016-10-20 10:18:07 +01:00
Kalle Sommer Nielsen
f38834a180 Fix compiler warnings, always cast to zend_long from sqlite3_int64 when converting to a zval 2016-10-20 10:57:38 +02:00
Kalle Sommer Nielsen
6ca38e8cf8 Ignore the return value of sqlite3->busyTimeout() if their "API Armor" is not enabled. 
The sqlite3_busy_timeout() function can only ever return SQLITE_OK if the armor is not compiled in, which means we can skip this error check
 2016-10-20 10:56:08 +02:00
Joe Watkins
e0b6ac2976 Merge branch 'pull-request/2135' 2016-10-20 05:33:12 +01:00
Joe Watkins
0d768f74b6 Merge branch 'pull-request/2152' 2016-10-20 05:25:03 +01:00
Joe Watkins
5de20ef3ae Merge branch 'pull-request/2152' into PHP-7.1 2016-10-20 05:23:21 +01:00
Joe Watkins
295377630a Merge branch 'pull-request/2152' into PHP-7.0 2016-10-20 05:19:10 +01:00
Dmitry Stogov
03cd0f6b06 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed typo
 2016-10-20 01:17:55 +03:00
Dmitry Stogov
565ce0d41d Fixed typo 2016-10-20 01:17:40 +03:00
Dmitry Stogov
65ea250022 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)
 2016-10-19 23:12:17 +03:00
Dmitry Stogov
9ded1b4edb Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu) 2016-10-19 23:10:42 +03:00
Joe Watkins
3a0872d08f Implement #72612 (libxmlrc uses system malloc instead of PHP alloc routines) 2016-10-19 13:43:31 +01:00
Kalle Sommer Nielsen
d0a3f2e46d Make proc_nice() more in line with that of Unix, as discussed with Anatol 2016-10-18 23:25:59 +02:00
Kalle Sommer Nielsen
e2b52c510e Always include the header for nice() on Windows 2016-10-18 23:14:46 +02:00
Christoph M. Becker
35b19cd2d9 Make this test meaningful 
We're not only checking that hash_update_file() succeeds, but rather
that it properly works.

Furthermore, we fix the SKIPIF section – we don't need mhash to run the
test, and we don't need to check for unsupported PHP versions.

We also shorten the test name to avoid cluttering the test reports with
unnecessary detail.
 2016-10-18 14:57:41 +02:00
Johannes Schlüter
b7fe687914 Install ext/json headers so that other extension can parse, too 2016-10-18 14:48:17 +02:00
Christoph M. Becker
81043bbfea Use our own domains to test getmxrr() 2016-10-18 14:28:49 +02:00
Christoph M. Becker
371f41250c Remove superfluous checks for PNG support 
PNG support is required to build ext/gd, so there's no need to check
for it in the tests.
 2016-10-18 14:17:37 +02:00
Dmitry Stogov
37357d9215 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
  Revert "Fix bug #47890 #73215 uniqid() should use better random source"
  Revert "Fix bug #47890 #73215 uniqid() should use better random source"
  Update NEWS
 2016-10-18 15:10:03 +03:00
Joe Watkins
689cf8b266 Revert "Fix bug #47890 #73215 uniqid() should use better random source" 
This reverts commit 48f1a17886.
 2016-10-18 11:30:33 +01:00
Joe Watkins
8c74be0c52 Revert "Fix bug #47890 #73215 uniqid() should use better random source" 
This reverts commit 48f1a17886.
 2016-10-18 11:30:19 +01:00
Dmitry Stogov
5551cccc92 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed type inference rules.
  Update NEWS
 2016-10-18 12:41:10 +03:00
Dmitry Stogov
ac6134fb64 Fixed type inference rules. 2016-10-18 12:39:33 +03:00
Yasuo Ohgaki
0a67b29a7c Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #47890 #73215 uniqid() should use better random source
 2016-10-18 09:14:57 +09:00
Yasuo Ohgaki
235cb691e1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #47890 #73215 uniqid() should use better random source
 2016-10-18 09:14:48 +09:00
Yasuo Ohgaki
48f1a17886 Fix bug #47890 #73215 uniqid() should use better random source 2016-10-18 09:13:42 +09:00
Christoph M. Becker
209d4220d5 Add PHP bindings for setting and getting the image resolution 
We expose the image resolution related GD functionality to userland
by introducing `imageresolution()` as getter/setter. Given only the
image argument, it returns the current resolution as indexed array.
Given only a second argument, it sets the horizontal and vertical
resolution to this value. Given three arguments, it sets the horizontal
and vertical resolution to the given arguments, respectively.
 2016-10-18 01:53:39 +02:00
Christoph M. Becker
e147eeb4bc Merge branch 'PHP-7.1' 2016-10-18 00:02:18 +02:00
Christoph M. Becker
32123167d1 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-18 00:01:32 +02:00
Yasuo Ohgaki
df845a9155 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Simply return FALSE from session_gc(). Error could be annoying because internal save handlers may return -1 when GC cannot be performed for reasons
 2016-10-18 06:54:10 +09:00
Yasuo Ohgaki
70afe4c494 Simply return FALSE from session_gc(). Error could be annoying because internal save handlers may return -1 when GC cannot be performed for reasons 2016-10-18 06:53:13 +09:00
Christoph M. Becker
0b596f81b8 Merge branch 'PHP-5.6' into PHP-7.0 
We also use ZEND_LONG_(MAX|MIN) now instead of LONG_(MAX|MIN).
 2016-10-17 23:38:28 +02:00
Christoph M. Becker
86e603a664 Fix #73333: 2147483647 is fetched as string 
We return all integers that can be represented as such by PHP as
integers, and only those that exceed the possible range as strings.
On builds which represent integers with 64 bits, the range check is
unnecessary and might cause code checkers to complain, so we skip this
special casing via the preprocessor according to
<http://git.php.net/?p=php-src.git;a=commit;h=99d087e5>.
 2016-10-17 23:34:41 +02:00
Yasuo Ohgaki
843f27b74d Add save handler explanations for documentation purpose 2016-10-18 06:20:03 +09:00
Adam Baratz
82fe200a3f Remove dead code 2016-10-17 17:07:10 -04:00
Dmitry Stogov
f4578d5a0e Merge branch 'PHP-7.1' 
* PHP-7.1:
  Use simple "one-pass" algorithm.
 2016-10-18 00:06:50 +03:00
Dmitry Stogov
ed3196ea35 Use simple "one-pass" algorithm. 2016-10-18 00:06:20 +03:00
Andrey Hristov
0b7ecd6f10 Merge branch 'PHP-7.1' 2016-10-17 19:31:43 +03:00
Andrey Hristov
47993d0c59 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-17 19:31:29 +03:00
Andrey Hristov
2b047617af Merge branch 'PHP-5.6' into PHP-7.0 2016-10-17 19:30:08 +03:00
Andrey Hristov
543cc08a75 Lower the value to 24 hours from 1 year, which due to a overflow in 
php_tvtoto (bug#71507) is just 17 days.
 2016-10-17 19:25:01 +03:00
Andrey Hristov
d8ede80c7a Merge branch 'master' of git.php.net:php-src 2016-10-17 19:12:56 +03:00
Andrey Hristov
23f500191d Merge branch 'PHP-7.1' 2016-10-17 19:12:33 +03:00
Andrey Hristov
7108db3022 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-17 19:11:54 +03:00
Joe Watkins
dcae3ce1e6 Merge branch 'pull-request/1817' 2016-10-17 17:02:22 +01:00
Joe Watkins
4dfd5f4403 Merge branch 'pull-request/1816' 2016-10-17 17:02:19 +01:00