Fix www redirect when https was used and restore status URL code.
authortimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 5 Dec 2015 21:39:41 +0000 (21:39 +0000)
committertimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 5 Dec 2015 21:39:41 +0000 (21:39 +0000)
* wp-content/themes/webkit/.htaccess:
* wp-content/themes/webkit/status.php:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@193532 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Websites/webkit.org/.htaccess
Websites/webkit.org/ChangeLog
Websites/webkit.org/wp-content/themes/webkit/status.php

index 3859dcb..e16beb8 100644 (file)
@@ -13,7 +13,7 @@ RewriteRule (.*) https://webkit-queues.webkit.org/$1 [L,R=301]
 RewriteCond %{HTTP_HOST} ^blog.webkit.org$
 RewriteRule (.*) https://webkit.org/blog/$1 [L,R=301]
 
-RewriteCond %{HTTPS} off
+RewriteCond %{HTTPS} off [OR]
 RewriteCond %{HTTP_HOST} ^(www\.)?(.*)$
 RewriteRule (.*) https://%2/$1 [L,R=301]
 
index 669b33d..7ad3635 100644 (file)
@@ -1,5 +1,12 @@
 2015-12-05  Timothy Hatcher  <timothy@apple.com>
 
+        Fix www redirect when https was used and restore status URL code.
+
+        * wp-content/themes/webkit/.htaccess:
+        * wp-content/themes/webkit/status.php:
+
+2015-12-05  Timothy Hatcher  <timothy@apple.com>
+
         Another attempt to fix a 404 error when the site loads via www.webkit.org.
 
         * wp-content/themes/webkit/status.php:
index d7ba7ff..a748e14 100644 (file)
@@ -28,7 +28,7 @@ function xhrPromise(url) {
         xhrRequest.send();
     });
 }
-var origin = new URL("https://svn.webkit.org/");
+var origin = new URL("https://<?php echo strpos(WP_HOST, "webkit.org") !== false ? "svn.webkit.org" : WP_HOST; ?>/");
 var loadJavaScriptCoreFeatures = xhrPromise(new URL("/repository/webkit/trunk/Source/JavaScriptCore/features.json", origin));
 var loadWebCoreFeatures = xhrPromise(new URL("/repository/webkit/trunk/Source/WebCore/features.json", origin));
 </script>