Attachment 342426 Details for Bug 186521 – Patch

[patch] Patch

bug-186521-20180611145640.patch (text/plain), 6.22 KB, created by Philippe Normand on 2018-06-11 06:56:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Normand

Created: 2018-06-11 06:56:42 PDT

Size: 6.22 KB

patch

obsolete

>Subversion Revision: 232699
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e1f9614525c151f41f6f52e5b6e30dfa02b97966..91268343b78a91252247c6c3d0e043b1fc861e94 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-06-11  Philippe Normand  <pnormand@igalia.com>
>+
>+        [webkitpy] PHP7.2 support on Debian platforms
>+        https://bugs.webkit.org/show_bug.cgi?id=186521
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/port/base.py:
>+        (Port._debian_php_version): Refactor and add PHP 7.2 version support.
>+
> 2018-06-11  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed. Fix WPE API and layout tests after r232670.
>diff --git a/Tools/Scripts/webkitpy/port/base.py b/Tools/Scripts/webkitpy/port/base.py
>index f83fc420efb121c494f61a0a7c983ec04499e411..0a83813a81834e4ea83c590f46ceefbb736bb04b 100644
>--- a/Tools/Scripts/webkitpy/port/base.py
>+++ b/Tools/Scripts/webkitpy/port/base.py
>@@ -1250,11 +1250,11 @@ class Port(object):
>         return re.sub(r'(?:.|\n)*Server version: Apache/(\d+\.\d+)(?:.|\n)*', r'\1', config)
> 
>     def _debian_php_version(self):
>-        if self._filesystem.exists("/usr/lib/apache2/modules/libphp7.0.so"):
>-            return "-php7.0"
>-        elif self._filesystem.exists("/usr/lib/apache2/modules/libphp7.1.so"):
>-            return "-php7.1"
>-        _log.error("No libphp7.x.so found")
>+        prefix = "/usr/lib/apache2/modules/"
>+        for version in ("7.0", "7.1", "7.2"):
>+            if self._filesystem.exists("%s/libphp%s.so" % (prefix, version)):
>+                return "-php%s" % version
>+        _log.error("No libphp7.x.so found in %s" % prefix)
>         return ""
> 
>     def _darwin_php_version(self):
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 2ccdddd6783a285dd76d65ff7e0ea94f0e62a862..bb0a0f4d0bc836e207276aa7c519852094b4b8ff 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-06-11  Philippe Normand  <pnormand@igalia.com>
>+
>+        [webkitpy] PHP7.2 support on Debian platforms
>+        https://bugs.webkit.org/show_bug.cgi?id=186521
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * http/conf/debian-httpd-2.4-php7.2.conf: Added.
>+
> 2018-06-11  Antoine Quint  <graouts@apple.com>
> 
>         [Web Animations] Make imported/mozilla/css-transitions/test_setting-effect.html pass reliably
>diff --git a/LayoutTests/http/conf/debian-httpd-2.4-php7.2.conf b/LayoutTests/http/conf/debian-httpd-2.4-php7.2.conf
>new file mode 100644
>index 0000000000000000000000000000000000000000..1b32a05957d9db9c8068d1fbd2316decdcfe96b6
>--- /dev/null
>+++ b/LayoutTests/http/conf/debian-httpd-2.4-php7.2.conf
>@@ -0,0 +1,148 @@
>+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.2.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_php7.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>

Flags:

mcatanzaro: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 186521: 342426