Title: [209611] trunk
- Revision
- 209611
- Author
- [email protected]
- Date
- 2016-12-09 09:57:39 -0800 (Fri, 09 Dec 2016)
Log Message
Fedora also needs a PHP7 config file alternative
https://bugs.webkit.org/show_bug.cgi?id=165606
Patch by Gustavo Noronha Silva <[email protected]> on 2016-12-09
Reviewed by Michael Catanzaro.
Tools:
* Scripts/webkitpy/port/base.py:
(Port._is_fedora_php_version_7): check for the php7 library.
(Port._fedora_php_version): get the appropriate filename for Fedora.
(Port._apache_config_file_name_for_platform):
LayoutTests:
* http/conf/fedora-httpd-2.4-php7.conf: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (209610 => 209611)
--- trunk/LayoutTests/ChangeLog 2016-12-09 17:54:56 UTC (rev 209610)
+++ trunk/LayoutTests/ChangeLog 2016-12-09 17:57:39 UTC (rev 209611)
@@ -1,3 +1,12 @@
+2016-12-09 Gustavo Noronha Silva <[email protected]>
+
+ Fedora also needs a PHP7 config file alternative
+ https://bugs.webkit.org/show_bug.cgi?id=165606
+
+ Reviewed by Michael Catanzaro.
+
+ * http/conf/fedora-httpd-2.4-php7.conf: Added.
+
2016-12-09 Ryosuke Niwa <[email protected]>
Custom Elements from a different document are not customized when created with innerHTML
Added: trunk/LayoutTests/http/conf/fedora-httpd-2.4-php7.conf (0 => 209611)
--- trunk/LayoutTests/http/conf/fedora-httpd-2.4-php7.conf (rev 0)
+++ trunk/LayoutTests/http/conf/fedora-httpd-2.4-php7.conf 2016-12-09 17:57:39 UTC (rev 209611)
@@ -0,0 +1,152 @@
+ServerTokens OS
+ServerRoot "/etc/httpd"
+
+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 log_config_module modules/mod_log_config.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 unixd_module modules/mod_unixd.so
+LoadModule php7_module modules/libphp7.so
+
+LoadModule asis_module modules/mod_asis.so
+
+User apache
+Group apache
+
+ServerAdmin root@localhost
+ServerName 127.0.0.1
+
+UseCanonicalName On
+
+<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>
+
+TypesConfig /etc/mime.types
+HostnameLookups Off
+
+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
+
+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>
+
+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>
Modified: trunk/Tools/ChangeLog (209610 => 209611)
--- trunk/Tools/ChangeLog 2016-12-09 17:54:56 UTC (rev 209610)
+++ trunk/Tools/ChangeLog 2016-12-09 17:57:39 UTC (rev 209611)
@@ -1,3 +1,15 @@
+2016-12-09 Gustavo Noronha Silva <[email protected]>
+
+ Fedora also needs a PHP7 config file alternative
+ https://bugs.webkit.org/show_bug.cgi?id=165606
+
+ Reviewed by Michael Catanzaro.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port._is_fedora_php_version_7): check for the php7 library.
+ (Port._fedora_php_version): get the appropriate filename for Fedora.
+ (Port._apache_config_file_name_for_platform):
+
2016-12-09 Ryan Haddad <[email protected]>
Complete the revert of r208865.
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (209610 => 209611)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2016-12-09 17:54:56 UTC (rev 209610)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2016-12-09 17:57:39 UTC (rev 209611)
@@ -1154,6 +1154,11 @@
_log.error("Could not find apache. Not installed or unknown path.")
return None
+ def _is_fedora_php_version_7(self):
+ if self._filesystem.exists("/etc/httpd/modules/libphp7.so"):
+ return True
+ return False
+
def _is_debian_php_version_7(self):
if self._filesystem.exists("/usr/lib/apache2/modules/libphp7.0.so"):
return True
@@ -1178,6 +1183,11 @@
return "-php7"
return ""
+ def _fedora_php_version(self):
+ if self._is_fedora_php_version_7():
+ return "-php7"
+ return ""
+
# We pass sys_platform into this method to make it easy to unit test.
def _apache_config_file_name_for_platform(self, sys_platform):
if sys_platform == 'cygwin' or sys_platform.startswith('win'):
@@ -1184,7 +1194,7 @@
return 'apache' + self._apache_version() + '-httpd-win.conf'
if sys_platform.startswith('linux'):
if self._is_redhat_based():
- return 'fedora-httpd-' + self._apache_version() + '.conf'
+ return 'fedora-httpd-' + self._apache_version() + self._fedora_php_version() + '.conf'
if self._is_debian_based():
return 'debian-httpd-' + self._apache_version() + self._debian_php_version() + '.conf'
if self._is_arch_based():
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
