Commit:77c46ba51600ea03ff07f64ddaa2d73dd4a81be5
Author:Adam Harvey Thu, 20 Jun 2013 09:39:37 -0700
Parents: 94e7549719350362617c6933dba6379f058e68a8
f5c7fe92020fd7b8e81c94658da4813a7e6dea17
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=77c46ba51600ea03ff07f64ddaa2d73dd4a81be5
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
Change the search in get_status_string() to correctly handle unknown codes.
Changed paths:
MM NEWS
MM sapi/cli/php_cli_server.c
Diff:
diff --cc NEWS
index 1247dfd,9612928..653a64a
--- a/NEWS
+++ b/NEWS
@@@ -1,59 -1,14 +1,65 @@@
PHP
NEWS
|||
-?? ??? 2013, PHP 5.4.18
++?? ??? 2013, PHP 5.5.1
+
+ - CLI server:
+ . Fixed bug #65066 (Cli server not responsive when responding with 422 http
+ status code). (Adam)
+
-?? ??? 2013, PHP 5.4.17
+20 Jun 2013, PHP 5.5.0
- Core:
+ . Added Zend Opcache extension and enable building it by default.
+More details here: https://wiki.php.net/rfc/optimizerplus. (Dmitry)
+ . Added generators and coroutines (https://wiki.php.net/rfc/generators).
+(Nikita Popov)
+ . Added "finally" keyword (https://wiki.php.net/rfc/finally). (Laruence)
+ . Added simplified password hashing API
+(https://wiki.php.net/rfc/password_hash). (Anthony Ferrara)
+ . Added support for constant array/string dereferencing. (Laruence)
+ . Added array_column function which returns a column in a multidimensional
+array. https://wiki.php.net/rfc/array_column. (Ben Ramsey)
+ . Added boolval(). (Jille Timmermans)
+ . Added "Z" option to pack/unpack. (Gustavo)
+ . Added Generator::throw() method. (Nikita Popov)
+ . Added Class Name Resolution As Scalar Via "class" Keyword.
+(Ralph Schindler, Nikita Popov, Lars)
+ . Added optional second argument for assert() to specify custom message.
Patch
+by Lonny Kapelushnik (lo...@lonnylot.com). (Lars)
+ . Added support for using empty() on the result of function calls and
+other expressions (https://wiki.php.net/rfc/empty_isset_exprs).
+(Nikita Popov)
+ . Added support for non-scalar Iterator keys in foreach
+(https://wiki.php.net/rfc/foreach-non-scalar-keys). (Nikita Popov)
+ . Added support for list in foreach (https://wiki.php.net/rfc/foreachlist).
+(Laruence)
+ . Added support for changing the process's title in CLI/CLI-Server SAPIs.
+The implementation is more robust that the proctitle PECL module. More
+details here: https://wiki.php.net/rfc/cli_process_title. (Keyur)
+ . Added ARMv7/v8 versions of various Zend arithmetic functions that are
+implemented using inline assembler (Ard Biesheuvel)
+ . Added systemtap support by enabling systemtap compatible dtrace probes on
+linux. (David Soria Parra)
+ . Optimized access to temporary and compiled VM variables. 8% less memory
+reads. (Dmitry)
+ . The VM stacks for passing function arguments and syntaticaly nested calls
+were merged into a single stack. The stack size needed for op_array
+execution is calculated at compile time and preallocated at once. As
result
+all the stack push operatins don't require checks for stack overflow
+any more. (Dmitry)
+ . Improve set_exception_handler while doing reset. (Laruence)
+ . Return previous handler when passing NULL to set_error_handler and
+set_exception_handler. (Nikita Popov)
+ . Remove php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid(),
+zend_logo_guid(). (Adnrew Faulds)
+ . Drop Windows XP and 2003 support. (Pierre)
+ . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell)
+ . Implemented FR #60738 (Allow 'set_error_handler' to handle NULL).
+(Laruence, Nikita Popov)
+ . Implemented FR #60524 (specify temp dir by php.ini). (ALeX Kazik).
+ . Implemented FR #46487 (Dereferencing process-handles no longer waits on
+those processes). (Jille Timmermans)
+ . Fixed bug #65051 (count() off by one inside unset()). (Nikita)
. Fixed bug #64988 (Class loading order affects E_STRICT warning).
(Laruence)
. Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC).
(Laruence)
. Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence)
diff --cc sapi/cli/php_cli_server.c
index 5c9b2e8,335d589..a1bae67
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@@ -251,9 -250,9 +252,9 @@@ static php_cli_server_http_response_sta
{ 511, "Network Authentication Required" },
};
- static php_cli_server_http_reponse_status_code_pair template_map[] = {
+ static php_cli_server_http_response_status_code_pair template_map[] = {
{ 400, "%sYour browser sent a request that this server
could not understand." },
-
