Title: [193532] trunk/Websites/webkit.org
- Revision
- 193532
- Author
- [email protected]
- Date
- 2015-12-05 13:39:41 -0800 (Sat, 05 Dec 2015)
Log Message
Fix www redirect when https was used and restore status URL code.
* wp-content/themes/webkit/.htaccess:
* wp-content/themes/webkit/status.php:
Modified Paths
Diff
Modified: trunk/Websites/webkit.org/.htaccess (193531 => 193532)
--- trunk/Websites/webkit.org/.htaccess 2015-12-05 21:26:29 UTC (rev 193531)
+++ trunk/Websites/webkit.org/.htaccess 2015-12-05 21:39:41 UTC (rev 193532)
@@ -13,7 +13,7 @@
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]
Modified: trunk/Websites/webkit.org/ChangeLog (193531 => 193532)
--- trunk/Websites/webkit.org/ChangeLog 2015-12-05 21:26:29 UTC (rev 193531)
+++ trunk/Websites/webkit.org/ChangeLog 2015-12-05 21:39:41 UTC (rev 193532)
@@ -1,5 +1,12 @@
2015-12-05 Timothy Hatcher <[email protected]>
+ 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 <[email protected]>
+
Another attempt to fix a 404 error when the site loads via www.webkit.org.
* wp-content/themes/webkit/status.php:
Modified: trunk/Websites/webkit.org/wp-content/themes/webkit/status.php (193531 => 193532)
--- trunk/Websites/webkit.org/wp-content/themes/webkit/status.php 2015-12-05 21:26:29 UTC (rev 193531)
+++ trunk/Websites/webkit.org/wp-content/themes/webkit/status.php 2015-12-05 21:39:41 UTC (rev 193532)
@@ -28,7 +28,7 @@
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/_javascript_Core/features.json", origin));
var loadWebCoreFeatures = xhrPromise(new URL("/repository/webkit/trunk/Source/WebCore/features.json", origin));
</script>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
