<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204850] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204850">204850</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2016-08-23 12:12:36 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsserversapache_http_serverpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttpconfphpini">trunk/LayoutTests/http/conf/php.ini</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204849 => 204850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-23 19:09:50 UTC (rev 204849)
+++ trunk/LayoutTests/ChangeLog 2016-08-23 19:12:36 UTC (rev 204850)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-23 Alexey Proskuryakov <ap@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-08-23 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r204226): LayoutTest editing/deleting/delete-empty-line-breaks-at-end-of-textarea.html "crashing" without a crashlog
</span></span></pre></div>
<a id="trunkLayoutTestshttpconfphpini"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/conf/php.ini (0 => 204850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/conf/php.ini (rev 0)
+++ trunk/LayoutTests/http/conf/php.ini 2016-08-23 19:12:36 UTC (rev 204850)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+; Let <meta charset> work. A charset provided in Content-Type takes precedence, and PHP 5.6+ defaults to UTF-8.
+default_charset = ""
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (204849 => 204850)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1408,9 +1408,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/128312 media/video-load-preload-metadata.html [ Pass Failure ]
</span><span class="cx">
</span><del>-# rdar://problem/27434307
-[ Sierra+ ] http/tests/misc/bad-charset-alias.html [ Failure ]
-
</del><span class="cx"> # rdar://problem/27475162
</span><span class="cx"> [ Sierra+ ] compositing/video/poster.html [ Pass ImageOnlyFailure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204849 => 204850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-23 19:09:50 UTC (rev 204849)
+++ trunk/Tools/ChangeLog 2016-08-23 19:12:36 UTC (rev 204850)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-23 Alexey Proskuryakov <ap@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-08-23 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r204243.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsserversapache_http_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py (204849 => 204850)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> access_log = self._filesystem.join(output_dir, "access_log.txt")
</span><span class="cx"> error_log = self._filesystem.join(output_dir, "error_log.txt")
</span><span class="cx"> document_root = self._filesystem.join(self.tests_dir, "http", "tests")
</span><ins>+ php_ini_dir = self._filesystem.join(self.tests_dir, "http", "conf")
</ins><span class="cx">
</span><span class="cx"> if port_obj.get_option('http_access_log'):
</span><span class="cx"> access_log = port_obj.get_option('http_access_log')
</span><span class="lines">@@ -93,6 +94,7 @@
</span><span class="cx"> '-f', "\"%s\"" % self._get_apache_config_file_path(self.tests_dir, output_dir),
</span><span class="cx"> '-C', "\'DocumentRoot \"%s\"\'" % document_root,
</span><span class="cx"> '-c', "\'TypesConfig \"%s\"\'" % mime_types_path,
</span><ins>+ '-c', "\'PHPINIDir \"%s\"\'" % php_ini_dir,
</ins><span class="cx"> '-c', "\'CustomLog \"%s\" common\'" % access_log,
</span><span class="cx"> '-c', "\'ErrorLog \"%s\"\'" % error_log,
</span><span class="cx"> '-c', "\'PidFile %s'" % self._pid_file,
</span></span></pre>
</div>
</div>
</body>
</html>