fixed tests, bugs in status codes merger

diff --git a/ext/standard/tests/general_functions/header_redirection_001.phpt b/ext/standard/tests/general_functions/header_redirection_001.phpt
index ecf57ec54a3b56600b4a7fbaac3b12eb1a20b8e1..c5ea70b56c4c1d01829c84b79d40f068fcb580d4 100644 (file)
--- a/ext/standard/tests/general_functions/header_redirection_001.phpt
+++ b/ext/standard/tests/general_functions/header_redirection_001.phpt
@@ -6,6 +6,6 @@ Location: headers change the status code
 header('Location: http://example.com/');
 ?>
 --EXPECTHEADERS--
-Status: 302 Moved Temporarily
+Status: 302 Found
 Location: http://example.com/
 --EXPECT--

diff --git a/ext/standard/tests/general_functions/header_redirection_002.phpt b/ext/standard/tests/general_functions/header_redirection_002.phpt
index 2bf6dec510701908aa56a08348cc8afc0c5398dd..3f8e0b9dac72137232639c01a5c68e2a36c0c38d 100644 (file)
--- a/ext/standard/tests/general_functions/header_redirection_002.phpt
+++ b/ext/standard/tests/general_functions/header_redirection_002.phpt
@@ -7,6 +7,6 @@ header("HTTP/1.1 418 I'm a Teapot");
 header('Location: http://example.com/');
 ?>
 --EXPECTHEADERS--
-Status: 302 Moved Temporarily
+Status: 302 Found
 Location: http://example.com/
 --EXPECT--

diff --git a/main/http_status_codes.h b/main/http_status_codes.h
index 1383c6acdcdc44ff54a672f3e2c854af37e9e8d3..02186b5214cf2020e4f7ea1d9d14d0caa7256e4f 100644 (file)
--- a/main/http_status_codes.h
+++ b/main/http_status_codes.h
@@ -74,7 +74,7 @@ static http_response_status_code_pair http_status_map[] = {
        { 505, "HTTP Version Not Supported" },
        { 511, "Network Authentication Required" },
        /* to allow search with while() loop */
-       { 0, NULL }
+       { 1000, NULL }
 };
 
-#endif HTTP_STATUS_CODES_H
+#endif /* HTTP_STATUS_CODES_H */

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index b57ec32fd5a969d45e82d3fc16a108d10c2b7497..35eab852277777c807fd2994cab365278eb84ef3 100644 (file)
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -276,8 +276,8 @@ static char *get_last_error() /* {{{ */
 
 static int status_comp(const void *a, const void *b) /* {{{ */
 {
-       const php_cli_server_http_response_status_code_pair *pa = (const php_cli_server_http_response_status_code_pair *) a;
-       const php_cli_server_http_response_status_code_pair *pb = (const php_cli_server_http_response_status_code_pair *) b;
+       const http_response_status_code_pair *pa = (const http_response_status_code_pair *) a;
+       const http_response_status_code_pair *pb = (const http_response_status_code_pair *) b;
 
        if (pa->code < pb->code) {
                return -1;