Another attempt to fix the http blog redirects.
authortimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Dec 2015 04:30:47 +0000 (04:30 +0000)
committertimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Dec 2015 04:30:47 +0000 (04:30 +0000)
* .htaccess:

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

Websites/webkit.org/.htaccess
Websites/webkit.org/ChangeLog

index 89e6848..6eb95c3 100644 (file)
@@ -4,20 +4,18 @@ AddType text/cache-manifest manifest
 
 RewriteRule .*\.svn.* - [F]
 
+RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
+RewriteRule .* - [F]
+
 RewriteCond %{HTTP_HOST} ^queues.webkit.org$
-RewriteRule (.*) https://webkit-queues.webkit.org$1 [L,R=301]
+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]
 
-RewriteRule ^/blog/(.*) https://webkit.org/blog/$1 [L,R=301]
-
 RewriteCond %{HTTPS} off
 RewriteCond %{HTTP_HOST} ^(www\.)?(.*)$
-RewriteRule (.*) https://%2/$1 [L,R=301]
-
-RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-RewriteRule .* - [F]
+RewriteRule .* https://%2%{REQUEST_URI} [L,R=301]
 
 # Old Sunspider versions
 Redirect 301 /perf/sunspider-0.9/sunspider.html /perf/sunspider/sunspider.html
index 8986a2d..509ec30 100644 (file)
@@ -1,5 +1,11 @@
 2015-12-03  Timothy Hatcher  <timothy@apple.com>
 
+        Another attempt to fix the http blog redirects.
+
+        * .htaccess:
+
+2015-12-03  Timothy Hatcher  <timothy@apple.com>
+
         Attempt to fix the http blog redirects.
 
         * .htaccess: