<!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>[202158] 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/202158">202158</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-16 21:56:57 -0700 (Thu, 16 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][GTK] LayoutTest doesn't run on Ubuntu 16.04
https://bugs.webkit.org/show_bug.cgi?id=158141
Reviewed by Michael Catanzaro.
Tools:
* Scripts/webkitpy/port/base.py: Detect php version in system, then use it.
(Port._is_debian_php_version_7):
(Port._debian_php_version):
(Port._apache_config_file_name_for_platform):
* efl/install-dependencies:
* gtk/install-dependencies:
LayoutTests:
* http/conf/debian-httpd-2.4-php7.conf: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#trunkToolseflinstalldependencies">trunk/Tools/efl/install-dependencies</a></li>
<li><a href="#trunkToolsgtkinstalldependencies">trunk/Tools/gtk/install-dependencies</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttpconfdebianhttpd24php7conf">trunk/LayoutTests/http/conf/debian-httpd-2.4-php7.conf</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202157 => 202158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-17 04:48:47 UTC (rev 202157)
+++ trunk/LayoutTests/ChangeLog 2016-06-17 04:56:57 UTC (rev 202158)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-06-16 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [EFL][GTK] LayoutTest doesn't run on Ubuntu 16.04
+ https://bugs.webkit.org/show_bug.cgi?id=158141
+
+ Reviewed by Michael Catanzaro.
+
+ * http/conf/debian-httpd-2.4-php7.conf: Added.
+
</ins><span class="cx"> 2016-06-15 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Baseline JIT should be concurrent
</span></span></pre></div>
<a id="trunkLayoutTestshttpconfdebianhttpd24php7conf"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/conf/debian-httpd-2.4-php7.conf (0 => 202158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/conf/debian-httpd-2.4-php7.conf (rev 0)
+++ trunk/LayoutTests/http/conf/debian-httpd-2.4-php7.conf 2016-06-17 04:56:57 UTC (rev 202158)
</span><span class="lines">@@ -0,0 +1,148 @@
</span><ins>+ServerTokens OS
+ServerRoot "/usr/lib/apache2"
+
+PidFile "/tmp/WebKit/httpd.pid"
+ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
+
+Timeout 300
+KeepAlive On
+MaxKeepAliveRequests 100
+KeepAliveTimeout 15
+
+MinSpareServers 1
+MaxSpareServers 5
+StartServers 1
+MaxClients 150
+MaxRequestsPerChild 100000
+
+LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule include_module modules/mod_include.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule actions_module modules/mod_actions.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule cgi_module modules/mod_cgi.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule php7_module modules/libphp7.0.so
+LoadModule asis_module modules/mod_asis.so
+
+ServerName 127.0.0.1
+
+<Directory />
+ Options Indexes FollowSymLinks MultiViews ExecCGI Includes
+ AllowOverride All
+ Require all granted
+</Directory>
+
+AccessFileName .htaccess
+
+<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
+ Require all denied
+</Files>
+
+UseCanonicalName On
+HostnameLookups Off
+
+TypesConfig /etc/mime.types
+
+LogLevel warn
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+ErrorLog /tmp/WebKit/error_log
+
+ServerSignature On
+
+AddLanguage ca .ca
+AddLanguage cs .cz .cs
+AddLanguage da .dk
+AddLanguage de .de
+AddLanguage el .el
+AddLanguage en .en
+AddLanguage eo .eo
+AddLanguage es .es
+AddLanguage et .et
+AddLanguage fr .fr
+AddLanguage he .he
+AddLanguage hr .hr
+AddLanguage it .it
+AddLanguage ja .ja
+AddLanguage ko .ko
+AddLanguage ltz .ltz
+AddLanguage nl .nl
+AddLanguage nn .nn
+AddLanguage no .no
+AddLanguage pl .po
+AddLanguage pt .pt
+AddLanguage pt-BR .pt-br
+AddLanguage ru .ru
+AddLanguage sv .sv
+AddLanguage zh-CN .zh-cn
+AddLanguage zh-TW .zh-tw
+AddCharset Big5 .Big5 .big5
+AddCharset WINDOWS-1251 .cp-1251
+AddCharset CP866 .cp866
+AddCharset ISO-8859-5 .iso-ru
+AddCharset KOI8-R .koi8-r
+AddCharset UCS-2 .ucs2
+AddCharset UCS-4 .ucs4
+AddCharset UTF-8 .utf8
+
+<IfModule mod_negotiation.c>
+ LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+</IfModule>
+
+AddType application/x-tar .tgz
+
+AddEncoding x-compress .Z
+AddEncoding x-gzip .gz .tgz
+
+AddType application/x-x509-ca-cert .crt
+AddType application/x-pkcs7-crl .crl
+
+AddHandler cgi-script .cgi .pl
+
+AddType text/html .shtml
+AddOutputFilter INCLUDES .shtml
+
+AddHandler send-as-is asis
+
+<IfModule mod_php5.c>
+ AddType application/x-httpd-php .php
+ AddType application/x-httpd-php .bat
+ AddType application/x-httpd-php-source .phps
+
+ <IfModule mod_dir.c>
+ DirectoryIndex index.html index.php
+ </IfModule>
+
+ php_flag log_errors on
+ php_flag short_open_tag on
+</IfModule>
+
+<IfModule mod_rewrite.c>
+ RewriteEngine On
+ RewriteCond %{REQUEST_METHOD} ^TRACE
+ RewriteRule .* - [F]
+</IfModule>
+
+<VirtualHost *:8443>
+ ServerName 127.0.0.1
+ SSLEngine On
+</VirtualHost>
+
+#
+# Apple-specific filesystem protection.
+#
+<Files "rsrc">
+ Require all denied
+</Files>
+
+<Directory ~ ".*\.\.namedfork">
+ Require all denied
+</Directory>
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202157 => 202158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-17 04:48:47 UTC (rev 202157)
+++ trunk/Tools/ChangeLog 2016-06-17 04:56:57 UTC (rev 202158)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-06-16 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [EFL][GTK] LayoutTest doesn't run on Ubuntu 16.04
+ https://bugs.webkit.org/show_bug.cgi?id=158141
+
+ Reviewed by Michael Catanzaro.
+
+ * Scripts/webkitpy/port/base.py: Detect php version in system, then use it.
+ (Port._is_debian_php_version_7):
+ (Port._debian_php_version):
+ (Port._apache_config_file_name_for_platform):
+ * efl/install-dependencies:
+ * gtk/install-dependencies:
+
</ins><span class="cx"> 2016-06-16 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Baseline JIT should be concurrent
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (202157 => 202158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2016-06-17 04:48:47 UTC (rev 202157)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2016-06-17 04:56:57 UTC (rev 202158)
</span><span class="lines">@@ -1130,6 +1130,11 @@
</span><span class="cx"> _log.error("Could not find apache. Not installed or unknown path.")
</span><span class="cx"> return None
</span><span class="cx">
</span><ins>+ def _is_debian_php_version_7(self):
+ if self._filesystem.exists("/usr/lib/apache2/modules/libphp7.0.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">@@ -1144,6 +1149,11 @@
</span><span class="cx"> config = self._executive.run_command([self._path_to_apache(), '-v'])
</span><span class="cx"> return re.sub(r'(?:.|\n)*Server version: Apache/(\d+\.\d+)(?:.|\n)*', r'\1', config)
</span><span class="cx">
</span><ins>+ def _debian_php_version(self):
+ if self._is_debian_php_version_7():
+ return "-php7"
+ return ""
+
</ins><span class="cx"> # We pass sys_platform into this method to make it easy to unit test.
</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="lines">@@ -1152,7 +1162,7 @@
</span><span class="cx"> if self._is_redhat_based():
</span><span class="cx"> return 'fedora-httpd-' + self._apache_version() + '.conf'
</span><span class="cx"> if self._is_debian_based():
</span><del>- return 'debian-httpd-' + self._apache_version() + '.conf'
</del><ins>+ return 'debian-httpd-' + self._apache_version() + self._debian_php_version() + '.conf'
</ins><span class="cx"> if self._is_arch_based():
</span><span class="cx"> return 'archlinux-httpd.conf'
</span><span class="cx"> # All platforms use apache2 except for CYGWIN (and Mac OS X Tiger and prior, which we no longer support).
</span></span></pre></div>
<a id="trunkToolseflinstalldependencies"></a>
<div class="modfile"><h4>Modified: trunk/Tools/efl/install-dependencies (202157 => 202158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/install-dependencies 2016-06-17 04:48:47 UTC (rev 202157)
+++ trunk/Tools/efl/install-dependencies 2016-06-17 04:56:57 UTC (rev 202158)
</span><span class="lines">@@ -111,10 +111,22 @@
</span><span class="cx"> # These are dependencies necessary for running tests.
</span><span class="cx"> apt-get install \
</span><span class="cx"> apache2 \
</span><del>- libapache2-mod-php5 \
</del><span class="cx"> libruby \
</span><span class="cx"> xvfb
</span><ins>+
+ installPHPWithApt
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+function installPHPWithApt {
+ if [ -f "/etc/os-release" ]; then
+ ubuntu_version=`grep VERSION_ID /etc/os-release`
+ if [[ $ubuntu_version == *VERSION_ID=\"16.04* ]]; then
+ apt-get install libapache2-mod-php7.0
+ else
+ apt-get install libapache2-mod-php5
+ fi
+ fi
+}
+
</ins><span class="cx"> checkInstaller
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsgtkinstalldependencies"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/install-dependencies (202157 => 202158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/install-dependencies 2016-06-17 04:48:47 UTC (rev 202157)
+++ trunk/Tools/gtk/install-dependencies 2016-06-17 04:56:57 UTC (rev 202158)
</span><span class="lines">@@ -138,7 +138,6 @@
</span><span class="cx"> curl \
</span><span class="cx"> dbus-x11 \
</span><span class="cx"> libapache2-mod-bw \
</span><del>- libapache2-mod-php5 \
</del><span class="cx"> libgpg-error-dev \
</span><span class="cx"> pulseaudio-utils \
</span><span class="cx"> python-gi \
</span><span class="lines">@@ -192,6 +191,8 @@
</span><span class="cx"> subversion"
</span><span class="cx">
</span><span class="cx"> apt-get install $packages
</span><ins>+
+ installPHPWithApt
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function installDependenciesWithPacman {
</span><span class="lines">@@ -432,5 +433,16 @@
</span><span class="cx"> dnf install $packages
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function installPHPWithApt {
+ if [ -f "/etc/os-release" ]; then
+ ubuntu_version=`grep VERSION_ID /etc/os-release`
+ if [[ $ubuntu_version == *VERSION_ID=\"16.04* ]]; then
+ apt-get install libapache2-mod-php7.0
+ else
+ apt-get install libapache2-mod-php5
+ fi
+ fi
+}
+
</ins><span class="cx"> checkInstaller
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>