Stricted [Mon, 7 Nov 2016 15:23:02 +0000 (16:23 +0100)]
fix erroneous line in confutils.js
Nikita Popov [Thu, 10 Nov 2016 20:36:46 +0000 (21:36 +0100)]
Fcall optimization: Avoid FETCH_DIM_R with UNUSED op2
Dmitry Stogov [Thu, 10 Nov 2016 09:32:07 +0000 (12:32 +0300)]
Don't update proprties inplace.
Anatol Belski [Wed, 9 Nov 2016 20:34:41 +0000 (21:34 +0100)]
add missing NEWS entry
Anatol Belski [Wed, 9 Nov 2016 20:34:16 +0000 (21:34 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
add missing NEWS entry
Anatol Belski [Wed, 9 Nov 2016 20:32:44 +0000 (21:32 +0100)]
add missing NEWS entry
Anatol Belski [Wed, 9 Nov 2016 10:19:13 +0000 (11:19 +0100)]
sync NEWS
Ferenc Kovacs [Wed, 9 Nov 2016 01:16:32 +0000 (02:16 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 9 Nov 2016 01:12:16 +0000 (02:12 +0100)]
add missing NEWS entries
Anatol Belski [Tue, 8 Nov 2016 11:16:39 +0000 (12:16 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix memory leak
Anatol Belski [Tue, 8 Nov 2016 11:12:58 +0000 (12:12 +0100)]
fix memory leak
Anatol Belski [Tue, 8 Nov 2016 10:13:29 +0000 (11:13 +0100)]
Merge remote-tracking branch 'phpsec/PHP-7.0.13' into PHP-7.0
* phpsec/PHP-7.0.13:
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
Fix #72696: imagefilltoborder stackoverflow on truecolor images
Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
Fix bug #73144 and bug #73341 - remove extra dtor
remove unreferenced var came in with merge
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
fix version
set versions
Anatol Belski [Tue, 8 Nov 2016 10:11:22 +0000 (11:11 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
Fix #72696: imagefilltoborder stackoverflow on truecolor images
Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
Fix bug #73144 and bug #73341 - remove extra dtor
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
Anatol Belski [Tue, 8 Nov 2016 10:06:52 +0000 (11:06 +0100)]
Merge remote-tracking branch 'phpsec/PHP-5.6.28' into PHP-5.6
Anatol Belski [Tue, 8 Nov 2016 01:26:43 +0000 (02:26 +0100)]
Enable FTS4 and FTS5 for bundled libsqlite
FTS3 is already enabled by default, and the other FTS versions
seems just to have been missed. Given that, the other FTS plugins
look like a low impact so worth a try. The current bundled libsqlite
versions in 7.x are proven stable already and support FTS5.
Anatol Belski [Mon, 7 Nov 2016 20:09:03 +0000 (21:09 +0100)]
avoid unneeded copying
Anatol Belski [Mon, 7 Nov 2016 19:47:06 +0000 (20:47 +0100)]
update NEWS
Anatol Belski [Mon, 7 Nov 2016 19:39:51 +0000 (20:39 +0100)]
Add test for bug #73448
Anatol Belski [Mon, 7 Nov 2016 19:18:29 +0000 (20:18 +0100)]
Fixed bug #73448 odbc_errormsg returns trash, always 513 bytes
Jakub Zelenka [Sun, 6 Nov 2016 20:43:50 +0000 (20:43 +0000)]
Merge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Sun, 6 Nov 2016 20:40:51 +0000 (20:40 +0000)]
Fix bug #72776 (Invalid parameter in memcpy function trough openssl_pbkdf2)
Anatol Belski [Sun, 6 Nov 2016 16:56:14 +0000 (17:56 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
add missing RETURN_STRINGL_CHECK
Anatol Belski [Sun, 6 Nov 2016 16:51:25 +0000 (17:51 +0100)]
add missing RETURN_STRINGL_CHECK
As RETVAL_STRINGL_CHECK is already there, this one is needed for
completion. One place in ext/bz2 is missing that, so it will likely
be useful for other possible fixes.
Anatol Belski [Sun, 6 Nov 2016 16:11:19 +0000 (17:11 +0100)]
update NEWS
Nikita Popov [Sun, 23 Oct 2016 19:37:36 +0000 (21:37 +0200)]
Complete the fix of bug #70172 for PHP 7
Dorin Marcoci [Fri, 4 Nov 2016 11:15:01 +0000 (13:15 +0200)]
Fix blob parameters binding. Fixes: #73087, #61183, #71494
Adjusted formatting according to requirements
Test case for bug #73087
Stanislav Malyshev [Sat, 5 Nov 2016 20:20:24 +0000 (13:20 -0700)]
More int->size_t and string overflow fixes
Anatol Belski [Fri, 4 Nov 2016 17:42:36 +0000 (18:42 +0100)]
rename the tmp ini file, to keep it consistent with m4 variant
Anatol Belski [Fri, 4 Nov 2016 17:38:22 +0000 (18:38 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix dir separator in test
Anatol Belski [Fri, 4 Nov 2016 17:29:54 +0000 (18:29 +0100)]
fix dir separator in test
Anatol Belski [Fri, 4 Nov 2016 12:10:52 +0000 (13:10 +0100)]
fix dir separator
Stanislav Malyshev [Fri, 4 Nov 2016 05:12:23 +0000 (22:12 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Add length check for bzcompress too - fix for bug #73356
Stanislav Malyshev [Fri, 4 Nov 2016 05:10:22 +0000 (22:10 -0700)]
Add length check for bzcompress too - fix for bug #73356
Stanislav Malyshev [Fri, 4 Nov 2016 05:05:25 +0000 (22:05 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
More string length checks & fixes
Stanislav Malyshev [Fri, 4 Nov 2016 03:36:52 +0000 (20:36 -0700)]
More string length checks & fixes
Stanislav Malyshev [Fri, 4 Nov 2016 03:45:13 +0000 (20:45 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
More string length checks & fixes
Stanislav Malyshev [Fri, 4 Nov 2016 03:36:52 +0000 (20:36 -0700)]
More string length checks & fixes
Derick Rethans [Thu, 3 Nov 2016 17:57:31 +0000 (13:57 -0400)]
Updated to version 2016.9 (2016i)
Derick Rethans [Thu, 3 Nov 2016 17:57:30 +0000 (13:57 -0400)]
Empty merge
Derick Rethans [Thu, 3 Nov 2016 17:57:28 +0000 (13:57 -0400)]
Updated to version 2016.9 (2016i)
Anatol Belski [Thu, 3 Nov 2016 16:03:23 +0000 (17:03 +0100)]
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
(cherry picked from commit
99b242a6d093bca1f64084866b4491061de57553)
Anatol Belski [Thu, 3 Nov 2016 16:03:23 +0000 (17:03 +0100)]
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
Xinchen Hui [Wed, 2 Nov 2016 04:11:30 +0000 (12:11 +0800)]
Fixed bug #73423 (Reproducible crash with GDB backtrace)
Christoph M. Becker [Tue, 1 Nov 2016 19:24:10 +0000 (20:24 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 1 Nov 2016 19:13:53 +0000 (20:13 +0100)]
Fix #73436: Setting allow_url_fopen to Off makes several tests fail
We make sure that these tests run with allow_url_fopen=1.
Anatol Belski [Tue, 1 Nov 2016 12:50:46 +0000 (13:50 +0100)]
add run target
With this it is possible to run some code with the currently compiled
PHP and all the required environment included.
Christoph M. Becker [Tue, 25 Oct 2016 11:23:16 +0000 (13:23 +0200)]
Fix #72696: imagefilltoborder stackoverflow on truecolor images
We must not allow negative color values be passed to
gdImageFillToBorder(), because that can lead to infinite recursion
since the recursion termination condition will not necessarily be met.
(cherry picked from commit
863d37ea66d5c960db08d6f4a2cbd2518f0f80d1)
Christoph M. Becker [Tue, 25 Oct 2016 13:14:22 +0000 (15:14 +0200)]
Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
Instead of rolling our own bounds check we use clip_1d() as it's done
in gdImageLine() and in external libgd. We must not pass the image
width and height, respectively, but rather the largest ordinate value
that is allowed to be accessed, i.e. width-1 and height-1,
respectively.
(cherry picked from commit
6499581af76cfe986e12330faabb3a7c36d45ffc)
Stanislav Malyshev [Mon, 24 Oct 2016 04:56:35 +0000 (21:56 -0700)]
Fix bug #73144 and bug #73341 - remove extra dtor
(cherry picked from commit
f74d7d92c8bc1edc2505e0b58546217e9e1ecb40)
Conflicts:
ext/spl/spl_array.c
Merged the test only, in 7.0 tree the removed dtor call is already
not present.
Anatol Belski [Tue, 1 Nov 2016 11:55:05 +0000 (12:55 +0100)]
remove unreferenced var came in with merge
Stanislav Malyshev [Mon, 24 Oct 2016 03:07:47 +0000 (20:07 -0700)]
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
Proper soltion would be to call serialize/unserialize and deal with the result,
but this requires more work that should be done by wddx maintainer (not me).
(cherry picked from commit
6045de69c7dedcba3eadf7c4bba424b19c81d00d)
Conflicts:
ext/wddx/wddx.c
Christoph M. Becker [Tue, 25 Oct 2016 11:23:16 +0000 (13:23 +0200)]
Fix #72696: imagefilltoborder stackoverflow on truecolor images
We must not allow negative color values be passed to
gdImageFillToBorder(), because that can lead to infinite recursion
since the recursion termination condition will not necessarily be met.
Christoph M. Becker [Tue, 25 Oct 2016 13:14:22 +0000 (15:14 +0200)]
Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
Instead of rolling our own bounds check we use clip_1d() as it's done
in gdImageLine() and in external libgd. We must not pass the image
width and height, respectively, but rather the largest ordinate value
that is allowed to be accessed, i.e. width-1 and height-1,
respectively.
Anatol Belski [Sun, 30 Oct 2016 20:22:24 +0000 (21:22 +0100)]
prefer symbols read from the bin to those matching the naming scheme
Anatol Belski [Sun, 30 Oct 2016 20:12:50 +0000 (21:12 +0100)]
remove debug out
Anatol Belski [Sun, 30 Oct 2016 19:55:38 +0000 (20:55 +0100)]
fix link with deps pdb availability
Unlike debugger, linker is currently not able to read the pdb files,
even if they're put onto path. As result, a lot of LNK4099 warnings
and in some cases also missing debug information in the end binaries.
This is solved by copying the relevant pdb into the build dir, which
then can be picked up on link time. This also leads to the inclusion
of those pdb files into the debug package, so symbols won't be missed
in crash dumps. As otherwise the debug info for dependencies is only
contained in the dependency packages.
Anatol Belski [Sun, 30 Oct 2016 14:28:56 +0000 (15:28 +0100)]
use rather the makefile var
Anatol Belski [Sun, 30 Oct 2016 14:22:45 +0000 (15:22 +0100)]
rename the env setting target and reuse it for build-snap
Bob Weinand [Sat, 29 Oct 2016 16:49:38 +0000 (18:49 +0200)]
Fixed build failure introduced by PR #2158
Note: AC_TRY_LINK interprets the source as part of a main function, ending up with int main() { /* ... */ int main() { /* ... */ } ; return 0; } here - Using AC_LINK_IFELSE with AC_LANG_SOURCE directly instead.
Anatol Belski [Sat, 29 Oct 2016 12:57:15 +0000 (14:57 +0200)]
fix condition
Xinchen Hui [Sat, 29 Oct 2016 15:43:59 +0000 (23:43 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #73402 (Opcache segfault when using class constant to call a method)
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
Xinchen Hui [Sat, 29 Oct 2016 15:41:51 +0000 (23:41 +0800)]
Fixed bug #73402 (Opcache segfault when using class constant to call a method)
Xinchen Hui [Sat, 29 Oct 2016 06:23:25 +0000 (14:23 +0800)]
Skip if no jit is built
Anatol Belski [Sat, 29 Oct 2016 01:17:29 +0000 (03:17 +0200)]
fix test run with autogenerated ini
Anatol Belski [Sat, 29 Oct 2016 00:08:48 +0000 (02:08 +0200)]
generate test ini file, so shared exts are loaded for nmake test
Anatol Belski [Fri, 28 Oct 2016 21:11:47 +0000 (23:11 +0200)]
additional env is generated for phpize, too
Xinchen Hui [Fri, 28 Oct 2016 13:21:24 +0000 (21:21 +0800)]
Fixed bug #73392 (A use-after-free in zend allocator management)
Ferenc Kovacs [Thu, 27 Oct 2016 21:37:51 +0000 (23:37 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Thu, 27 Oct 2016 21:10:59 +0000 (23:10 +0200)]
5.6.29 will be next
Anatol Belski [Thu, 27 Oct 2016 20:34:34 +0000 (22:34 +0200)]
use rather the nmake var as it's evaluated on every run
Anatol Belski [Thu, 27 Oct 2016 18:41:41 +0000 (20:41 +0200)]
prepend known bin folders to the path for nmake test runs
Anatol Belski [Thu, 27 Oct 2016 00:40:30 +0000 (02:40 +0200)]
yet another uninitialized pointer
Anatol Belski [Thu, 27 Oct 2016 00:15:14 +0000 (02:15 +0200)]
fix uninitialized pointer
Dmitry Stogov [Wed, 26 Oct 2016 12:17:09 +0000 (15:17 +0300)]
Fixded bug #72736 (Slow performance when fetching large dataset with mysqli / PDO)
Anatol Belski [Wed, 26 Oct 2016 11:05:03 +0000 (13:05 +0200)]
make config.w32 compatible with ICU 58
Christoph M. Becker [Tue, 25 Oct 2016 12:30:59 +0000 (14:30 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 25 Oct 2016 12:19:36 +0000 (14:19 +0200)]
Fix #72494: imagecropauto out-of-bounds access
This issue has actually already been fixed with commit
46f2c690. We're
adding a regression test and a NEWS entry, and also port the fix in
gdImageCropThreshold() from libgd:
* <https://github.com/libgd/libgd/commit/
b347e034>
* <https://github.com/libgd/libgd/commit/
46f2c690>
Anatol Belski [Tue, 25 Oct 2016 09:18:07 +0000 (11:18 +0200)]
fix version
Anatol Belski [Tue, 25 Oct 2016 08:40:23 +0000 (10:40 +0200)]
set versions
Anatol Belski [Tue, 25 Oct 2016 08:29:51 +0000 (10:29 +0200)]
move dev to 7.0.14
Derick Rethans [Mon, 24 Oct 2016 09:37:13 +0000 (10:37 +0100)]
Updated to version 2016.8 (2016h)
Derick Rethans [Mon, 24 Oct 2016 09:37:12 +0000 (10:37 +0100)]
Empty merge
Derick Rethans [Mon, 24 Oct 2016 09:37:07 +0000 (10:37 +0100)]
Updated to version 2016.8 (2016h)
Stanislav Malyshev [Mon, 24 Oct 2016 04:56:35 +0000 (21:56 -0700)]
Fix bug #73144 and bug #73341 - remove extra dtor
Stanislav Malyshev [Mon, 24 Oct 2016 03:07:47 +0000 (20:07 -0700)]
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
Proper soltion would be to call serialize/unserialize and deal with the result,
but this requires more work that should be done by wddx maintainer (not me).
Nikita Popov [Sun, 23 Oct 2016 20:26:25 +0000 (22:26 +0200)]
Xinchen Hui [Sat, 22 Oct 2016 06:50:21 +0000 (14:50 +0800)]
Fixed bug #73350 (Exception::__toString() cause circular references)
Adam Saponara [Fri, 26 Aug 2016 21:33:22 +0000 (17:33 -0400)]
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.
Leigh [Wed, 19 Oct 2016 17:00:54 +0000 (18:00 +0100)]
Add php_random_int internal API
This is the internal API compliment to `php_random_bytes`
Joe Watkins [Thu, 20 Oct 2016 04:21:56 +0000 (05:21 +0100)]
news entry for #pr 2152
Joe Watkins [Thu, 20 Oct 2016 04:19:10 +0000 (05:19 +0100)]
Merge branch 'pull-request/2152' into PHP-7.0
Anatol Belski [Tue, 18 Oct 2016 17:43:12 +0000 (19:43 +0200)]
update NEWS
Anatol Belski [Tue, 18 Oct 2016 17:11:18 +0000 (19:11 +0200)]
Fixed bug #73329 (Float)"Nano" == NAN
The special cases (float)"inf", etc. were never intended and are
caused by the updated strtod lib. While it might be nice as an
easy way to produce Inf and NaN special values, it was never
documented and cause BC breaches.
Anatol Belski [Tue, 18 Oct 2016 16:18:04 +0000 (18:18 +0200)]
sync NEWS
48f1a178 is reverted
Bob Weinand [Tue, 18 Oct 2016 12:13:20 +0000 (14:13 +0200)]
Fixed bug #73338 (Exception thrown from error handler may crash)
Dmitry Stogov [Tue, 18 Oct 2016 12:04:49 +0000 (15:04 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
Dmitry Stogov [Tue, 18 Oct 2016 11:48:01 +0000 (14:48 +0300)]
Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
Joe Watkins [Tue, 18 Oct 2016 10:30:19 +0000 (11:30 +0100)]
Revert "Fix bug #47890 #73215 uniqid() should use better random source"
This reverts commit
48f1a17886d874dc90867c669481804de90509e8.
Yasuo Ohgaki [Tue, 18 Oct 2016 00:28:18 +0000 (09:28 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 18 Oct 2016 00:04:57 +0000 (09:04 +0900)]
Fix bug #47890 #73215 uniqid() should use better random source