php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
98,691 Commits 547 Branches 1,481 Tags
64fee0aecb2c804a088b896da6f736dbc19d8424
Commit Graph

43238 Commits

Author SHA1 Message Date
Nikita Popov
736633310c Merge branch 'PHP-7.0' into PHP-7.1 2016-10-20 13:26:34 +02:00
Adam Saponara
55d17662cb Fix bug #71241: array_replace_recursive mutates ref params 
`array_replace_recursive` can sometimes mutate its params if
references are nested within. This differs from the PHP 5 behavior.
 2016-10-20 13:22:04 +02: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
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
565ce0d41d Fixed typo 2016-10-20 01:17:40 +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
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
ac6134fb64 Fixed type inference rules. 2016-10-18 12:39:33 +03: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
32123167d1 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-18 00:01:32 +02: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
Dmitry Stogov
ed3196ea35 Use simple "one-pass" algorithm. 2016-10-18 00:06:20 +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
Joe Watkins
d6fb5a1f1e Merge branch 'pull-request/1814' 2016-10-17 17:02:13 +01:00
Joe Watkins
b274be5d9d Merge branch 'pull-request/1808' 2016-10-17 17:02:07 +01:00
Joe Watkins
39ee3184ee Merge branch 'pull-request/1817' 2016-10-17 17:01:39 +01:00
Joe Watkins
5eb84337a6 Merge branch 'pull-request/1816' 2016-10-17 17:01:28 +01:00
Joe Watkins
522e4f1174 Merge branch 'pull-request/1814' 2016-10-17 17:01:10 +01:00
Joe Watkins
6806a41e7f Merge branch 'pull-request/1808' 2016-10-17 17:00:50 +01:00
Remi Collet
0820c94382 also fix 32bits test for microsecond 2016-10-17 15:07:56 +02:00
Christopher Jones
23e2c356b7 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-17 12:40:54 +11:00
Christopher Jones
8be59a1301 Fixed bug #71148 (Bind reference overwritten on PHP 7) 2016-10-17 12:40:14 +11:00
Nikita Popov
9f472ba5e3 Various function info fixes 2016-10-15 23:58:31 +02:00
Nikita Popov
659cc278e2 Various RC inference fixes 2016-10-15 23:58:29 +02:00
Nikita Popov
1903fc6298 Fix SplFixedArray::offsetGet() invocation for NULL offset 2016-10-15 23:58:28 +02:00
Nikita Popov
b1fc1fb937 Normalize preg_replace_callback() return value 
One particular error case was returning the argument without
casting to string.
 2016-10-15 23:58:26 +02:00
Christoph M. Becker
663491b9ba Update to SQLite 3.15.0 2016-10-15 19:46:00 +02:00
Remi Collet
20b1029e4c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  bump ext/zip version
 2016-10-14 17:31:26 +02:00
Remi Collet
f1cf340e19 bump ext/zip version 2016-10-14 17:31:07 +02:00
Remi Collet
aecd165b8f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  use zend_error instead of zend_error_noreturn
 2016-10-14 10:54:47 +02:00
Remi Collet
428ef50838 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  use zend_error instead of zend_error_noreturn
 2016-10-14 10:54:09 +02:00
Remi Collet
e1f5b6d8df use zend_error instead of zend_error_noreturn 2016-10-14 10:53:40 +02:00
Keith Smiley
3b9ba6195d soap #69137 - Invert logic to be correct 2016-10-13 23:56:24 -04:00
Anatol Belski
dd604015be rename publicly exposed symbol to avoid name conflicts 
(cherry picked from commit 730288ae41)
 2016-10-14 02:08:14 +02:00
Anatol Belski
c79f9a4e49 fix gettimeofday proto availability 
(cherry picked from commit 79f7d174d0)
 2016-10-14 02:03:02 +02:00
Christoph M. Becker
0864915550 Fix #73280: Stack Buffer Overflow in GD dynamicGetbuf 
We make sure to never pass a negative `rlen` as size to memcpy().

Cf. <https://github.com/libgd/libgd/commit/53110871>.

(cherry picked from commit cc08cbc84d)
 2016-10-14 02:02:42 +02:00
Anatol Belski
20b63996c0 fix test 
(cherry picked from commit 57354e0313)
 2016-10-14 02:01:53 +02:00
Stanislav Malyshev
177e6adca7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix outlen for openssl function
  Syncronize with 5.6 - __toString should return ""
  Fix potential overflows in php_pcre_replace_impl

(cherry picked from commit ff75665663)
 2016-10-14 01:58:48 +02:00
Stanislav Malyshev
94b7ab185c Syncronize with 5.6 - __toString should return "" 
(cherry picked from commit 2301608736)
 2016-10-14 01:58:08 +02:00
Stanislav Malyshev
0362d61ab7 Fix potential overflows in php_pcre_replace_impl 
(cherry picked from commit 9c50ba42d6)
 2016-10-14 01:57:55 +02:00
Keith Smiley
ddaf04053b Fixed bug #73237 
If the response includes both fields with simple types (which get
concatenated into an XML string) and a complex type (which is parsed
into an object), then the object will parsed into the same zval as the
simple types and will overwrite the string.

(cherry picked from commit 26287132c0)
 2016-10-14 01:57:04 +02:00
Mitch Hagstrand
01a280a9c7 Fixed bug in zend_accel_error() and cleaned up kill_all_lockers() 
1. zend_accel_error was only executing clean up if log_verbosity_level is high enough to log
2. Cleaned up kill_all_lockers function and fixed comments.

(cherry picked from commit bcee2fdbec)
 2016-10-14 01:56:01 +02:00
Anatol Belski
6f9c3b4558 update len in fallback cases 
(cherry picked from commit 58b18892bf)
 2016-10-14 01:49:55 +02:00