Changeset 209611 in webkit

Timestamp:

Dec 9, 2016, 9:57:39 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Fedora also needs a PHP7 config file alternative
​https://bugs.webkit.org/show_bug.cgi?id=165606

Patch by Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk> 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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/conf/fedora-httpd-2.4-php7.conf (added)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/port/base.py (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-12-09  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        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  <rniwa@webkit.org>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2016-12-09  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        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  <ryanhaddad@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -1155 +1155 @@
         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"):
@@ -1176 +1181 @@
     def _debian_php_version(self):
         if self._is_debian_php_version_7():
+            return "-php7"
+        return ""
+
+    def _fedora_php_version(self):
+        if self._is_fedora_php_version_7():
             return "-php7"
         return ""
@@ -1185 +1195 @@
         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'