Corrected rewrite rules to restore convenience paths.
authorjond@apple.com <jond@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Dec 2015 22:16:53 +0000 (22:16 +0000)
committerjond@apple.com <jond@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Dec 2015 22:16:53 +0000 (22:16 +0000)
* .htaccess:

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

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

index f42564e..f6f296d 100644 (file)
@@ -10,9 +10,6 @@ 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 %{HTTP_HOST} !^webkit.org$
-# RewriteRule (.*) https://webkit.org$1 [R=301]
-
 RewriteCond %{HTTPS} off
 RewriteCond %{HTTP_HOST} ^(www\.)?(.*)$
 RewriteRule ^(.*)$ https://%2/$1 [L,R=301]
@@ -20,10 +17,6 @@ RewriteRule ^(.*)$ https://%2/$1 [L,R=301]
 RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
 RewriteRule .* - [F]
 
-RewriteRule ^/blog/(.*) https://webkit.org/blog/$1 [L,R=301]
-
-RewriteRule /b/(.*)$ https://bugs.webkit.org/show_bug.cgi?id=$1 [R=301]
-
 # Old Sunspider versions
 Redirect 301 /perf/sunspider-0.9/sunspider.html /perf/sunspider/sunspider.html
 Redirect 301 /perf/sunspider-0.9.1/sunspider.html /perf/sunspider/sunspider.html
@@ -92,16 +85,17 @@ Redirect 301 /team.html /team/
 
 # Bugzilla
 
-RewriteRule /reported-by/(.*)$ https://bugs.webkit.org/buglist.cgi?emailreporter1=1&emailtype1=substring&email1=$1&emailassigned_to2=1 [R=301,L,NE]
-RewriteRule /recently-resolved/(\d+(w|d))$ https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=$1&chfieldto=Now&chfield=bug_status&chfieldvalue=resolved&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0= [R=301,L,NE]
-RewriteRule /new-bugs/(\d+(w|d))$ https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=$1&chfieldto=Now&chfield=\%5BBug+creation\%5D&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0= [R=301,L]
+RewriteRule ^b/(.*)$ https://bugs.webkit.org/show_bug.cgi?id=$1 [R=301,L,NE]
+RewriteRule ^reported-by/(.*)$ https://bugs.webkit.org/buglist.cgi?emailreporter1=1&emailtype1=substring&email1=$1&emailassigned_to2=1 [R=301,L,NE]
+RewriteRule ^recently-resolved/(\d+(w|d))$ https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=$1&chfieldto=Now&chfield=bug_status&chfieldvalue=resolved&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0= [R=301,L,NE]
+RewriteRule ^new-bugs/(\d+(w|d))$ https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=$1&chfieldto=Now&chfield=\%5BBug+creation\%5D&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0= [R=301,L]
 
 Redirect 301 /new-bug https://bugs.webkit.org/enter_bug.cgi?product=WebKit&version=528\%2B\%20(Nightly\%20build)&component=New\%20Bugs&bug_severity=Normal&cc=&bug_file_loc=http\%3A\%2F\%2F&short_desc=&comment=&commentprivacy=0&dependson=&blocked=&maketemplate=Remember\%20values\%20as\%20bookmarkable\%20template&form_name=enter_bug
-Redirect 301 /new-ax-bug$ https://bugs.webkit.org/enter_bug.cgi?product=WebKit&component=Accessibility&op_sys=All&rep_platform=All&short_desc=AX\%3A\%20
-Redirect 301 /new-inspector-bug$ https://bugs.webkit.org/enter_bug.cgi?product=WebKit&component=Web\%20Inspector&op_sys=All&rep_platform=All&short_desc=Web\%20Inspector\%3A\%20
-Redirect 301 /regressions$ https://bugs.webkit.org/buglist.cgi?keywords=Regression&bug_status=NEW&bug_status=UNCONFIRMED&bug_status=ASSIGNED&bug_status=REOPENED
-Redirect 301 /needs-reduction$ https://bugs.webkit.org/buglist.cgi?query_format=advanced&keywords=NeedsReduction&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED
-Redirect 301 /pending-review$ https://bugs.webkit.org/request.cgi?action=queue&requester=&product=&type=review&requestee=&component=&group=requestee
+Redirect 301 /new-ax-bug https://bugs.webkit.org/enter_bug.cgi?product=WebKit&component=Accessibility&op_sys=All&rep_platform=All&short_desc=AX\%3A\%20
+Redirect 301 /new-inspector-bug https://bugs.webkit.org/enter_bug.cgi?product=WebKit&component=Web\%20Inspector&op_sys=All&rep_platform=All&short_desc=Web\%20Inspector\%3A\%20
+Redirect 301 /regressions https://bugs.webkit.org/buglist.cgi?keywords=Regression&bug_status=NEW&bug_status=UNCONFIRMED&bug_status=ASSIGNED&bug_status=REOPENED
+Redirect 301 /needs-reduction https://bugs.webkit.org/buglist.cgi?query_format=advanced&keywords=NeedsReduction&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED
+Redirect 301 /pending-review https://bugs.webkit.org/request.cgi?action=queue&requester=&product=&type=review&requestee=&component=&group=requestee
 Redirect 301 /review-denied https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=flagtypes.name&type0-0-0=equals&value0-0-0=review-
 Redirect 301 /pending-commit https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=notregexp&short_desc=\%5C\%5BS60\%5C\%5D&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=flagtypes.name&type0-0-0=equals&value0-0-0=review\%2B&field0-1-0=noop&type0-1-0=equals&value0-1-0=
 Redirect 301 /unconfirmed-bugs https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&bug_status=UNCONFIRMED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=
@@ -123,4 +117,4 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule . /index.php [L]
 </IfModule>
-# END WordPress
\ No newline at end of file
+# END WordPress
index 3e548a2..dd8eaf9 100644 (file)
@@ -1,5 +1,11 @@
 2015-12-01  Jonathan Davis  <jond@apple.com>
 
+        Corrected rewrite rules to restore convenience paths.
+
+        * .htaccess:
+
+2015-12-01  Jonathan Davis  <jond@apple.com>
+
         Fixed static reference PHP syntax for compatibility with the server environment.
 
         * wp-content/plugins/table-of-contents.php: