From 785e66adb536d40a26e4813e6b4ad96b2fdbef43 Mon Sep 17 00:00:00 2001 From: Lars Strojny Date: Mon, 14 Jan 2013 20:43:14 +0100 Subject: [PATCH] PR #260: Update css for 404 pages to feel more up to date and have a consistent layout across browsers --- sapi/cli/php_cli_server.c | 8 +++++--- sapi/cli/tests/php_cli_server_013.phpt | 6 +++--- sapi/cli/tests/php_cli_server_014.phpt | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 74d2ad2c3b..700a495258 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -246,7 +246,7 @@ static php_cli_server_http_reponse_status_code_pair status_map[] = { static php_cli_server_http_reponse_status_code_pair template_map[] = { { 400, "

%s

Your browser sent a request that this server could not understand.

" }, - { 404, "

%s

The requested resource %s was not found on this server.

" }, + { 404, "

%s

The requested resource %s was not found on this server.

" }, { 500, "

%s

The server is temporarily unavailable.

" }, { 501, "

%s

Request method not supported.

" } }; @@ -283,8 +283,10 @@ ZEND_DECLARE_MODULE_GLOBALS(cli_server); * copied from ext/standard/info.c */ static const char php_cli_server_css[] = "\n"; /* }}} */ diff --git a/sapi/cli/tests/php_cli_server_013.phpt b/sapi/cli/tests/php_cli_server_013.phpt index 570798a880..0e3f4ff74f 100644 --- a/sapi/cli/tests/php_cli_server_013.phpt +++ b/sapi/cli/tests/php_cli_server_013.phpt @@ -88,7 +88,7 @@ Content-Type: text/html; charset=UTF-8 Content-Length: %d 404 Not Found -

Not Found

The requested resource / was not found on this server.

Not Found

The requested resource / was not found on this server.

HTTP/1.1 404 Not Found Host: %s Connection: close @@ -96,7 +96,7 @@ Content-Type: text/html; charset=UTF-8 Content-Length: %d 404 Not Found -

Not Found

The requested resource /main/style.css was not found on this server.

Not Found

The requested resource /main/style.css was not found on this server.

HTTP/1.1 404 Not Found Host: %s Connection: close @@ -104,5 +104,5 @@ Content-Type: text/html; charset=UTF-8 Content-Length: %d 404 Not Found -

Not Found

The requested resource /main/foo/bar was not found on this server.

Not Found

The requested resource /main/foo/bar was not found on this server.

diff --git a/sapi/cli/tests/php_cli_server_014.phpt b/sapi/cli/tests/php_cli_server_014.phpt index f8a9905613..e8bb5fa8a2 100644 --- a/sapi/cli/tests/php_cli_server_014.phpt +++ b/sapi/cli/tests/php_cli_server_014.phpt @@ -77,4 +77,4 @@ Content-Type: %s Content-Length: %d 404 Not Found -

Not Found

The requested resource /main/no-exists.php was not found on this server.

Not Found

The requested resource /main/no-exists.php was not found on this server.

-- 2.40.0