Title: [204850] trunk
- Revision
- 204850
- Author
- [email protected]
- Date
- 2016-08-23 12:12:36 -0700 (Tue, 23 Aug 2016)
Log Message
REGRESSION (PHP 5.6): http/tests/misc/bad-charset-alias.html fails
https://bugs.webkit.org/show_bug.cgi?id=161047
rdar://problem/27434307
Reviewed by Lucas Forschler.
Tools:
* Scripts/webkitpy/layout_tests/servers/apache_http_server.py: Specify a php.ini file.
LayoutTests:
* http/conf/php.ini: Added. On macOS at least, there is no global php.ini, so we
only need to override this one default setting.
* platform/mac/TestExpectations: Unmarked the test.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (204849 => 204850)
--- trunk/LayoutTests/ChangeLog 2016-08-23 19:09:50 UTC (rev 204849)
+++ trunk/LayoutTests/ChangeLog 2016-08-23 19:12:36 UTC (rev 204850)
@@ -1,3 +1,15 @@
+2016-08-23 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (PHP 5.6): http/tests/misc/bad-charset-alias.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=161047
+ rdar://problem/27434307
+
+ Reviewed by Lucas Forschler.
+
+ * http/conf/php.ini: Added. On macOS at least, there is no global php.ini, so we
+ only need to override this one default setting.
+ * platform/mac/TestExpectations: Unmarked the test.
+
2016-08-23 Jonathan Bedard <[email protected]>
REGRESSION (r204226): LayoutTest editing/deleting/delete-empty-line-breaks-at-end-of-textarea.html "crashing" without a crashlog
Added: trunk/LayoutTests/http/conf/php.ini (0 => 204850)
--- trunk/LayoutTests/http/conf/php.ini (rev 0)
+++ trunk/LayoutTests/http/conf/php.ini 2016-08-23 19:12:36 UTC (rev 204850)
@@ -0,0 +1,2 @@
+; Let <meta charset> work. A charset provided in Content-Type takes precedence, and PHP 5.6+ defaults to UTF-8.
+default_charset = ""
Modified: trunk/LayoutTests/platform/mac/TestExpectations (204849 => 204850)
--- trunk/LayoutTests/platform/mac/TestExpectations 2016-08-23 19:09:50 UTC (rev 204849)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-08-23 19:12:36 UTC (rev 204850)
@@ -1408,9 +1408,6 @@
webkit.org/b/128312 media/video-load-preload-metadata.html [ Pass Failure ]
-# rdar://problem/27434307
-[ Sierra+ ] http/tests/misc/bad-charset-alias.html [ Failure ]
-
# rdar://problem/27475162
[ Sierra+ ] compositing/video/poster.html [ Pass ImageOnlyFailure ]
Modified: trunk/Tools/ChangeLog (204849 => 204850)
--- trunk/Tools/ChangeLog 2016-08-23 19:09:50 UTC (rev 204849)
+++ trunk/Tools/ChangeLog 2016-08-23 19:12:36 UTC (rev 204850)
@@ -1,3 +1,13 @@
+2016-08-23 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (PHP 5.6): http/tests/misc/bad-charset-alias.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=161047
+ rdar://problem/27434307
+
+ Reviewed by Lucas Forschler.
+
+ * Scripts/webkitpy/layout_tests/servers/apache_http_server.py: Specify a php.ini file.
+
2016-08-23 Chris Dumez <[email protected]>
Unreviewed, rolling out r204243.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py (204849 => 204850)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2016-08-23 19:09:50 UTC (rev 204849)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2016-08-23 19:12:36 UTC (rev 204850)
@@ -79,6 +79,7 @@
access_log = self._filesystem.join(output_dir, "access_log.txt")
error_log = self._filesystem.join(output_dir, "error_log.txt")
document_root = self._filesystem.join(self.tests_dir, "http", "tests")
+ php_ini_dir = self._filesystem.join(self.tests_dir, "http", "conf")
if port_obj.get_option('http_access_log'):
access_log = port_obj.get_option('http_access_log')
@@ -93,6 +94,7 @@
'-f', "\"%s\"" % self._get_apache_config_file_path(self.tests_dir, output_dir),
'-C', "\'DocumentRoot \"%s\"\'" % document_root,
'-c', "\'TypesConfig \"%s\"\'" % mime_types_path,
+ '-c', "\'PHPINIDir \"%s\"\'" % php_ini_dir,
'-c', "\'CustomLog \"%s\" common\'" % access_log,
'-c', "\'ErrorLog \"%s\"\'" % error_log,
'-c', "\'PidFile %s'" % self._pid_file,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
