]>
granicus.if.org Git - php/log
Richard Fussenegger [Sun, 26 Jun 2016 15:51:44 +0000 (17:51 +0200)]
Added editorconfig file
Xinchen Hui [Sat, 25 Jun 2016 01:08:28 +0000 (18:08 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 25 Jun 2016 01:08:16 +0000 (18:08 -0700)]
Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify router.php)
Dmitry Stogov [Fri, 24 Jun 2016 16:32:24 +0000 (19:32 +0300)]
Fallback to kill() if raise() doesn't work
Dmitry Stogov [Fri, 24 Jun 2016 15:00:47 +0000 (18:00 +0300)]
Add temporary workaround for raise() failure
Xinchen Hui [Fri, 24 Jun 2016 13:15:00 +0000 (21:15 +0800)]
Fixed unused var
Xinchen Hui [Fri, 24 Jun 2016 13:14:02 +0000 (21:14 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed format
Conflicts:
ext/opcache/zend_shared_alloc.c
Xinchen Hui [Fri, 24 Jun 2016 13:13:04 +0000 (21:13 +0800)]
Fixed format
Dmitry Stogov [Fri, 24 Jun 2016 09:20:41 +0000 (12:20 +0300)]
Added ability to make non-local control transfer through interrupt function
Xinchen Hui [Fri, 24 Jun 2016 05:56:41 +0000 (13:56 +0800)]
Update NEWS
Anatol Belski [Thu, 23 Jun 2016 14:47:04 +0000 (16:47 +0200)]
improve ZEND_MODULE_GLOBALS_BULK macro, fix data type
Anatol Belski [Wed, 22 Jun 2016 13:51:59 +0000 (15:51 +0200)]
remove unused declarations
Xinchen Hui [Thu, 23 Jun 2016 12:59:28 +0000 (20:59 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
typo
Turn safe timeout handling into general interrupt handling ability.
Fixed compilation warnings
yet another test rewrite
Add additional LDAP SASL constants
Add tests for LDAP_OPT_* constants
Add LDAP TLS Protocol Min constants
Add tests for the LDAP CRL check option
Add missing LDAP constants
Xinchen Hui [Thu, 23 Jun 2016 12:58:45 +0000 (20:58 +0800)]
Use zend_sort in array_multisort (tests change is expected)
Dmitry Stogov [Thu, 23 Jun 2016 12:22:08 +0000 (15:22 +0300)]
typo
Dmitry Stogov [Thu, 23 Jun 2016 12:01:23 +0000 (15:01 +0300)]
Turn safe timeout handling into general interrupt handling ability.
Dmitry Stogov [Thu, 23 Jun 2016 09:47:06 +0000 (12:47 +0300)]
Fixed compilation warnings
Anatol Belski [Thu, 23 Jun 2016 07:42:50 +0000 (09:42 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
yet another test rewrite
Anatol Belski [Thu, 23 Jun 2016 07:42:17 +0000 (09:42 +0200)]
yet another test rewrite
Côme Bernigaud [Thu, 23 Jun 2016 07:13:40 +0000 (09:13 +0200)]
Merge branch 'PHP-7.1.0'
* PHP-7.1.0:
Add additional LDAP SASL constants
Add tests for LDAP_OPT_* constants
Add LDAP TLS Protocol Min constants
Add tests for the LDAP CRL check option
Add missing LDAP constants
Xinchen Hui [Thu, 23 Jun 2016 06:07:31 +0000 (14:07 +0800)]
Update NEWS
Xinchen Hui [Thu, 23 Jun 2016 06:07:08 +0000 (14:07 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72476 (Memleak in jit_stack)
Xinchen Hui [Thu, 23 Jun 2016 06:06:48 +0000 (14:06 +0800)]
Fixed bug #72476 (Memleak in jit_stack)
Côme Bernigaud [Thu, 23 Jun 2016 05:22:40 +0000 (07:22 +0200)]
Merge branch 'pull-request/1946' into PHP-7.1.0
* pull-request/1946:
Add additional LDAP SASL constants
Add tests for LDAP_OPT_* constants
Add LDAP TLS Protocol Min constants
Add tests for the LDAP CRL check option
Add missing LDAP constants
Anatol Belski [Wed, 22 Jun 2016 18:20:48 +0000 (20:20 +0200)]
update NEWS
Anatol Belski [Wed, 22 Jun 2016 18:19:57 +0000 (20:19 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Wed, 22 Jun 2016 18:19:09 +0000 (20:19 +0200)]
update NEWS
Anatol Belski [Wed, 22 Jun 2016 17:47:59 +0000 (19:47 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
rewrite test
Anatol Belski [Wed, 22 Jun 2016 17:46:02 +0000 (19:46 +0200)]
rewrite test
Anatol Belski [Wed, 22 Jun 2016 17:10:57 +0000 (19:10 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72463 mail fails with invalid argument
Anatol Belski [Wed, 22 Jun 2016 17:05:31 +0000 (19:05 +0200)]
Fixed bug #72463 mail fails with invalid argument
Joe Watkins [Wed, 22 Jun 2016 15:07:16 +0000 (16:07 +0100)]
Merge branch 'master' of https://github.com/php/php-src
Joe Watkins [Wed, 22 Jun 2016 15:07:01 +0000 (16:07 +0100)]
Merge branch 'PHP-7.1.0'
* PHP-7.1.0:
merge news entries from 5.5
Joe Watkins [Wed, 22 Jun 2016 14:55:16 +0000 (15:55 +0100)]
merge news entries from 5.5
Dmitry Stogov [Wed, 22 Jun 2016 14:28:59 +0000 (17:28 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Allow "proxy" ovjects to substitute their class names through get_class_name() handler (similar to var_dump() and others).
Dmitry Stogov [Wed, 22 Jun 2016 14:23:04 +0000 (17:23 +0300)]
Allow "proxy" ovjects to substitute their class names through get_class_name() handler (similar to var_dump() and others).
Dmitry Stogov [Wed, 22 Jun 2016 14:22:06 +0000 (17:22 +0300)]
Regenerated html_tables.h to fix compilation warnings
Julien Pauli [Tue, 21 Jun 2016 10:45:49 +0000 (12:45 +0200)]
Fixed parse_url() for better compliance with RFC3986
Anatol Belski [Wed, 22 Jun 2016 10:23:24 +0000 (12:23 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix test cleanup
Anatol Belski [Wed, 22 Jun 2016 10:22:03 +0000 (12:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix test cleanup
Anatol Belski [Wed, 22 Jun 2016 10:20:02 +0000 (12:20 +0200)]
fix test cleanup
Anatol Belski [Wed, 22 Jun 2016 09:45:30 +0000 (11:45 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix dir separator in test
Anatol Belski [Wed, 22 Jun 2016 09:44:14 +0000 (11:44 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix dir separator in test
Anatol Belski [Wed, 22 Jun 2016 09:41:05 +0000 (11:41 +0200)]
fix dir separator in test
Anatol Belski [Wed, 22 Jun 2016 06:41:39 +0000 (08:41 +0200)]
fix test
Joe Watkins [Wed, 22 Jun 2016 05:33:20 +0000 (06:33 +0100)]
bump version after release
Joe Watkins [Wed, 22 Jun 2016 05:30:30 +0000 (06:30 +0100)]
bump version for release
Ferenc Kovacs [Wed, 22 Jun 2016 01:09:18 +0000 (03:09 +0200)]
Merge branch 'PHP-7.0'
Ferenc Kovacs [Wed, 22 Jun 2016 01:08:10 +0000 (03:08 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 22 Jun 2016 01:03:01 +0000 (03:03 +0200)]
update NEWS
Dmitry Stogov [Tue, 21 Jun 2016 21:56:56 +0000 (00:56 +0300)]
Fixed test according to FR #46600 ("_empty_" key in objects)
Dmitry Stogov [Tue, 21 Jun 2016 21:40:50 +0000 (00:40 +0300)]
Fixed compilation warnings
Dmitry Stogov [Tue, 21 Jun 2016 17:14:19 +0000 (20:14 +0300)]
Enable Zend signals by default
Dmitry Stogov [Tue, 21 Jun 2016 17:12:29 +0000 (20:12 +0300)]
Fixed compilation warnings
Dmitry Stogov [Tue, 21 Jun 2016 17:12:04 +0000 (20:12 +0300)]
Restored signed format specifier
Dmitry Stogov [Tue, 21 Jun 2016 17:10:44 +0000 (20:10 +0300)]
Revert "sync tests with the latest format fixes"
This reverts commit
ef7116d55b82e8bfb93f410105ad244c401fbebb .
Anatol Belski [Tue, 21 Jun 2016 17:06:28 +0000 (19:06 +0200)]
sync tests with the latest format fixes
Anatol Belski [Tue, 21 Jun 2016 16:58:11 +0000 (18:58 +0200)]
fix include order
Anatol Belski [Tue, 21 Jun 2016 15:43:27 +0000 (17:43 +0200)]
fix typos
Anatol Belski [Tue, 21 Jun 2016 15:25:12 +0000 (17:25 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix two remaining tests
Anatol Belski [Tue, 21 Jun 2016 15:24:08 +0000 (17:24 +0200)]
fix two remaining tests
Dmitry Stogov [Tue, 21 Jun 2016 14:56:07 +0000 (17:56 +0300)]
Fixed compilation warnings
Anatol Belski [Tue, 21 Jun 2016 14:23:50 +0000 (16:23 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix test
Anatol Belski [Tue, 21 Jun 2016 14:22:51 +0000 (16:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix test
Anatol Belski [Tue, 21 Jun 2016 14:20:03 +0000 (16:20 +0200)]
fix test
There is a difference between TS and NTS warning message, since
virtual_mkdir vs glibc directly is used. This has no effect for
the actual fix functionality.
Dmitry Stogov [Tue, 21 Jun 2016 13:55:59 +0000 (16:55 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
re-fix leak
re-fix leak
Revert "fix leak"
Revert "fix leak"
Dmitry Stogov [Tue, 21 Jun 2016 13:55:17 +0000 (16:55 +0300)]
Fixed compilation warnings
Anatol Belski [Tue, 21 Jun 2016 13:22:31 +0000 (15:22 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
re-fix leak
re-fix leak
Revert "fix leak"
Anatol Belski [Tue, 21 Jun 2016 13:21:58 +0000 (15:21 +0200)]
re-fix leak
Anatol Belski [Tue, 21 Jun 2016 13:21:26 +0000 (15:21 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
re-fix leak
Revert "fix leak"
Anatol Belski [Tue, 21 Jun 2016 13:18:10 +0000 (15:18 +0200)]
re-fix leak
Anatol Belski [Tue, 21 Jun 2016 13:14:22 +0000 (15:14 +0200)]
Merge branch 'master' of git.php.net:php-src
Dmitry Stogov [Tue, 21 Jun 2016 13:00:37 +0000 (16:00 +0300)]
Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
Anatol Belski [Tue, 21 Jun 2016 12:59:56 +0000 (14:59 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Revert "fix leak"
Anatol Belski [Tue, 21 Jun 2016 12:58:15 +0000 (14:58 +0200)]
Anatol Belski [Tue, 21 Jun 2016 12:51:43 +0000 (14:51 +0200)]
Anatol Belski [Tue, 21 Jun 2016 11:27:09 +0000 (13:27 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix leak
fix leak
Anatol Belski [Tue, 21 Jun 2016 11:26:34 +0000 (13:26 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak
Anatol Belski [Tue, 21 Jun 2016 11:26:12 +0000 (13:26 +0200)]
fix leak
Anatol Belski [Tue, 21 Jun 2016 10:29:41 +0000 (12:29 +0200)]
fix leak
Remi Collet [Tue, 21 Jun 2016 09:17:08 +0000 (11:17 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
bump zip version
Remi Collet [Tue, 21 Jun 2016 09:16:21 +0000 (11:16 +0200)]
bump zip version
Anatol Belski [Tue, 21 Jun 2016 07:55:20 +0000 (09:55 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
remove the huge test file, generate it on the fly instead
remove the huge test file, generate it on the fly instead
Anatol Belski [Tue, 21 Jun 2016 07:54:34 +0000 (09:54 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
remove the huge test file, generate it on the fly instead
remove the huge test file, generate it on the fly instead
Anatol Belski [Tue, 21 Jun 2016 07:53:04 +0000 (09:53 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
remove the huge test file, generate it on the fly instead
Anatol Belski [Tue, 21 Jun 2016 07:49:13 +0000 (09:49 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
remove the huge test file, generate it on the fly instead
Anatol Belski [Tue, 21 Jun 2016 07:42:38 +0000 (09:42 +0200)]
remove the huge test file, generate it on the fly instead
Anatol Belski [Tue, 21 Jun 2016 07:42:38 +0000 (09:42 +0200)]
remove the huge test file, generate it on the fly instead
Anatol Belski [Tue, 21 Jun 2016 07:42:38 +0000 (09:42 +0200)]
remove the huge test file, generate it on the fly instead
Stanislav Malyshev [Tue, 21 Jun 2016 07:28:26 +0000 (00:28 -0700)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Now the right bug #
Fix NEWS
Stanislav Malyshev [Tue, 21 Jun 2016 07:28:17 +0000 (00:28 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Now the right bug #
Fix NEWS
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Tue, 21 Jun 2016 07:27:46 +0000 (00:27 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Now the right bug #
Fix NEWS
Stanislav Malyshev [Tue, 21 Jun 2016 07:27:01 +0000 (00:27 -0700)]
Merge branch 'PHP-7.0'
* PHP-7.0:
iFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow
update NEWS
fix tests
fix build
Fix bug #72455: Heap Overflow due to integer overflows
Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize
Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
Fix bug #72407: NULL Pointer Dereference at _gdScaleVert
Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free
Fix bug #72298 pass2_no_dither out-of-bounds access
Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
Fix bug #72262 - do not overflow int
Fix bug #72400 and #72403 - prevent signed int overflows for string lengths
Fix bug #72275: don't allow smart_str to overflow int
Fix bug #72340: Double Free Courruption in wddx_deserialize
Fix bug #72321 - use efree() for emalloc allocation
5.6.23RC1
fix NEWS
set versions
Stanislav Malyshev [Tue, 21 Jun 2016 07:25:49 +0000 (00:25 -0700)]
Merge branch 'PHP-7.0.8' into PHP-7.0
* PHP-7.0.8:
iFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow
update NEWS
fix tests
fix build
Fix bug #72455: Heap Overflow due to integer overflows
Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize
Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
Fix bug #72407: NULL Pointer Dereference at _gdScaleVert
Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free
Fix bug #72298 pass2_no_dither out-of-bounds access
Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
Fix bug #72262 - do not overflow int
Fix bug #72400 and #72403 - prevent signed int overflows for string lengths
Fix bug #72275: don't allow smart_str to overflow int
Fix bug #72340: Double Free Courruption in wddx_deserialize
Fix bug #72321 - use efree() for emalloc allocation
5.6.23RC1
fix NEWS
set versions
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Tue, 21 Jun 2016 07:24:32 +0000 (00:24 -0700)]
Merge branch 'PHP-5.6.23' into PHP-7.0.8
* PHP-5.6.23: (24 commits)
iFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow
update NEWS
fix tests
fix build
Fix bug #72455: Heap Overflow due to integer overflows
Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize
Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
Fix bug #72407: NULL Pointer Dereference at _gdScaleVert
Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free
Fix bug #72298 pass2_no_dither out-of-bounds access
Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
Fix bug #72262 - do not overflow int
Fix bug #72400 and #72403 - prevent signed int overflows for string lengths
Fix bug #72275: don't allow smart_str to overflow int
Fix bug #72340: Double Free Courruption in wddx_deserialize
update NEWS
Fix #66387: Stack overflow with imagefilltoborder
Fix bug #72321 - use efree() for emalloc allocation
5.6.23RC1
Fix bug #72140 (segfault after calling ERR_free_strings())
...
Conflicts:
configure.in
ext/mbstring/php_mbregex.c
ext/mcrypt/mcrypt.c
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/standard/php_smart_str.h
ext/standard/string.c
ext/standard/url.c
ext/wddx/wddx.c
ext/zip/php_zip.c
main/php_version.h
Stanislav Malyshev [Tue, 21 Jun 2016 07:18:27 +0000 (00:18 -0700)]
Now the right bug #
Stanislav Malyshev [Tue, 21 Jun 2016 07:14:50 +0000 (00:14 -0700)]
Fix NEWS
Stanislav Malyshev [Tue, 21 Jun 2016 07:02:37 +0000 (00:02 -0700)]
Merge branch 'PHP-5.6.23' into PHP-5.6
* PHP-5.6.23:
Fixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow
update NEWS
fix tests
fix build
Fix bug #72455: Heap Overflow due to integer overflows
Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize
Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
Fix bug #72407: NULL Pointer Dereference at _gdScaleVert
Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free
Fix bug #72298 pass2_no_dither out-of-bounds access
Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
Fix bug #72262 - do not overflow int
Fix bug #72400 and #72403 - prevent signed int overflows for string lengths
Fix bug #72275: don't allow smart_str to overflow int
Fix bug #72340: Double Free Courruption in wddx_deserialize
Fix bug #72321 - use efree() for emalloc allocation
5.6.23RC1
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Tue, 21 Jun 2016 07:01:48 +0000 (00:01 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6.23
* PHP-5.5:
Fixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow
update NEWS
fix tests
fix build
Fix bug #72455: Heap Overflow due to integer overflows
Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize
Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
Fix bug #72407: NULL Pointer Dereference at _gdScaleVert
Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free
Fix bug #72298 pass2_no_dither out-of-bounds access
Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
Fix bug #72262 - do not overflow int
Fix bug #72400 and #72403 - prevent signed int overflows for string lengths
Fix bug #72275: don't allow smart_str to overflow int
Fix bug #72340: Double Free Courruption in wddx_deserialize
update NEWS
Fix #66387: Stack overflow with imagefilltoborder
Skip test which is 64bits only
5.5.37 now
Conflicts:
configure.in
ext/mcrypt/mcrypt.c
ext/spl/spl_directory.c
main/php_version.h
Stanislav Malyshev [Tue, 21 Jun 2016 06:58:26 +0000 (23:58 -0700)]
iFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow