com php-src: fixed tests, bugs in status codes merger: ext/standard/tests/general_functions/header_redirection_ 001.phpt
ext/standard/tests/general_functions/heade r_redirection_002.phpt main/http_status_codes .h sapi/cli/php_cli_server.c

Commit: 9c18ad3ac9103bc0a6c7b7ab8938fd7272095652 Author: Andrea Faulds <ajf@ajf.me> Sun, 14 Dec 2014 23:40:35 +0000 Parents: ad01fd8b49c6117d5c5fce98871c41781a5c00b9 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9c18ad3ac9103bc0a6c7b7ab8938fd7272095652 Log: fixed tests, bugs in status codes merger Changed paths: M ext/standard/tests/general_functions/header_redirection_001.phpt M ext/standard/tests/general_functions/header_redirection_002.phpt M main/http_status_codes.h M sapi/cli/php_cli_server.c Diff: diff --git a/ext/standard/tests/general_functions/header_redirection_001.phpt b/ext/standard/tests/general_functions/header_redirection_001.phpt index ecf57ec..c5ea70b 100644 --- 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 2bf6dec..3f8e0b9 100644 --- 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 1383c6a..02186b5 100644 --- 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 b57ec32..35eab85 100644 --- 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;