summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.6' into PHP-7.0php-7.0.5PHP-7.0.5Anatol Belski2016-03-291-2/+2
| | | | | * PHP-5.6: fix dir separator in test
* fix item orderAnatol Belski2016-03-291-3/+3
|
* fix creditAnatol Belski2016-03-291-1/+1
|
* set versionsAnatol Belski2016-03-293-4/+4
|
* update NEWSAnatol Belski2016-03-291-0/+16
|
* Merge branch 'PHP-5.5' into PHP-7.0.5Stanislav Malyshev2016-03-283-5/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #71704 php_snmp_error() Format String Vulnerability Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut Fix bug #71798 - Integer Overflow in php_raw_url_encode Fix bug #71860: Require valid paths for phar filenames Going for 5.5.34 Conflicts: configure.in ext/phar/phar_object.c ext/phar/tests/badparameters.phpt ext/phar/tests/create_path_error.phpt ext/phar/tests/pharfileinfo_construct.phpt ext/snmp/snmp.c ext/standard/url.c main/php_version.h
| * Fixed bug #71704 php_snmp_error() Format String VulnerabilityAnatol Belski2016-03-281-1/+1
| | | | | | | | | | Conflicts: ext/snmp/snmp.c
| * Merge branch 'PHP-5.5.34' into PHP-5.5Stanislav Malyshev2016-03-280-0/+0
| |\ | | | | | | | | | | | | * PHP-5.5.34: Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
| | * Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcutStanislav Malyshev2016-03-281-17/+17
| | |
| * | Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcutStanislav Malyshev2016-03-282-20/+20
| |/
| * Fix bug #71798 - Integer Overflow in php_raw_url_encodeStanislav Malyshev2016-03-272-4/+4
| |
| * Fix bug #71860: Require valid paths for phar filenamesStanislav Malyshev2016-03-209-37/+41
| |
| * Going for 5.5.34Julien Pauli2016-03-023-4/+8
| |
* | Merge remote-tracking branch 'security/PHP-7.0.5' into PHP-7.0.5Stanislav Malyshev2016-03-2814-45/+66
|\ \ | | | | | | | | | | | | | | | | | | | | | * security/PHP-7.0.5: Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file Fix bug #71860: Require valid paths for phar filenames update NEWS Fixed bug #71704 php_snmp_error() Format String Vulnerability
| * | Fixed bug #71527 Buffer over-write in finfo_open with malformed magic fileAnatol Belski2016-03-284-7/+24
| | | | | | | | | | | | | | | The actual fix is applying the upstream patch from https://github.com/file/file/commit/6713ca45e7757297381f4b4cdb9cf5e624a9ad36
| * | Fix bug #71860: Require valid paths for phar filenamesStanislav Malyshev2016-03-209-37/+41
| | |
| * | update NEWSAnatol Belski2016-03-161-0/+4
| | |
| * | Fixed bug #71704 php_snmp_error() Format String VulnerabilityAnatol Belski2016-03-161-1/+1
| | |
* | | Updated to version 2016.3 (2016c)Derick Rethans2016-03-281-647/+799
| | |
* | | update NEWSAnatol Belski2016-03-231-0/+3
| | |
* | | Disable huge pages in the Zend allocator by defaultRasmus Lerdorf2016-03-231-3/+3
| | | | | | | | | | | | | | | As per the discussion on internals, this is an expert feature that needs special system-level configuration and care.
* | | Added ability to disable huge pages in Zend Memeory Manager through the ↵Dmitry Stogov2016-03-231-1/+11
|/ / | | | | | | environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
* | Merge branch 'PHP-5.6' into PHP-7.0php-7.0.5RC1Remi Collet2016-03-161-1/+1
| | | | | | | | | | * PHP-5.6: fix #ifdef usage
* | Updated to version 2016.2 (2016b)Derick Rethans2016-03-151-1449/+1594
| |
* | update libs versionsAnatol Belski2016-03-151-5/+5
| |
* | set RC1 versionsAnatol Belski2016-03-153-4/+4
| |
* | update NEWSAnatol Belski2016-03-151-0/+2
| |
* | Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not ↵Sean DuBois2016-03-152-4/+46
| | | | | | | | properly set $argi and $argn
* | fix uninitialized valueAnatol Belski2016-03-151-1/+1
| |
* | fix pointer truncation on 64 bitAnatol Belski2016-03-141-1/+1
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-03-141-1/+2
|\ \ | | | | | | | | | | | | * PHP-5.6: fix test
| * | fix testAnatol Belski2016-03-141-1/+2
| | | | | | | | | | | | | | | Many warnings won't appear with libxml2 >= 2.9.3 because in many cases libxml2 2.9.3 will just abort processing.
* | | Update NEWSYasuo Ohgaki2016-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket Fixed Bug #71599 trans sid handling rework broke interaction with cookies All of these bugs are caused by git global change in PHP-7.0.
* | | Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgiYasuo Ohgaki2016-03-1227-61/+245
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket Fixed Bug #71599 trans sid handling rework broke interaction with cookies All of these bug is caused by git global change in PHP-7.0.
| * | | Fixed bug #71806Nikita Popov2016-03-114-0/+19
| | | |
| * | | Fix bug #71767Grigorii Sokolik2016-03-114-17/+63
| | | |
| * | | update NEWSAnatol Belski2016-03-111-0/+3
| | | |
| * | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-03-110-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.6: update NEWS
| | * | update NEWSAnatol Belski2016-03-111-0/+3
| | | |
| * | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-03-112-0/+15
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.6: Fix DatePeriod::getEndDate() segfault
| | * | Fix DatePeriod::getEndDate() segfaultThomas Punt2016-03-112-0/+15
| | | |
| * | | fix build with clang on WinodwsAnatol Belski2016-03-101-1/+1
| | | |
| * | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-03-101-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.6: fix error condition, part of bug #71753
| | * | fix error condition, part of bug #71753Anatol Belski2016-03-101-1/+1
| | | |
| * | | Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0Dmitry Stogov2016-03-100-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * 'PHP-7.0' of git.php.net:php-src: tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
| | * \ \ Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-03-100-0/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * PHP-5.6: tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
| | | * | tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)Xinchen Hui2016-03-101-1/+3
| | | | | | | | | | | | | | | | | | | | cherry-picked from 7d5f71b0b125c89211e5a2a6d925deba938abd41
| * | | | More effecient fix for bug #71756Dmitry Stogov2016-03-103-6/+80
| |/ / /
| * | | fix invalid pointer on 64-bitAnatol Belski2016-03-103-5/+5
| | | |
| * | | Useless check (part of #71753)Xinchen Hui2016-03-101-1/+1
| | | |