<!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>[210510] 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/210510">210510</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2017-01-09 09:39:14 -0800 (Mon, 09 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>https://bugs.webkit.org/show_bug.cgi?id=166839
Add php7 support for macOS.
Tools:
Mirror the debian logic to look for a php7 module on disk, and return the appropriate apache config file.
Reviewed by Alexey Proskuryakov.
* Scripts/webkitpy/port/base.py:
(Port._is_darwin_php_version_7):
(Port._debian_php_version):
(Port):
(Port._darwin_php_version):
(Port._apache_config_file_name_for_platform):
LayoutTests:
This patch mirrors the solution that debian uses, by adding a php7 specific apache conf file.
Reviewed by Alexey Proskuryakov.
* http/conf/apache2.4-php7-httpd.conf: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttpconfapache24php7httpdconf">trunk/LayoutTests/http/conf/apache2.4-php7-httpd.conf</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210509 => 210510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-09 17:33:15 UTC (rev 210509)
+++ trunk/LayoutTests/ChangeLog 2017-01-09 17:39:14 UTC (rev 210510)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-01-09 Lucas Forschler <lforschler@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=166839
+ Add php7 support for macOS.
+ This patch mirrors the solution that debian uses, by adding a php7 specific apache conf file.
+
+ Reviewed by Alexey Proskuryakov.
+
+ * http/conf/apache2.4-php7-httpd.conf: Added.
+
</ins><span class="cx"> 2017-01-09 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking inspector/debugger/breakpoint-action-log.html as flaky on macOS.
</span></span></pre></div>
<a id="trunkLayoutTestshttpconfapache24php7httpdconf"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/conf/apache2.4-php7-httpd.conf (210509 => 210510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/conf/apache2.4-php7-httpd.conf 2017-01-09 17:33:15 UTC (rev 210509)
+++ trunk/LayoutTests/http/conf/apache2.4-php7-httpd.conf 2017-01-09 17:39:14 UTC (rev 210510)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> LoadModule actions_module libexec/apache2/mod_actions.so
</span><span class="cx"> LoadModule alias_module libexec/apache2/mod_alias.so
</span><span class="cx"> LoadModule rewrite_module libexec/apache2/mod_rewrite.so
</span><del>-LoadModule php5_module libexec/apache2/libphp5.so
</del><ins>+LoadModule php7_module libexec/apache2/libphp7.so
</ins><span class="cx">
</span><span class="cx"> ServerName 127.0.0.1
</span><span class="cx">
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> AddHandler send-as-is asis
</span><span class="cx"> </IfModule>
</span><span class="cx">
</span><del>-<IfModule mod_php5.c>
</del><ins>+<IfModule mod_php7.c>
</ins><span class="cx"> AddType application/x-httpd-php .php
</span><span class="cx"> AddType application/x-httpd-php .bat
</span><span class="cx"> AddType application/x-httpd-php-source .phps
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210509 => 210510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-09 17:33:15 UTC (rev 210509)
+++ trunk/Tools/ChangeLog 2017-01-09 17:39:14 UTC (rev 210510)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-01-09 Lucas Forschler <lforschler@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=166839
+ Add php7 support for macOS.
+ Mirror the debian logic to look for a php7 module on disk, and return the appropriate apache config file.
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port._is_darwin_php_version_7):
+ (Port._debian_php_version):
+ (Port):
+ (Port._darwin_php_version):
+ (Port._apache_config_file_name_for_platform):
+
</ins><span class="cx"> 2017-01-06 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
</span><span class="cx">
</span><span class="cx"> [GTK] Should support key and code properties on keyboard events
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (210509 => 210510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2017-01-09 17:33:15 UTC (rev 210509)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2017-01-09 17:39:14 UTC (rev 210510)
</span><span class="lines">@@ -1164,6 +1164,11 @@
</span><span class="cx"> return True
</span><span class="cx"> return False
</span><span class="cx">
</span><ins>+ def _is_darwin_php_version_7(self):
+ if self._filesystem.exists("/usr/libexec/apache2/libphp7.so"):
+ return True
+ return False
+
</ins><span class="cx"> # FIXME: This belongs on some platform abstraction instead of Port.
</span><span class="cx"> def _is_redhat_based(self):
</span><span class="cx"> return self._filesystem.exists('/etc/redhat-release')
</span><span class="lines">@@ -1183,6 +1188,11 @@
</span><span class="cx"> return "-php7"
</span><span class="cx"> return ""
</span><span class="cx">
</span><ins>+ def _darwin_php_version(self):
+ if self._is_darwin_php_version_7():
+ return "-php7"
+ return ""
+
</ins><span class="cx"> def _fedora_php_version(self):
</span><span class="cx"> if self._is_fedora_php_version_7():
</span><span class="cx"> return "-php7"
</span><span class="lines">@@ -1192,6 +1202,8 @@
</span><span class="cx"> def _apache_config_file_name_for_platform(self, sys_platform):
</span><span class="cx"> if sys_platform == 'cygwin' or sys_platform.startswith('win'):
</span><span class="cx"> return 'apache' + self._apache_version() + '-httpd-win.conf'
</span><ins>+ if sys_platform == 'darwin':
+ return 'apache' + self._apache_version() + self._darwin_php_version() + '-httpd.conf'
</ins><span class="cx"> if sys_platform.startswith('linux'):
</span><span class="cx"> if self._is_redhat_based():
</span><span class="cx"> return 'fedora-httpd-' + self._apache_version() + self._fedora_php_version() + '.conf'
</span></span></pre>
</div>
</div>
</body>
</html>