summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* set versionsphp-7.0.8PHP-7.0.8Anatol Belski2016-06-211-2/+2
|
* set versionsAnatol Belski2016-06-071-2/+2
|
* Fixed bug #72308 (fastcgi_finish_request and logging environment variables)Xinchen Hui2016-06-021-1/+6
|
* This is exported at implementation site, but no forward declaration can ↵Joe Watkins2016-05-291-0/+2
| | | | cause compile warnings
* Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)Xinchen Hui2016-05-161-1/+1
|
* prepare next 7.0.8Anatol Belski2016-05-101-3/+3
|
* simplify expressionJoe Watkins2016-04-281-1/+1
|
* simplify expressionJoe Watkins2016-04-281-1/+1
|
* Fixed bug #72035 php-cgi.exe fails to run scripts relative to drive rootAnatol Belski2016-04-231-0/+7
|
* prepare nextAnatol Belski2016-04-121-3/+3
|
* remove unused params || woopsJoe Watkins2016-03-311-6/+1
|
* fix #71609: Segmentation fault on ZTS with gethostbynameJoe Watkins2016-03-313-3/+99
|
* fix #70189 (SAPI sends empty Content-Type when default_mimetype is empty)Joe Watkins2016-03-271-9/+18
|
* Fixed bug #71891 (header_register_callback() and register_shutdown_function())Xinchen Hui2016-03-251-10/+17
| | | | | Actually, this fixed the memleak not the behavior(it is expected behavior that "shutdown" is not outputed)
* prepare nextAnatol Belski2016-03-151-3/+3
|
* Eliminate usages of _PP macrosNikita Popov2016-03-031-6/+0
| | | | | | | | | | | | | These are either in debug code (fix them), commented out (drop them) or in dead compatibility macros (drop them). One usage was in php_stream_get_from_zval(), which we have not used since at least PHP 5.2 and, judging from the fact that nobody complained about it causing compile errors in PHP 7, nobody else uses it either, so drop it. There are still remaining uses in mysqli embedded and odbc birdstep. These probably need to be dropped outright.
* Fix bug #71575 removing extra semicolons outside macrosJames Titcumb2016-03-031-1/+1
|
* Fix bug #71629: sync php_url_decode definitionStanislav Malyshev2016-02-211-2/+2
|
* Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-02-181-0/+3
|\ | | | | | | | | * PHP-5.6: Bug #71596 Segmentation fault on ZTS with date function (setlocale)
| * Bug #71596 Segmentation fault on ZTS with date function (setlocale)Anatol Belski2016-02-181-0/+3
| |
| * 5.6.20 is nextFerenc Kovacs2016-02-181-3/+3
| |
* | Remove TSRMLS_* from code, they are not used anymoreStanislav Malyshev2016-02-171-2/+2
| |
* | prepare nextAnatol Belski2016-02-161-3/+3
| |
* | Fix format attributes in ZTSNikita Popov2016-02-142-17/+3
| |
* | fix version headerAnatol Belski2016-02-111-3/+3
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Xinchen Hui2016-02-051-3/+3
|\ \ | |/ | | | | | | Conflicts: ext/curl/interface.c
| * Merge branch 'PHP-5.6.18' into PHP-5.6Stanislav Malyshev2016-02-011-14/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.18: fix tests fix NEWS Update NEWS update NEWS Fixed bug #71488: Stack overflow when decompressing tar archives update NEWS add missing headers for SIZE_MAX backport the escapeshell* functions hardening branch add tests Fix bug #71459 - Integer overflow in iptcembed() prepare 5.6.18RC1 Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata() Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream() Fix bug #71335: Type Confusion in WDDX Packet Deserialization Fix bug #71354 - remove UMR when size is 0 Conflicts: configure.in main/php_version.h
| * | 5.6.19 will be nextFerenc Kovacs2016-01-201-3/+3
| | |
* | | Merge branch 'PHP-7.0.3' into PHP-7.0Stanislav Malyshev2016-02-011-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0.3: (35 commits) fix tests update NEWS fix tests fix NEWS Update NEWS update NEWS Fixed bug #71475: openssl_seal() uninitialized memory usage Fixed bug #71488: Stack overflow when decompressing tar archives fix tests fix wrong gc sequence revert the API string as well update NEWS Revert "Fix #70720" sync NEWS reset ext/session to the state of 7.0.2 update NEWS update NEWS add missing headers for SIZE_MAX backport the escapeshell* functions hardening branch add tests ... Conflicts: configure.in ext/session/tests/bug69111.phpt main/php_version.h
| * \ \ Merge branch 'PHP-5.6.18' into PHP-7.0.3Stanislav Malyshev2016-02-011-1/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.18: fix tests fix NEWS Update NEWS update NEWS Fixed bug #71488: Stack overflow when decompressing tar archives update NEWS add missing headers for SIZE_MAX backport the escapeshell* functions hardening branch add tests Fix bug #71459 - Integer overflow in iptcembed() prepare 5.6.18RC1 Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work improve fix for bug #71201 Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata() Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream() Fix bug #71335: Type Confusion in WDDX Packet Deserialization Fix bug #71354 - remove UMR when size is 0 Conflicts: configure.in ext/phar/dirstream.c ext/phar/phar_object.c ext/phar/tar.c ext/standard/exec.c ext/standard/iptc.c ext/standard/math.c ext/standard/streamsfuncs.c ext/wddx/wddx.c main/php_version.h main/streams/memory.c
| | * | Merge branch 'PHP-5.5.32' into PHP-5.6.18Stanislav Malyshev2016-02-011-14/+16
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5.32: Fixed bug #71488: Stack overflow when decompressing tar archives update NEWS add missing headers for SIZE_MAX backport the escapeshell* functions hardening branch add tests Fix bug #71459 - Integer overflow in iptcembed() Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata() Fix bug #71335: Type Confusion in WDDX Packet Deserialization Fix bug #71354 - remove UMR when size is 0
| | | * | Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its inputStanislav Malyshev2016-01-161-14/+16
| | | | |
| | | * | 5.5.32 nowJulien Pauli2016-01-071-3/+3
| | | | |
| | | * | 5.5.31 nowJulien Pauli2015-09-301-3/+3
| | | | |
| | | * | 5.5.30 nextJulien Pauli2015-09-021-3/+3
| | | | |
| | | * | 5.5.29 nextStanislav Malyshev2015-08-041-3/+3
| | | | |
| | * | | prepare 5.6.18RC1php-5.6.18RC1Ferenc Kovacs2016-01-211-2/+2
| | | |/ | | |/|
| | * | backport 9a07245b728714de09361ea16b9c6fcf70cb5685 from 7.0Anatol Belski2016-01-111-3/+16
| | | |
| * | | set versions to 7.0.3RC1Anatol Belski2016-01-181-2/+2
| | | |
* | | | Also WIN32 sideXinchen Hui2016-01-291-3/+3
| | | |
* | | | Properly read any remaining data when closing FastCGI socketRobin McCorkell2016-01-291-3/+3
| | | |
* | | | bump version to 7.0.4-devAnatol Belski2016-01-191-3/+3
|/ / /
* | | improve fix for bug #71273Anatol Belski2016-01-051-1/+1
| | |
* | | Fixed bug #71273 A wrong ext directory setup in php.ini leads to crashAnatol Belski2016-01-051-3/+16
| | |
* | | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-01-042-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016) Conflicts: ext/json/php_json_encoder.h sapi/continuity/capi.c
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-032-2/+2
| | |
* | | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| | |
* | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-0165-65/+65
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-0164-64/+64
| | |
* | | This should be betterXinchen Hui2015-12-301-3/+2
| | |