summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.5.7php-5.5.7PHP-5.5.7Julien Pauli2013-12-113-4/+8
|
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-12-113-4/+61
| | | | | | * PHP-5.4: 5.3.29-dev Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
* 5.5.7RC1php-5.5.7RC1Julien Pauli2013-11-273-4/+4
|
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-11-270-0/+0
|\ | | | | | | | | | | | | | | | | * PHP-5.4: 5.4.24-dev now Conflicts: configure.in main/php_version.h
| * 5.4.24-dev nowStanislav Malyshev2013-11-273-5/+7
| |
* | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Andrey Hristov2013-11-2612-173/+250
|\ \
| * | Fixed opcahce_reset() crash when opcache.protect_memory is setDmitry Stogov2013-11-261-0/+2
| | |
| * | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-11-261-1/+1
| |\ \ | | | | | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: Fixed a wrong test
| | * | Fixed a wrong testJulien Pauli2013-11-261-1/+1
| | | |
| * | | Fixed bug #66176 (Invalid constant substitution)Dmitry Stogov2013-11-261-2/+8
| | | |
| * | | Fixed bug #66176 (Invalid constant substitution)Dmitry Stogov2013-11-262-44/+45
| |/ /
| * | Fixed bug #66176 (Invalid constant substitution)Dmitry Stogov2013-11-265-126/+152
| | |
| * | Added testDmitry Stogov2013-11-261-0/+22
| | |
| * | Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)Dmitry Stogov2013-11-266-2/+22
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-11-261-0/+38
|\ \ \ | | |/ | |/|
| * | add testAndrey Hristov2013-11-261-0/+38
| | |
* | | merge fixAndrey Hristov2013-11-261-13/+1
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-11-264-4/+29
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: NEWS ext/mysqlnd/mysqlnd.c
| * Fix for Bug #66141 (mysqlnd quote function is wrong with ↵Andrey Hristov2013-11-265-4/+19
| | | | | | | | NO_BACKSLASH_ESCAPES after failed query)
* | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-11-250-0/+0
|\ \ | |/ | | | | | | Conflicts: NEWS
| * bring the newsAndrey Hristov2013-11-251-0/+4
| |
* | Fixed compatibility with old PHP versionsDmitry Stogov2013-11-251-0/+2
| |
* | Fixed bug #65915 (Inconsistent results with require return value)Dmitry Stogov2013-11-253-1/+40
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-11-211-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: fixed test
| * fixed testAnatol Belski2013-11-211-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-11-211-11/+30
|\ \ | |/
| * And here is the real fix for #66124Andrey Hristov2013-11-211-11/+30
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-11-211-0/+101
|\ \ | |/
| * Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param ↵Andrey Hristov2013-11-211-0/+101
| | | | | | | | with 'i')
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-11-201-0/+2
|\ \ | |/ | | | | | | * PHP-5.4: permanently deactivate that place, not on runtime only
| * permanently deactivate that place, not on runtime onlyAnatol Belski2013-11-201-0/+2
| | | | | | | | | | besides the two "if" checks, this fixes static analyze which is sometimes broken because of this
* | Merge branch 'PHP-5.4' into PHP-5.5Yasuo Ohgaki2013-11-201-0/+52
|\ \ | |/ | | | | | | * PHP-5.4: added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
| * Fix WS in serialization_error_002.phptYasuo Ohgaki2013-11-201-4/+4
| |
| * added a test to cover distinction between boolean return value of ↵Aaron Hamid2013-11-201-0/+52
| | | | | | | | unserialize function and deserializing serialized boolean
| * Fixed tests that fail with non-default `serialize_precision` configurations.Jeff Welch2013-11-204-2/+5
| | | | | | | | | | | | | | See: * https://bugs.php.net/bug.php?id=64760 * 4dc4302
* | Fixed tests that fail with non-default `serialize_precision` configurations.Jeff Welch2013-11-204-2/+5
| | | | | | | | | | | | | | See: * https://bugs.php.net/bug.php?id=64760 * 4dc4302
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-11-191-0/+1
|\ \ | |/ | | | | | | * PHP-5.4: avoid doing a stream_select on a closed stream
| * avoid doing a stream_select on a closed streamRemi Collet2013-11-191-0/+1
| |
* | Updated NEWSAndrea Faulds2013-11-181-0/+2
| |
* | Merge branch 'CLIGetAllHeadersBackport' into PHP-5.5Andrea Faulds2013-11-183-2/+149
|\ \ | | | | | | | | | | | | | | | | | | * CLIGetAllHeadersBackport: Removed UPGRADING note Rewrote test using tcp instead of http:// stream Implemented FR #65917 (getallheaders() is not supported by the built-in...)
| * | Removed UPGRADING noteAndrea Faulds2013-11-131-3/+0
| | | | | | | | | | | | | | | Conflicts: UPGRADING
| * | Rewrote test using tcp instead of http:// streamAndrea Faulds2013-11-121-17/+39
| | |
| * | Implemented FR #65917 (getallheaders() is not supported by the built-in...)Andrea Faulds2013-11-125-2/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Implemented apache_request_headers() and getallheaders() alias in CLI server - Implemented apache_response_headers() in CLI server using FastCGI code Conflicts: NEWS UPGRADING
* | | Update NEWSXinchen Hui2013-11-171-0/+4
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-11-172-1/+13
|\ \ \ | | |/ | |/|
| * | Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)Xinchen Hui2013-11-173-1/+15
| | |
* | | This is CLI web server change. Added some common MIME types to theChristopher Jones2013-11-152-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | existing lookup list, pending a more thorough lookup solution, if anyone wants to do that. Ref http://news.php.net/php.internals/69990 A router can be used to add to, or override, the MIME type lookups, see http://php.net/manual/en/features.commandline.webserver.php
* | | NEWSRemi Collet2013-11-151-0/+2
| | |
* | | Fix Bug #65714 PHP cli forces the tty to cooked modeRemi Collet2013-11-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Only drop the using_history() call with libedit as I don't know if it is required with readline. This also allow to run a php script in background without it being aborted on first output.
* | | Move the JSON bugfix into the 5.5.6 changelog.Adam Harvey2013-11-141-4/+4
| | |