Diff
Modified: trunk/LayoutTests/ChangeLog (278119 => 278120)
--- trunk/LayoutTests/ChangeLog 2021-05-26 19:19:28 UTC (rev 278119)
+++ trunk/LayoutTests/ChangeLog 2021-05-26 19:59:16 UTC (rev 278120)
@@ -1,5 +1,19 @@
2021-05-26 Jonathan Bedard <jbed...@apple.com>
+ [run-webkit-tests] Strip php support from webserver (Apache)
+ https://bugs.webkit.org/show_bug.cgi?id=226032
+ <rdar://problem/78269181>
+
+ Reviewed by Adrian Perez de Castro.
+
+ * http/conf/apache2.2-httpd.conf: Remove PHP.
+ * http/conf/apache2.4-darwin-httpd.conf: Copied from LayoutTests/http/conf/apache2.4-x-httpd.conf.
+ * http/conf/apache2.4-httpd.conf: Remove PHP.
+ * http/conf/apache2.4-php7-httpd.conf: Removed.
+ * http/conf/apache2.4-x-httpd.conf: Renamed apache2.4-darwin-httpd.conf.
+
+2021-05-26 Jonathan Bedard <jbed...@apple.com>
+
[LayoutTests] Delete php tests from imported/blink
https://bugs.webkit.org/show_bug.cgi?id=226177
<rdar://problem/78401190>
Modified: trunk/LayoutTests/http/conf/apache2.2-httpd.conf (278119 => 278120)
--- trunk/LayoutTests/http/conf/apache2.2-httpd.conf 2021-05-26 19:19:28 UTC (rev 278119)
+++ trunk/LayoutTests/http/conf/apache2.2-httpd.conf 2021-05-26 19:59:16 UTC (rev 278120)
@@ -28,7 +28,6 @@
LoadModule actions_module libexec/apache2/mod_actions.so
LoadModule alias_module libexec/apache2/mod_alias.so
LoadModule rewrite_module libexec/apache2/mod_rewrite.so
-LoadModule php5_module libexec/apache2/libphp5.so
ServerName 127.0.0.1
@@ -117,19 +116,6 @@
AddHandler send-as-is asis
</IfModule>
-<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
Copied: trunk/LayoutTests/http/conf/apache2.4-darwin-httpd.conf (from rev 278119, trunk/LayoutTests/http/conf/apache2.4-x-httpd.conf) (0 => 278120)
--- trunk/LayoutTests/http/conf/apache2.4-darwin-httpd.conf (rev 0)
+++ trunk/LayoutTests/http/conf/apache2.4-darwin-httpd.conf 2021-05-26 19:59:16 UTC (rev 278120)
@@ -0,0 +1,155 @@
+ServerRoot "/usr"
+
+Mutex file:/tmp/WebKit
+PidFile "/tmp/WebKit/httpd.pid"
+ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
+
+Timeout 300
+KeepAlive On
+MaxKeepAliveRequests 100
+KeepAliveTimeout 15
+
+MinSpareServers 1
+MaxSpareServers 5
+StartServers 1
+MaxRequestWorkers 150
+MaxConnectionsPerChild 100000
+
+LoadModule autoindex_module libexec/apache2/mod_autoindex.so
+LoadModule unixd_module libexec/apache2/mod_unixd.so
+LoadModule access_compat_module libexec/apache2/mod_access_compat.so
+LoadModule authn_core_module libexec/apache2/mod_authn_core.so
+LoadModule authz_core_module libexec/apache2/mod_authz_core.so
+LoadModule authz_host_module libexec/apache2/mod_authz_host.so
+LoadModule include_module libexec/apache2/mod_include.so
+LoadModule log_config_module libexec/apache2/mod_log_config.so
+LoadModule headers_module libexec/apache2/mod_headers.so
+LoadModule ssl_module libexec/apache2/mod_ssl.so
+LoadModule mime_module libexec/apache2/mod_mime.so
+LoadModule asis_module libexec/apache2/mod_asis.so
+LoadModule cgi_module libexec/apache2/mod_cgi.so
+LoadModule negotiation_module libexec/apache2/mod_negotiation.so
+#LoadModule imagemap_module libexec/apache2/mod_imagemap.so
+LoadModule actions_module libexec/apache2/mod_actions.so
+LoadModule alias_module libexec/apache2/mod_alias.so
+LoadModule rewrite_module libexec/apache2/mod_rewrite.so
+
+<IfModule !mpm_prefork_module>
+ LoadModule mpm_prefork_module libexec/apache2/mod_mpm_prefork.so
+</IfModule>
+
+ServerName 127.0.0.1
+
+<Directory />
+ Options Indexes FollowSymLinks MultiViews ExecCGI Includes
+ AllowOverride All
+ Order allow,deny
+ Allow from all
+ CGIPassAuth On
+</Directory>
+
+AccessFileName .htaccess
+
+<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
+ Order allow,deny
+ Deny from all
+ Satisfy All
+</Files>
+
+UseCanonicalName On
+HostnameLookups Off
+
+LogLevel warn
+
+ErrorLog "/tmp/WebKit/error_log.txt"
+
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b %D" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+ServerSignature On
+
+<IfModule mod_alias.c>
+</IfModule>
+
+<IfModule mod_mime.c>
+ AddLanguage da .dk
+ AddLanguage nl .nl
+ AddLanguage en .en
+ AddLanguage et .ee
+ AddLanguage fr .fr
+ AddLanguage de .de
+ AddLanguage el .el
+ AddLanguage he .he
+ AddCharset ISO-8859-8 .iso8859-8
+ AddLanguage it .it
+ AddLanguage ja .ja
+ AddCharset ISO-2022-JP .jis
+ AddLanguage kr .kr
+ AddCharset ISO-2022-KR .iso-kr
+ AddLanguage nn .nn
+ AddLanguage no .no
+ AddLanguage pl .po
+ AddCharset ISO-8859-2 .iso-pl
+ AddLanguage pt .pt
+ AddLanguage pt-br .pt-br
+ AddLanguage ltz .lu
+ AddLanguage ca .ca
+ AddLanguage es .es
+ AddLanguage sv .sv
+ AddLanguage cs .cz .cs
+ AddLanguage ru .ru
+ 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 da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
+ </IfModule>
+
+ AddType application/x-tar .tgz
+
+ AddEncoding x-compress .Z
+ AddEncoding x-gzip .gz .tgz
+
+ AddHandler cgi-script .cgi .pl .py
+
+ AddType text/html .shtml
+ AddHandler server-parsed .shtml
+
+ AddHandler send-as-is asis
+</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">
+ Order allow,deny
+ Deny from all
+ Satisfy All
+</Files>
+
+<Directory ~ ".*\.\.namedfork">
+ Order allow,deny
+ Deny from all
+ Satisfy All
+ CGIPassAuth On
+</Directory>
Modified: trunk/LayoutTests/http/conf/apache2.4-httpd.conf (278119 => 278120)
--- trunk/LayoutTests/http/conf/apache2.4-httpd.conf 2021-05-26 19:19:28 UTC (rev 278119)
+++ trunk/LayoutTests/http/conf/apache2.4-httpd.conf 2021-05-26 19:59:16 UTC (rev 278120)
@@ -33,7 +33,6 @@
LoadModule actions_module libexec/apache2/mod_actions.so
LoadModule alias_module libexec/apache2/mod_alias.so
LoadModule rewrite_module libexec/apache2/mod_rewrite.so
-LoadModule php5_module libexec/apache2/libphp5.so
ServerName 127.0.0.1
@@ -124,19 +123,6 @@
AddHandler send-as-is asis
</IfModule>
-<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
Deleted: trunk/LayoutTests/http/conf/apache2.4-php7-httpd.conf (278119 => 278120)
--- trunk/LayoutTests/http/conf/apache2.4-php7-httpd.conf 2021-05-26 19:19:28 UTC (rev 278119)
+++ trunk/LayoutTests/http/conf/apache2.4-php7-httpd.conf 2021-05-26 19:59:16 UTC (rev 278120)
@@ -1,169 +0,0 @@
-ServerRoot "/usr"
-
-Mutex file:/tmp/WebKit
-PidFile "/tmp/WebKit/httpd.pid"
-ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
-
-Timeout 300
-KeepAlive On
-MaxKeepAliveRequests 100
-KeepAliveTimeout 15
-
-MinSpareServers 1
-MaxSpareServers 5
-StartServers 1
-MaxRequestWorkers 150
-MaxConnectionsPerChild 100000
-
-LoadModule autoindex_module libexec/apache2/mod_autoindex.so
-LoadModule unixd_module libexec/apache2/mod_unixd.so
-LoadModule access_compat_module libexec/apache2/mod_access_compat.so
-LoadModule authn_core_module libexec/apache2/mod_authn_core.so
-LoadModule authz_core_module libexec/apache2/mod_authz_core.so
-LoadModule authz_host_module libexec/apache2/mod_authz_host.so
-LoadModule include_module libexec/apache2/mod_include.so
-LoadModule log_config_module libexec/apache2/mod_log_config.so
-LoadModule headers_module libexec/apache2/mod_headers.so
-LoadModule ssl_module libexec/apache2/mod_ssl.so
-LoadModule mime_module libexec/apache2/mod_mime.so
-LoadModule asis_module libexec/apache2/mod_asis.so
-LoadModule cgi_module libexec/apache2/mod_cgi.so
-LoadModule negotiation_module libexec/apache2/mod_negotiation.so
-#LoadModule imagemap_module libexec/apache2/mod_imagemap.so
-LoadModule actions_module libexec/apache2/mod_actions.so
-LoadModule alias_module libexec/apache2/mod_alias.so
-LoadModule rewrite_module libexec/apache2/mod_rewrite.so
-LoadModule php7_module libexec/apache2/libphp7.so
-
-<IfModule !mpm_prefork_module>
- LoadModule mpm_prefork_module libexec/apache2/mod_mpm_prefork.so
-</IfModule>
-
-ServerName 127.0.0.1
-
-<Directory />
- Options Indexes FollowSymLinks MultiViews ExecCGI Includes
- AllowOverride All
- Order allow,deny
- Allow from all
- CGIPassAuth On
-</Directory>
-
-AccessFileName .htaccess
-
-<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
- Order allow,deny
- Deny from all
- Satisfy All
-</Files>
-
-UseCanonicalName On
-HostnameLookups Off
-
-LogLevel warn
-
-ErrorLog "/tmp/WebKit/error_log.txt"
-
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %b %D" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-ServerSignature On
-
-<IfModule mod_alias.c>
-</IfModule>
-
-<IfModule mod_mime.c>
- AddLanguage da .dk
- AddLanguage nl .nl
- AddLanguage en .en
- AddLanguage et .ee
- AddLanguage fr .fr
- AddLanguage de .de
- AddLanguage el .el
- AddLanguage he .he
- AddCharset ISO-8859-8 .iso8859-8
- AddLanguage it .it
- AddLanguage ja .ja
- AddCharset ISO-2022-JP .jis
- AddLanguage kr .kr
- AddCharset ISO-2022-KR .iso-kr
- AddLanguage nn .nn
- AddLanguage no .no
- AddLanguage pl .po
- AddCharset ISO-8859-2 .iso-pl
- AddLanguage pt .pt
- AddLanguage pt-br .pt-br
- AddLanguage ltz .lu
- AddLanguage ca .ca
- AddLanguage es .es
- AddLanguage sv .sv
- AddLanguage cs .cz .cs
- AddLanguage ru .ru
- 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 da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
- </IfModule>
-
- AddType application/x-tar .tgz
-
- AddEncoding x-compress .Z
- AddEncoding x-gzip .gz .tgz
-
- AddHandler cgi-script .cgi .pl .py
-
- AddType text/html .shtml
- AddHandler server-parsed .shtml
-
- AddHandler send-as-is asis
-</IfModule>
-
-<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">
- Order allow,deny
- Deny from all
- Satisfy All
-</Files>
-
-<Directory ~ ".*\.\.namedfork">
- Order allow,deny
- Deny from all
- Satisfy All
- CGIPassAuth On
-</Directory>
Deleted: trunk/LayoutTests/http/conf/apache2.4-x-httpd.conf (278119 => 278120)
--- trunk/LayoutTests/http/conf/apache2.4-x-httpd.conf 2021-05-26 19:19:28 UTC (rev 278119)
+++ trunk/LayoutTests/http/conf/apache2.4-x-httpd.conf 2021-05-26 19:59:16 UTC (rev 278120)
@@ -1,155 +0,0 @@
-ServerRoot "/usr"
-
-Mutex file:/tmp/WebKit
-PidFile "/tmp/WebKit/httpd.pid"
-ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
-
-Timeout 300
-KeepAlive On
-MaxKeepAliveRequests 100
-KeepAliveTimeout 15
-
-MinSpareServers 1
-MaxSpareServers 5
-StartServers 1
-MaxRequestWorkers 150
-MaxConnectionsPerChild 100000
-
-LoadModule autoindex_module libexec/apache2/mod_autoindex.so
-LoadModule unixd_module libexec/apache2/mod_unixd.so
-LoadModule access_compat_module libexec/apache2/mod_access_compat.so
-LoadModule authn_core_module libexec/apache2/mod_authn_core.so
-LoadModule authz_core_module libexec/apache2/mod_authz_core.so
-LoadModule authz_host_module libexec/apache2/mod_authz_host.so
-LoadModule include_module libexec/apache2/mod_include.so
-LoadModule log_config_module libexec/apache2/mod_log_config.so
-LoadModule headers_module libexec/apache2/mod_headers.so
-LoadModule ssl_module libexec/apache2/mod_ssl.so
-LoadModule mime_module libexec/apache2/mod_mime.so
-LoadModule asis_module libexec/apache2/mod_asis.so
-LoadModule cgi_module libexec/apache2/mod_cgi.so
-LoadModule negotiation_module libexec/apache2/mod_negotiation.so
-#LoadModule imagemap_module libexec/apache2/mod_imagemap.so
-LoadModule actions_module libexec/apache2/mod_actions.so
-LoadModule alias_module libexec/apache2/mod_alias.so
-LoadModule rewrite_module libexec/apache2/mod_rewrite.so
-
-<IfModule !mpm_prefork_module>
- LoadModule mpm_prefork_module libexec/apache2/mod_mpm_prefork.so
-</IfModule>
-
-ServerName 127.0.0.1
-
-<Directory />
- Options Indexes FollowSymLinks MultiViews ExecCGI Includes
- AllowOverride All
- Order allow,deny
- Allow from all
- CGIPassAuth On
-</Directory>
-
-AccessFileName .htaccess
-
-<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
- Order allow,deny
- Deny from all
- Satisfy All
-</Files>
-
-UseCanonicalName On
-HostnameLookups Off
-
-LogLevel warn
-
-ErrorLog "/tmp/WebKit/error_log.txt"
-
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %b %D" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-ServerSignature On
-
-<IfModule mod_alias.c>
-</IfModule>
-
-<IfModule mod_mime.c>
- AddLanguage da .dk
- AddLanguage nl .nl
- AddLanguage en .en
- AddLanguage et .ee
- AddLanguage fr .fr
- AddLanguage de .de
- AddLanguage el .el
- AddLanguage he .he
- AddCharset ISO-8859-8 .iso8859-8
- AddLanguage it .it
- AddLanguage ja .ja
- AddCharset ISO-2022-JP .jis
- AddLanguage kr .kr
- AddCharset ISO-2022-KR .iso-kr
- AddLanguage nn .nn
- AddLanguage no .no
- AddLanguage pl .po
- AddCharset ISO-8859-2 .iso-pl
- AddLanguage pt .pt
- AddLanguage pt-br .pt-br
- AddLanguage ltz .lu
- AddLanguage ca .ca
- AddLanguage es .es
- AddLanguage sv .sv
- AddLanguage cs .cz .cs
- AddLanguage ru .ru
- 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 da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
- </IfModule>
-
- AddType application/x-tar .tgz
-
- AddEncoding x-compress .Z
- AddEncoding x-gzip .gz .tgz
-
- AddHandler cgi-script .cgi .pl .py
-
- AddType text/html .shtml
- AddHandler server-parsed .shtml
-
- AddHandler send-as-is asis
-</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">
- Order allow,deny
- Deny from all
- Satisfy All
-</Files>
-
-<Directory ~ ".*\.\.namedfork">
- Order allow,deny
- Deny from all
- Satisfy All
- CGIPassAuth On
-</Directory>
Modified: trunk/Tools/ChangeLog (278119 => 278120)
--- trunk/Tools/ChangeLog 2021-05-26 19:19:28 UTC (rev 278119)
+++ trunk/Tools/ChangeLog 2021-05-26 19:59:16 UTC (rev 278120)
@@ -1,5 +1,18 @@
2021-05-26 Jonathan Bedard <jbed...@apple.com>
+ [run-webkit-tests] Strip php support from webserver (Apache)
+ https://bugs.webkit.org/show_bug.cgi?id=226032
+ <rdar://problem/78269181>
+
+ Reviewed by Adrian Perez de Castro.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port._apache_config_file_name_for_platform): Use explicit Darwin httpd.conf.
+ (Port._is_darwin_php_version_7): Deleted.
+ (Port._darwin_php_version): Deleted.
+
+2021-05-26 Jonathan Bedard <jbed...@apple.com>
+
[test-lldb-webkit] Update for Xcode 12.5
https://bugs.webkit.org/show_bug.cgi?id=226115
<rdar://problem/78331664>
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (278119 => 278120)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2021-05-26 19:19:28 UTC (rev 278119)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2021-05-26 19:59:16 UTC (rev 278120)
@@ -1131,11 +1131,6 @@
_log.error("Could not find apache. Not installed or unknown path.")
return None
- def _is_darwin_php_version_7(self):
- if self._filesystem.exists("/usr/libexec/apache2/libphp7.so"):
- return True
- return False
-
# FIXME: This belongs on some platform abstraction instead of Port.
def _is_redhat_based(self):
return self._filesystem.exists('/etc/redhat-release')
@@ -1153,16 +1148,6 @@
config = self._executive.run_command([self._path_to_apache(), '-v'])
return re.sub(r'(?:.|\n)*Server version: Apache/(\d+\.\d+)(?:.|\n)*', r'\1', config)
- def _darwin_php_version(self):
- if self._is_darwin_php_version_7():
- return '-php7'
- if self._filesystem.isdir('/usr/libexec/apache2'):
- for file in self._filesystem.listdir('/usr/libexec/apache2'):
- if 'php' in file:
- return ''
- return '-x'
- return ''
-
def _win_php_version(self):
root = os.environ.get('XAMPP_ROOT', 'C:\\xampp')
prefix = self._filesystem.join(root, 'php')
@@ -1178,7 +1163,7 @@
if sys_platform in ['cygwin', 'win32']:
return 'win-httpd-' + self._apache_version() + self._win_php_version() + '.conf'
if sys_platform == 'darwin':
- return 'apache' + self._apache_version() + self._darwin_php_version() + '-httpd.conf'
+ return 'apache' + self._apache_version() + '-darwin-httpd.conf'
if sys_platform.startswith('linux'):
if self._is_redhat_based():
return 'fedora-httpd-' + self._apache_version() + '.conf'
