summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--[-rwxr-xr-x]Zend/tests/bug40236.inc0
-rw-r--r--[-rwxr-xr-x]Zend/tests/ns_022.inc0
-rw-r--r--[-rwxr-xr-x]Zend/tests/ns_027.inc0
-rw-r--r--[-rwxr-xr-x]Zend/tests/ns_028.inc0
-rw-r--r--[-rwxr-xr-x]Zend/tests/ns_065.inc0
-rw-r--r--ext/date/tests/bug62896.phpt2
-rw-r--r--[-rwxr-xr-x]ext/interbase/tests/interbase.inc0
-rw-r--r--[-rwxr-xr-x]ext/interbase/tests/skipif.inc0
-rw-r--r--[-rwxr-xr-x]ext/mysql/tests/connect.inc0
-rw-r--r--[-rwxr-xr-x]ext/mysql/tests/skipif.inc0
-rw-r--r--[-rwxr-xr-x]ext/mysql/tests/skipifconnectfailure.inc0
-rw-r--r--[-rwxr-xr-x]ext/mysqli/tests/skipifconnectfailure.inc0
-rw-r--r--[-rwxr-xr-x]ext/pdo/tests/pdo.inc0
-rw-r--r--[-rwxr-xr-x]ext/pdo_mysql/tests/skipif.inc0
-rw-r--r--[-rwxr-xr-x]ext/phar/phar/clicommand.inc0
-rw-r--r--[-rwxr-xr-x]ext/phar/phar/directorygraphiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/phar/phar/directorytreeiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/phar/phar/invertedregexiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/phar/phar/phar.inc0
-rw-r--r--[-rwxr-xr-x]ext/phar/phar/pharcommand.inc0
-rw-r--r--[-rwxr-xr-x]ext/session/tests/save_handler_closures.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/autoload.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/callbackfilteriterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/dbaarray.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/dbareader.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/directoryfilterdots.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/directorytree.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/dualiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/findfile.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/inigroups.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/keyfilter.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/recursivecomparedualiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/recursivedualiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/regexfindfile.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/searchiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/examples/tests/examples.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/appenditerator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/cachingiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/emptyiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/filteriterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/infiniteiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/iteratoriterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/limititerator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/multipleiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/norewinditerator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/outeriterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/parentiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/recursivearrayiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/recursivecachingiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/recursivefilteriterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/recursiveiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/recursiveiteratoriterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/recursiveregexiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/recursivetreeiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/regexiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/seekableiterator.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/splfileobject.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/internal/splobjectstorage.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/tests/testclass.class.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/tests/testclass.inc0
-rw-r--r--[-rwxr-xr-x]ext/spl/tests/testclass.php.inc0
-rw-r--r--sapi/cli/php_cli_server.c30
-rw-r--r--sapi/cli/tests/php_cli_server_013.phpt18
-rw-r--r--sapi/cli/tests/php_cli_server_014.phpt6
-rw-r--r--[-rwxr-xr-x]tests/lang/015.inc0
-rw-r--r--[-rwxr-xr-x]tests/lang/016.inc0
-rw-r--r--[-rwxr-xr-x]tests/lang/023-1.inc0
-rw-r--r--[-rwxr-xr-x]tests/lang/023-2.inc0
-rw-r--r--[-rwxr-xr-x]tests/lang/bug38579.inc0
70 files changed, 25 insertions, 33 deletions
diff --git a/NEWS b/NEWS
index 5938d9841a..02fb131476 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP NEWS
?? ??? 2012, PHP 5.4.8
- CLI server:
+ . Implemented FR #63242 (Default error page in PHP built-in web server uses
+ outdated html/css). (pascal.chevrel@free.fr)
. Changed response to unknown HTTP method to 501 according to RFC.
(Niklas Lindgren).
. Support HTTP PATCH method. Patch by Niklas Lindgren, GitHub PR #190.
diff --git a/Zend/tests/bug40236.inc b/Zend/tests/bug40236.inc
index fc03349f7e..fc03349f7e 100755..100644
--- a/Zend/tests/bug40236.inc
+++ b/Zend/tests/bug40236.inc
diff --git a/Zend/tests/ns_022.inc b/Zend/tests/ns_022.inc
index be571fc346..be571fc346 100755..100644
--- a/Zend/tests/ns_022.inc
+++ b/Zend/tests/ns_022.inc
diff --git a/Zend/tests/ns_027.inc b/Zend/tests/ns_027.inc
index 3823818290..3823818290 100755..100644
--- a/Zend/tests/ns_027.inc
+++ b/Zend/tests/ns_027.inc
diff --git a/Zend/tests/ns_028.inc b/Zend/tests/ns_028.inc
index 5bd3ae7765..5bd3ae7765 100755..100644
--- a/Zend/tests/ns_028.inc
+++ b/Zend/tests/ns_028.inc
diff --git a/Zend/tests/ns_065.inc b/Zend/tests/ns_065.inc
index 963a74e140..963a74e140 100755..100644
--- a/Zend/tests/ns_065.inc
+++ b/Zend/tests/ns_065.inc
diff --git a/ext/date/tests/bug62896.phpt b/ext/date/tests/bug62896.phpt
index 7584546b5a..ccdcfb029c 100644
--- a/ext/date/tests/bug62896.phpt
+++ b/ext/date/tests/bug62896.phpt
@@ -1,5 +1,7 @@
--TEST--
Bug #62896 Unixtimestamp may take on local times DST flag (this test will only be valid during CEST)
+--INI--
+date.timezone=Europe/Berlin
--FILE--
<?php
$tz = new DateTimeZone('Europe/Berlin');
diff --git a/ext/interbase/tests/interbase.inc b/ext/interbase/tests/interbase.inc
index 42eb6e5915..42eb6e5915 100755..100644
--- a/ext/interbase/tests/interbase.inc
+++ b/ext/interbase/tests/interbase.inc
diff --git a/ext/interbase/tests/skipif.inc b/ext/interbase/tests/skipif.inc
index 79813f69e6..79813f69e6 100755..100644
--- a/ext/interbase/tests/skipif.inc
+++ b/ext/interbase/tests/skipif.inc
diff --git a/ext/mysql/tests/connect.inc b/ext/mysql/tests/connect.inc
index 0df5bc3aa0..0df5bc3aa0 100755..100644
--- a/ext/mysql/tests/connect.inc
+++ b/ext/mysql/tests/connect.inc
diff --git a/ext/mysql/tests/skipif.inc b/ext/mysql/tests/skipif.inc
index 0f932892ca..0f932892ca 100755..100644
--- a/ext/mysql/tests/skipif.inc
+++ b/ext/mysql/tests/skipif.inc
diff --git a/ext/mysql/tests/skipifconnectfailure.inc b/ext/mysql/tests/skipifconnectfailure.inc
index a57c7dbd58..a57c7dbd58 100755..100644
--- a/ext/mysql/tests/skipifconnectfailure.inc
+++ b/ext/mysql/tests/skipifconnectfailure.inc
diff --git a/ext/mysqli/tests/skipifconnectfailure.inc b/ext/mysqli/tests/skipifconnectfailure.inc
index 32a976357c..32a976357c 100755..100644
--- a/ext/mysqli/tests/skipifconnectfailure.inc
+++ b/ext/mysqli/tests/skipifconnectfailure.inc
diff --git a/ext/pdo/tests/pdo.inc b/ext/pdo/tests/pdo.inc
index 8089236bbc..8089236bbc 100755..100644
--- a/ext/pdo/tests/pdo.inc
+++ b/ext/pdo/tests/pdo.inc
diff --git a/ext/pdo_mysql/tests/skipif.inc b/ext/pdo_mysql/tests/skipif.inc
index d48670aec6..d48670aec6 100755..100644
--- a/ext/pdo_mysql/tests/skipif.inc
+++ b/ext/pdo_mysql/tests/skipif.inc
diff --git a/ext/phar/phar/clicommand.inc b/ext/phar/phar/clicommand.inc
index 79bf5c8855..79bf5c8855 100755..100644
--- a/ext/phar/phar/clicommand.inc
+++ b/ext/phar/phar/clicommand.inc
diff --git a/ext/phar/phar/directorygraphiterator.inc b/ext/phar/phar/directorygraphiterator.inc
index 5a658ddabc..5a658ddabc 100755..100644
--- a/ext/phar/phar/directorygraphiterator.inc
+++ b/ext/phar/phar/directorygraphiterator.inc
diff --git a/ext/phar/phar/directorytreeiterator.inc b/ext/phar/phar/directorytreeiterator.inc
index 9ed2e1a1bf..9ed2e1a1bf 100755..100644
--- a/ext/phar/phar/directorytreeiterator.inc
+++ b/ext/phar/phar/directorytreeiterator.inc
diff --git a/ext/phar/phar/invertedregexiterator.inc b/ext/phar/phar/invertedregexiterator.inc
index aec87e6ab1..aec87e6ab1 100755..100644
--- a/ext/phar/phar/invertedregexiterator.inc
+++ b/ext/phar/phar/invertedregexiterator.inc
diff --git a/ext/phar/phar/phar.inc b/ext/phar/phar/phar.inc
index 7e7d61851e..7e7d61851e 100755..100644
--- a/ext/phar/phar/phar.inc
+++ b/ext/phar/phar/phar.inc
diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
index cb343675b5..cb343675b5 100755..100644
--- a/ext/phar/phar/pharcommand.inc
+++ b/ext/phar/phar/pharcommand.inc
diff --git a/ext/session/tests/save_handler_closures.inc b/ext/session/tests/save_handler_closures.inc
index 50f33c1098..50f33c1098 100755..100644
--- a/ext/session/tests/save_handler_closures.inc
+++ b/ext/session/tests/save_handler_closures.inc
diff --git a/ext/spl/examples/autoload.inc b/ext/spl/examples/autoload.inc
index 5871e7d63b..5871e7d63b 100755..100644
--- a/ext/spl/examples/autoload.inc
+++ b/ext/spl/examples/autoload.inc
diff --git a/ext/spl/examples/callbackfilteriterator.inc b/ext/spl/examples/callbackfilteriterator.inc
index 51757012ec..51757012ec 100755..100644
--- a/ext/spl/examples/callbackfilteriterator.inc
+++ b/ext/spl/examples/callbackfilteriterator.inc
diff --git a/ext/spl/examples/dbaarray.inc b/ext/spl/examples/dbaarray.inc
index d448ad7299..d448ad7299 100755..100644
--- a/ext/spl/examples/dbaarray.inc
+++ b/ext/spl/examples/dbaarray.inc
diff --git a/ext/spl/examples/dbareader.inc b/ext/spl/examples/dbareader.inc
index b09791239b..b09791239b 100755..100644
--- a/ext/spl/examples/dbareader.inc
+++ b/ext/spl/examples/dbareader.inc
diff --git a/ext/spl/examples/directoryfilterdots.inc b/ext/spl/examples/directoryfilterdots.inc
index 37f14b7106..37f14b7106 100755..100644
--- a/ext/spl/examples/directoryfilterdots.inc
+++ b/ext/spl/examples/directoryfilterdots.inc
diff --git a/ext/spl/examples/directorytree.inc b/ext/spl/examples/directorytree.inc
index 7bd9c2c597..7bd9c2c597 100755..100644
--- a/ext/spl/examples/directorytree.inc
+++ b/ext/spl/examples/directorytree.inc
diff --git a/ext/spl/examples/dualiterator.inc b/ext/spl/examples/dualiterator.inc
index 4cee203436..4cee203436 100755..100644
--- a/ext/spl/examples/dualiterator.inc
+++ b/ext/spl/examples/dualiterator.inc
diff --git a/ext/spl/examples/findfile.inc b/ext/spl/examples/findfile.inc
index 02ab792433..02ab792433 100755..100644
--- a/ext/spl/examples/findfile.inc
+++ b/ext/spl/examples/findfile.inc
diff --git a/ext/spl/examples/inigroups.inc b/ext/spl/examples/inigroups.inc
index 62cfa3e029..62cfa3e029 100755..100644
--- a/ext/spl/examples/inigroups.inc
+++ b/ext/spl/examples/inigroups.inc
diff --git a/ext/spl/examples/keyfilter.inc b/ext/spl/examples/keyfilter.inc
index eaf6b77364..eaf6b77364 100755..100644
--- a/ext/spl/examples/keyfilter.inc
+++ b/ext/spl/examples/keyfilter.inc
diff --git a/ext/spl/examples/recursivecomparedualiterator.inc b/ext/spl/examples/recursivecomparedualiterator.inc
index 75265c1d58..75265c1d58 100755..100644
--- a/ext/spl/examples/recursivecomparedualiterator.inc
+++ b/ext/spl/examples/recursivecomparedualiterator.inc
diff --git a/ext/spl/examples/recursivedualiterator.inc b/ext/spl/examples/recursivedualiterator.inc
index cfa3bccbbc..cfa3bccbbc 100755..100644
--- a/ext/spl/examples/recursivedualiterator.inc
+++ b/ext/spl/examples/recursivedualiterator.inc
diff --git a/ext/spl/examples/regexfindfile.inc b/ext/spl/examples/regexfindfile.inc
index d5dd722536..d5dd722536 100755..100644
--- a/ext/spl/examples/regexfindfile.inc
+++ b/ext/spl/examples/regexfindfile.inc
diff --git a/ext/spl/examples/searchiterator.inc b/ext/spl/examples/searchiterator.inc
index 944a4ac5a5..944a4ac5a5 100755..100644
--- a/ext/spl/examples/searchiterator.inc
+++ b/ext/spl/examples/searchiterator.inc
diff --git a/ext/spl/examples/tests/examples.inc b/ext/spl/examples/tests/examples.inc
index feeba7db24..feeba7db24 100755..100644
--- a/ext/spl/examples/tests/examples.inc
+++ b/ext/spl/examples/tests/examples.inc
diff --git a/ext/spl/internal/appenditerator.inc b/ext/spl/internal/appenditerator.inc
index 28e32b15f6..28e32b15f6 100755..100644
--- a/ext/spl/internal/appenditerator.inc
+++ b/ext/spl/internal/appenditerator.inc
diff --git a/ext/spl/internal/cachingiterator.inc b/ext/spl/internal/cachingiterator.inc
index 33258ab954..33258ab954 100755..100644
--- a/ext/spl/internal/cachingiterator.inc
+++ b/ext/spl/internal/cachingiterator.inc
diff --git a/ext/spl/internal/emptyiterator.inc b/ext/spl/internal/emptyiterator.inc
index ac80e79581..ac80e79581 100755..100644
--- a/ext/spl/internal/emptyiterator.inc
+++ b/ext/spl/internal/emptyiterator.inc
diff --git a/ext/spl/internal/filteriterator.inc b/ext/spl/internal/filteriterator.inc
index 3330cc9e47..3330cc9e47 100755..100644
--- a/ext/spl/internal/filteriterator.inc
+++ b/ext/spl/internal/filteriterator.inc
diff --git a/ext/spl/internal/infiniteiterator.inc b/ext/spl/internal/infiniteiterator.inc
index 04d7827182..04d7827182 100755..100644
--- a/ext/spl/internal/infiniteiterator.inc
+++ b/ext/spl/internal/infiniteiterator.inc
diff --git a/ext/spl/internal/iteratoriterator.inc b/ext/spl/internal/iteratoriterator.inc
index 37676e0537..37676e0537 100755..100644
--- a/ext/spl/internal/iteratoriterator.inc
+++ b/ext/spl/internal/iteratoriterator.inc
diff --git a/ext/spl/internal/limititerator.inc b/ext/spl/internal/limititerator.inc
index c5bddead78..c5bddead78 100755..100644
--- a/ext/spl/internal/limititerator.inc
+++ b/ext/spl/internal/limititerator.inc
diff --git a/ext/spl/internal/multipleiterator.inc b/ext/spl/internal/multipleiterator.inc
index 2ed71d53a7..2ed71d53a7 100755..100644
--- a/ext/spl/internal/multipleiterator.inc
+++ b/ext/spl/internal/multipleiterator.inc
diff --git a/ext/spl/internal/norewinditerator.inc b/ext/spl/internal/norewinditerator.inc
index 8747a6116e..8747a6116e 100755..100644
--- a/ext/spl/internal/norewinditerator.inc
+++ b/ext/spl/internal/norewinditerator.inc
diff --git a/ext/spl/internal/outeriterator.inc b/ext/spl/internal/outeriterator.inc
index f26d29da56..f26d29da56 100755..100644
--- a/ext/spl/internal/outeriterator.inc
+++ b/ext/spl/internal/outeriterator.inc
diff --git a/ext/spl/internal/parentiterator.inc b/ext/spl/internal/parentiterator.inc
index cc377fcc6b..cc377fcc6b 100755..100644
--- a/ext/spl/internal/parentiterator.inc
+++ b/ext/spl/internal/parentiterator.inc
diff --git a/ext/spl/internal/recursivearrayiterator.inc b/ext/spl/internal/recursivearrayiterator.inc
index a9450e12a5..a9450e12a5 100755..100644
--- a/ext/spl/internal/recursivearrayiterator.inc
+++ b/ext/spl/internal/recursivearrayiterator.inc
diff --git a/ext/spl/internal/recursivecachingiterator.inc b/ext/spl/internal/recursivecachingiterator.inc
index 0676d435f2..0676d435f2 100755..100644
--- a/ext/spl/internal/recursivecachingiterator.inc
+++ b/ext/spl/internal/recursivecachingiterator.inc
diff --git a/ext/spl/internal/recursivefilteriterator.inc b/ext/spl/internal/recursivefilteriterator.inc
index b089919a30..b089919a30 100755..100644
--- a/ext/spl/internal/recursivefilteriterator.inc
+++ b/ext/spl/internal/recursivefilteriterator.inc
diff --git a/ext/spl/internal/recursiveiterator.inc b/ext/spl/internal/recursiveiterator.inc
index 1eab3d69b2..1eab3d69b2 100755..100644
--- a/ext/spl/internal/recursiveiterator.inc
+++ b/ext/spl/internal/recursiveiterator.inc
diff --git a/ext/spl/internal/recursiveiteratoriterator.inc b/ext/spl/internal/recursiveiteratoriterator.inc
index 35fa801e78..35fa801e78 100755..100644
--- a/ext/spl/internal/recursiveiteratoriterator.inc
+++ b/ext/spl/internal/recursiveiteratoriterator.inc
diff --git a/ext/spl/internal/recursiveregexiterator.inc b/ext/spl/internal/recursiveregexiterator.inc
index ffcff0ce47..ffcff0ce47 100755..100644
--- a/ext/spl/internal/recursiveregexiterator.inc
+++ b/ext/spl/internal/recursiveregexiterator.inc
diff --git a/ext/spl/internal/recursivetreeiterator.inc b/ext/spl/internal/recursivetreeiterator.inc
index dfcdc05995..dfcdc05995 100755..100644
--- a/ext/spl/internal/recursivetreeiterator.inc
+++ b/ext/spl/internal/recursivetreeiterator.inc
diff --git a/ext/spl/internal/regexiterator.inc b/ext/spl/internal/regexiterator.inc
index c6addb93d2..c6addb93d2 100755..100644
--- a/ext/spl/internal/regexiterator.inc
+++ b/ext/spl/internal/regexiterator.inc
diff --git a/ext/spl/internal/seekableiterator.inc b/ext/spl/internal/seekableiterator.inc
index b4f66bde4d..b4f66bde4d 100755..100644
--- a/ext/spl/internal/seekableiterator.inc
+++ b/ext/spl/internal/seekableiterator.inc
diff --git a/ext/spl/internal/splfileobject.inc b/ext/spl/internal/splfileobject.inc
index 46b941f696..46b941f696 100755..100644
--- a/ext/spl/internal/splfileobject.inc
+++ b/ext/spl/internal/splfileobject.inc
diff --git a/ext/spl/internal/splobjectstorage.inc b/ext/spl/internal/splobjectstorage.inc
index fa164066c7..fa164066c7 100755..100644
--- a/ext/spl/internal/splobjectstorage.inc
+++ b/ext/spl/internal/splobjectstorage.inc
diff --git a/ext/spl/tests/testclass.class.inc b/ext/spl/tests/testclass.class.inc
index f5fe7411fa..f5fe7411fa 100755..100644
--- a/ext/spl/tests/testclass.class.inc
+++ b/ext/spl/tests/testclass.class.inc
diff --git a/ext/spl/tests/testclass.inc b/ext/spl/tests/testclass.inc
index ceb24c877c..ceb24c877c 100755..100644
--- a/ext/spl/tests/testclass.inc
+++ b/ext/spl/tests/testclass.inc
diff --git a/ext/spl/tests/testclass.php.inc b/ext/spl/tests/testclass.php.inc
index ceb24c877c..ceb24c877c 100755..100644
--- a/ext/spl/tests/testclass.php.inc
+++ b/ext/spl/tests/testclass.php.inc
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 4d15db44af..5f263cb322 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -245,10 +245,10 @@ static php_cli_server_http_reponse_status_code_pair status_map[] = {
};
static php_cli_server_http_reponse_status_code_pair template_map[] = {
- { 400, "<h1 class=\"h\">%s</h1><p>Your browser sent a request that this server could not understand.</p>" },
- { 404, "<h1 class=\"h\">%s</h1><p>The requested resource %s was not found on this server.</p>" },
- { 500, "<h1 class=\"h\">%s</h1><p>The server is temporarily unavailable.</p>" },
- { 501, "<h1 class=\"h\">%s</h1><p>Request method not supported.</p>" }
+ { 400, "<h1>%s</h1><p>Your browser sent a request that this server could not understand.</p>" },
+ { 404, "<h1>%s</h1><p>The requested resource %s was not found on this server.</p>" },
+ { 500, "<h1>%s</h1><p>The server is temporarily unavailable.</p>" },
+ { 501, "<h1>%s</h1><p>Request method not supported.</p>" }
};
static php_cli_server_ext_mime_type_pair mime_type_map[] = {
@@ -279,22 +279,10 @@ ZEND_DECLARE_MODULE_GLOBALS(cli_server);
/* {{{ static char php_cli_server_css[]
* copied from ext/standard/info.c
*/
-static const char php_cli_server_css[] = "<style type=\"text/css\">\n" \
- "body {background-color: #ffffff; color: #000000;}\n" \
- "body, td, th, h1, h2 {font-family: sans-serif;}\n" \
- ".center {text-align: center;}\n" \
- ".center table { margin-left: auto; margin-right: auto; text-align: left;}\n" \
- ".center th { text-align: center !important; }\n" \
- "h1 {font-size: 150%;}\n" \
- "h2 {font-size: 125%;}\n" \
- ".p {text-align: left;}\n" \
- ".e {background-color: #ccccff; font-weight: bold; color: #000000;}\n" \
- ".h {background-color: #9999cc; font-weight: bold; color: #000000;}\n" \
- ".v {background-color: #cccccc; color: #000000;}\n" \
- ".vr {background-color: #cccccc; text-align: right; color: #000000;}\n" \
- "img {float: right; border: 0px;}\n" \
- "hr {width: 600px; background-color: #cccccc; border: 0px; height: 1px; color: #000000;}\n" \
- "</style>\n";
+static const char php_cli_server_css[] = "<style>\n" \
+ "body { background-color: #ffffff; color: #000000; }\n" \
+ "h1 { font-family: sans-serif; font-size: 150%; background-color: #9999cc; font-weight: bold; color: #000000; margin-top: 0;}\n" \
+ "</style>\n";
/* }}} */
static void char_ptr_dtor_p(char **p) /* {{{ */
@@ -1757,7 +1745,7 @@ static int php_cli_server_send_error_page(php_cli_server *server, php_cli_server
escaped_request_uri = php_escape_html_entities_ex((unsigned char *)client->request.request_uri, client->request.request_uri_len, &escaped_request_uri_len, 0, ENT_QUOTES, NULL, 0 TSRMLS_CC);
{
- static const char prologue_template[] = "<html><head><title>%d %s</title>";
+ static const char prologue_template[] = "<!doctype html><html><head><title>%d %s</title>";
php_cli_server_chunk *chunk = php_cli_server_chunk_heap_new_self_contained(strlen(prologue_template) + 3 + strlen(status_string) + 1);
if (!chunk) {
goto fail;
diff --git a/sapi/cli/tests/php_cli_server_013.phpt b/sapi/cli/tests/php_cli_server_013.phpt
index 18b7375b3f..570798a880 100644
--- a/sapi/cli/tests/php_cli_server_013.phpt
+++ b/sapi/cli/tests/php_cli_server_013.phpt
@@ -33,7 +33,7 @@ HEADER
}
}
-echo preg_replace("/<style type=\"text\/css\">(.*?)<\/style>/s", "<style type=\"text/css\">AAA</style>", $output), "\n";
+echo preg_replace("/<style>(.*?)<\/style>/s", "<style>AAA</style>", $output), "\n";
fclose($fp);
@@ -55,7 +55,7 @@ HEADER
}
}
-echo preg_replace("/<style type=\"text\/css\">(.*?)<\/style>/s", "<style type=\"text/css\">AAA</style>", $output), "\n";
+echo preg_replace("/<style>(.*?)<\/style>/s", "<style>AAA</style>", $output), "\n";
fclose($fp);
$output = '';
@@ -76,7 +76,7 @@ HEADER
}
}
-echo preg_replace("/<style type=\"text\/css\">(.*?)<\/style>/s", "<style type=\"text/css\">AAA</style>", $output), "\n";
+echo preg_replace("/<style>(.*?)<\/style>/s", "<style>AAA</style>", $output), "\n";
fclose($fp);
?>
--EXPECTF--
@@ -87,22 +87,22 @@ Connection: close
Content-Type: text/html; charset=UTF-8
Content-Length: %d
-<html><head><title>404 Not Found</title><style type="text/css">AAA</style>
-</head><body><h1 class="h">Not Found</h1><p>The requested resource / was not found on this server.</p></body></html>
+<!doctype html><html><head><title>404 Not Found</title><style>AAA</style>
+</head><body><h1>Not Found</h1><p>The requested resource / was not found on this server.</p></body></html>
HTTP/1.1 404 Not Found
Host: %s
Connection: close
Content-Type: text/html; charset=UTF-8
Content-Length: %d
-<html><head><title>404 Not Found</title><style type="text/css">AAA</style>
-</head><body><h1 class="h">Not Found</h1><p>The requested resource /main/style.css was not found on this server.</p></body></html>
+<!doctype html><html><head><title>404 Not Found</title><style>AAA</style>
+</head><body><h1>Not Found</h1><p>The requested resource /main/style.css was not found on this server.</p></body></html>
HTTP/1.1 404 Not Found
Host: %s
Connection: close
Content-Type: text/html; charset=UTF-8
Content-Length: %d
-<html><head><title>404 Not Found</title><style type="text/css">AAA</style>
-</head><body><h1 class="h">Not Found</h1><p>The requested resource /main/foo/bar was not found on this server.</p></body></html>
+<!doctype html><html><head><title>404 Not Found</title><style>AAA</style>
+</head><body><h1>Not Found</h1><p>The requested resource /main/foo/bar was not found on this server.</p></body></html>
diff --git a/sapi/cli/tests/php_cli_server_014.phpt b/sapi/cli/tests/php_cli_server_014.phpt
index 2eca8706bb..f8a9905613 100644
--- a/sapi/cli/tests/php_cli_server_014.phpt
+++ b/sapi/cli/tests/php_cli_server_014.phpt
@@ -57,7 +57,7 @@ HEADER
}
}
-echo preg_replace("/<style type=\"text\/css\">(.*?)<\/style>/s", "<style type=\"text/css\">AAA</style>", $output), "\n";
+echo preg_replace("/<style>(.*?)<\/style>/s", "<style>AAA</style>", $output), "\n";
fclose($fp);
?>
@@ -76,5 +76,5 @@ Connection: close
Content-Type: %s
Content-Length: %d
-<html><head><title>404 Not Found</title><style type="text/css">AAA</style>
-</head><body><h1 class="h">Not Found</h1><p>The requested resource /main/no-exists.php was not found on this server.</p></body></html>
+<!doctype html><html><head><title>404 Not Found</title><style>AAA</style>
+</head><body><h1>Not Found</h1><p>The requested resource /main/no-exists.php was not found on this server.</p></body></html>
diff --git a/tests/lang/015.inc b/tests/lang/015.inc
index d436a7bb14..d436a7bb14 100755..100644
--- a/tests/lang/015.inc
+++ b/tests/lang/015.inc
diff --git a/tests/lang/016.inc b/tests/lang/016.inc
index b73333f7b0..b73333f7b0 100755..100644
--- a/tests/lang/016.inc
+++ b/tests/lang/016.inc
diff --git a/tests/lang/023-1.inc b/tests/lang/023-1.inc
index 8d52e844c9..8d52e844c9 100755..100644
--- a/tests/lang/023-1.inc
+++ b/tests/lang/023-1.inc
diff --git a/tests/lang/023-2.inc b/tests/lang/023-2.inc
index 6dd1e730f1..6dd1e730f1 100755..100644
--- a/tests/lang/023-2.inc
+++ b/tests/lang/023-2.inc
diff --git a/tests/lang/bug38579.inc b/tests/lang/bug38579.inc
index 8ecc55824e..8ecc55824e 100755..100644
--- a/tests/lang/bug38579.inc
+++ b/tests/lang/bug38579.inc