Update rewrite rules so uppercase characters will work.

http://mu.wordpress.org/forums/topic/131


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@149 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 52 insertions, 52 deletions

diff --git a/htaccess.dist b/htaccess.dist
index 534e06c..1738ab0 100644
--- a/htaccess.dist
+++ b/htaccess.dist
@@ -15,12 +15,12 @@ RewriteRule ^category/(.*)/(feed|rdf|rss|rss2|atom)/?$  BASE/wp-inst/wp-feed.php
 RewriteRule ^category/?(.*)                             BASE/wp-inst/index.php?wpblog=main&category_name=$1 [L]
 RewriteRule ^author/(.*)/(feed|rdf|rss|rss2|atom)/?$    BASE/wp-inst/wp-feed.php?wpblog=main&author_name=$1&feed=$2 [L]
 RewriteRule ^author/?(.*)                               BASE/wp-inst/index.php?wpblog=main&author_name=$1 [L]
-RewriteRule ^([0-9]{4})/?([0-9]{1,2})?/?([0-9]{1,2})?/?([_0-9a-z-]+)?/?([0-9]+)?/?$          BASE/wp-inst/index.php?wpblog=main&year=$1&monthnum=$2&day=$3&name=$4&page=$5 [L]
-RewriteRule ^([0-9]{4})/?([0-9]{1,2})/([0-9]{1,2})/([_0-9a-z-]+)/(feed|rdf|rss|rss2|atom)/?$ BASE/wp-inst/wp-feed.php?wpblog=main&year=$1&monthnum=$2&day=$3&name=$4&feed=$5 [L]
-RewriteRule ^([0-9]{4})/?([0-9]{1,2})/([0-9]{1,2})/([_0-9a-z-]+)/trackback/?$                BASE/wp-inst/wp-trackback.php?wpblog=main&year=$1&monthnum=$2&day=$3&name=$4 [L]
+RewriteRule ^([0-9]{4})/?([0-9]{1,2})?/?([0-9]{1,2})?/?([_0-9a-zA-Z-]+)?/?([0-9]+)?/?$          BASE/wp-inst/index.php?wpblog=main&year=$1&monthnum=$2&day=$3&name=$4&page=$5 [L]
+RewriteRule ^([0-9]{4})/?([0-9]{1,2})/([0-9]{1,2})/([_0-9a-zA-Z-]+)/(feed|rdf|rss|rss2|atom)/?$ BASE/wp-inst/wp-feed.php?wpblog=main&year=$1&monthnum=$2&day=$3&name=$4&feed=$5 [L]
+RewriteRule ^([0-9]{4})/?([0-9]{1,2})/([0-9]{1,2})/([_0-9a-zA-Z-]+)/trackback/?$                BASE/wp-inst/wp-trackback.php?wpblog=main&year=$1&monthnum=$2&day=$3&name=$4 [L]
 RewriteRule ^page/?([0-9]+)?/?$ 			BASE/wp-inst/index.php?wpblog=main&paged=$1 [QSA]
-RewriteRule ^feed/?([_0-9a-z-]+)?/?$                    BASE/wp-inst/wp-feed.php?wpblog=main&feed=$1 [L]
-RewriteRule ^comments/feed/?([_0-9a-z-]+)?/?$           BASE/wp-inst/wp-feed.php?wpblog=main&feed=$1&withcomments=1 [L]
+RewriteRule ^feed/?([_0-9a-zA-Z-]+)?/?$                    BASE/wp-inst/wp-feed.php?wpblog=main&feed=$1 [L]
+RewriteRule ^comments/feed/?([_0-9a-zA-Z-]+)?/?$           BASE/wp-inst/wp-feed.php?wpblog=main&feed=$1&withcomments=1 [L]
 RewriteRule ^archives/p/([0-9]+)/?(.*)?                 BASE/wp-inst/index.php?wpblog=main&redirect=yes&p=$1 [L]
 RewriteRule ^archives/cat/([0-9]+)/?(.*)?               BASE/wp-inst/index.php?wpblog=main&redirect=yes&cat=$1 [L]
 RewriteRule ^archives/m/([0-9]+)\#?(.*)?                BASE/wp-inst/index.php?wpblog=main&redirect=yes&m=$1 [L]
@@ -63,66 +63,66 @@ RewriteRule ^$ BASE/wp-inst/index.php [L]
 ###
 #### blogs
 ###
-RewriteRule ^([_0-9a-z-]+)/templates/(.*)			BASE/wp-inst/wp-content/blogs/$1/templates/$2 [L]
-RewriteRule ^([_0-9a-z-]+)/files/(.*)				BASE/wp-inst/wp-content/blogs/$1/files/$2 [L]
-RewriteRule ^([_0-9a-z-]+)/wp-content/blogs/(.*)/files/(.*)	BASE/wp-inst/wp-content/blogs/$1/files/$3 [L]
-RewriteRule ^([_0-9a-z-]+)/wp-content/themes/(.*)		BASE/wp-inst/wp-content/themes/$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/templates/(.*)			BASE/wp-inst/wp-content/blogs/$1/templates/$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/files/(.*)				BASE/wp-inst/wp-content/blogs/$1/files/$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-content/blogs/(.*)/files/(.*)	BASE/wp-inst/wp-content/blogs/$1/files/$3 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-content/themes/(.*)		BASE/wp-inst/wp-content/themes/$2 [L]
 
 # rewrite these
-RewriteRule ^([_0-9a-z-]+)/category/(.*)/page/(.*)/                   BASE/wp-inst/index.php?wpblog=$1&category_name=$2&paged=$3 [L]
-RewriteRule ^([_0-9a-z-]+)/category/(.*)/(feed|rdf|rss|rss2|atom)/?$  BASE/wp-inst/wp-feed.php?wpblog=$1&category_name=$2&feed=$3 [L]
-RewriteRule ^([_0-9a-z-]+)/category/?(.*)                             BASE/wp-inst/index.php?wpblog=$1&category_name=$2 [L]
-RewriteRule ^([_0-9a-z-]+)/author/(.*)/(feed|rdf|rss|rss2|atom)/?$    BASE/wp-inst/wp-feed.php?wpblog=$1&author_name=$2&feed=$3 [L]
-RewriteRule ^([_0-9a-z-]+)/author/?(.*)                               BASE/wp-inst/index.php?wpblog=$1&author_name=$2 [L]
-RewriteRule ^([_0-9a-z-]+)/([0-9]{4})/?([0-9]{1,2})?/?([0-9]{1,2})?/?([_0-9a-z-]+)?/?([0-9]+)?/?$          BASE/wp-inst/index.php?wpblog=$1&year=$2&monthnum=$3&day=$4&name=$5&page=$6 [L]
-RewriteRule ^([_0-9a-z-]+)/([0-9]{4})/?([0-9]{1,2})/([0-9]{1,2})/([_0-9a-z-]+)/(feed|rdf|rss|rss2|atom)/?$ BASE/wp-inst/wp-feed.php?wpblog=$1&year=$2&monthnum=$3&day=$4&name=$5&feed=$6 [L]
-RewriteRule ^([_0-9a-z-]+)/([0-9]{4})/?([0-9]{1,2})/([0-9]{1,2})/([_0-9a-z-]+)/trackback/?$                BASE/wp-inst/wp-trackback.php?wpblog=$1&year=$2&monthnum=$3&day=$4&name=$5 [L]
-RewriteRule ^([_0-9a-z-]+)/page/?([0-9]+)?/?$ 			      BASE/wp-inst/index.php?paged=$2 [QSA]
-RewriteRule ^([_0-9a-z-]+)/feed/?([_0-9a-z-]+)?/?$                    BASE/wp-inst/wp-feed.php?wpblog=$1&feed=$2 [L]
-RewriteRule ^([_0-9a-z-]+)/comments/feed/?([_0-9a-z-]+)?/?$           BASE/wp-inst/wp-feed.php?wpblog=$1&feed=$2&withcomments=1 [L]
-RewriteRule ^([_0-9a-z-]+)/archives/p/([0-9]+)/?(.*)?                 BASE/wp-inst/index.php?wpblog=$1&redirect=yes&p=$2 [L]
-RewriteRule ^([_0-9a-z-]+)/archives/cat/([0-9]+)/?(.*)?               BASE/wp-inst/index.php?wpblog=$1&redirect=yes&cat=$2 [L]
-RewriteRule ^([_0-9a-z-]+)/archives/m/([0-9]+)\#?(.*)?                BASE/wp-inst/index.php?wpblog=$1&redirect=yes&m=$2 [L]
-RewriteRule ^([_0-9a-z-]+)/b2rss2.php(.*)?                            BASE/wp-inst/wp-feed.php?wpblog=$1&feed=rss2 [L]
-RewriteRule ^([_0-9a-z-]+)/b2rdf.php(.*)?                             BASE/wp-inst/wp-feed.php?wpblog=$1&feed=rdf [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/category/(.*)/page/(.*)/                   BASE/wp-inst/index.php?wpblog=$1&category_name=$2&paged=$3 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/category/(.*)/(feed|rdf|rss|rss2|atom)/?$  BASE/wp-inst/wp-feed.php?wpblog=$1&category_name=$2&feed=$3 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/category/?(.*)                             BASE/wp-inst/index.php?wpblog=$1&category_name=$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/author/(.*)/(feed|rdf|rss|rss2|atom)/?$    BASE/wp-inst/wp-feed.php?wpblog=$1&author_name=$2&feed=$3 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/author/?(.*)                               BASE/wp-inst/index.php?wpblog=$1&author_name=$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/([0-9]{4})/?([0-9]{1,2})?/?([0-9]{1,2})?/?([_0-9a-zA-Z-]+)?/?([0-9]+)?/?$          BASE/wp-inst/index.php?wpblog=$1&year=$2&monthnum=$3&day=$4&name=$5&page=$6 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/([0-9]{4})/?([0-9]{1,2})/([0-9]{1,2})/([_0-9a-zA-Z-]+)/(feed|rdf|rss|rss2|atom)/?$ BASE/wp-inst/wp-feed.php?wpblog=$1&year=$2&monthnum=$3&day=$4&name=$5&feed=$6 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/([0-9]{4})/?([0-9]{1,2})/([0-9]{1,2})/([_0-9a-zA-Z-]+)/trackback/?$                BASE/wp-inst/wp-trackback.php?wpblog=$1&year=$2&monthnum=$3&day=$4&name=$5 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/page/?([0-9]+)?/?$ 			      BASE/wp-inst/index.php?paged=$2 [QSA]
+RewriteRule ^([_0-9a-zA-Z-]+)/feed/?([_0-9a-zA-Z-]+)?/?$                    BASE/wp-inst/wp-feed.php?wpblog=$1&feed=$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/comments/feed/?([_0-9a-zA-Z-]+)?/?$           BASE/wp-inst/wp-feed.php?wpblog=$1&feed=$2&withcomments=1 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/archives/p/([0-9]+)/?(.*)?                 BASE/wp-inst/index.php?wpblog=$1&redirect=yes&p=$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/archives/cat/([0-9]+)/?(.*)?               BASE/wp-inst/index.php?wpblog=$1&redirect=yes&cat=$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/archives/m/([0-9]+)\#?(.*)?                BASE/wp-inst/index.php?wpblog=$1&redirect=yes&m=$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/b2rss2.php(.*)?                            BASE/wp-inst/wp-feed.php?wpblog=$1&feed=rss2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/b2rdf.php(.*)?                             BASE/wp-inst/wp-feed.php?wpblog=$1&feed=rdf [L]
 
 # We want to pass these files straight through
-RewriteRule ^([_0-9a-z-]+)/wp-comments-post.php(.*)  		BASE/wp-inst/wp-comments-post.php       [L]
-RewriteRule ^([_0-9a-z-]+)/go.php(.*) 				BASE/wp-inst/go.php$2 [L]
-RewriteRule ^([_0-9a-z-]+)/pages/(.*)	 			BASE/wp-inst/pages/$2 [L]
-RewriteRule ^([_0-9a-z-]+)/wp-admin/(.*) 			BASE/wp-inst/wp-admin/$2 [L]
-RewriteRule ^([_0-9a-z-]+)/wp-atom.php(.*) 			BASE/wp-inst/wp-atom.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-comments-popup.php(.*) 		BASE/wp-inst/wp-comments-popup.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-comments-post.php(.*) 		BASE/wp-inst/wp-comments-post.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-commentsrss2.php(.*) 		BASE/wp-inst/wp-commentsrss2.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-counter.php(.+)? 			BASE/wp-inst/wp-counter.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-feed.php(.*) 			BASE/wp-inst/wp-feed.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-images/(.*) 			BASE/wp-inst/wp-images/$2 [L]
-RewriteRule ^([_0-9a-z-]+)/wp-links-opml.php(.*) 		BASE/wp-inst/wp-links-opml.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-login.php(.*) 			BASE/wp-inst/wp-login.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-mail.php(.*) 			BASE/wp-inst/wp-mail.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-pass.php(.*) 			BASE/wp-inst/wp-pass.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-rdf.php(.*) 			BASE/wp-inst/wp-rdf.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-register.php(.*) 			BASE/wp-inst/wp-register.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-rss.php(.*) 			BASE/wp-inst/wp-rss.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-rss2.php(.*) 			BASE/wp-inst/wp-rss2.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-sidebar.php(.*) 			BASE/wp-inst/wp-sidebar.php [L]
-RewriteRule ^([_0-9a-z-]+)/wp-trackback.php(.*) 		BASE/wp-inst/wp-trackback.php [L]
-RewriteRule ^([_0-9a-z-]+)/xmlrpc.php(.*) 			BASE/wp-inst/xmlrpc.php [L]   
-RewriteRule ^([_0-9a-z-]+)/maintenance.php 			BASE/wp-inst/maintenance.php [L]   
-RewriteRule ^([_0-9a-z-]+)/favicon.ico /wp-inst/favicon.ico [L]   
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-comments-post.php(.*)  		BASE/wp-inst/wp-comments-post.php       [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/go.php(.*) 				BASE/wp-inst/go.php$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/pages/(.*)	 			BASE/wp-inst/pages/$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-admin/(.*) 			BASE/wp-inst/wp-admin/$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-atom.php(.*) 			BASE/wp-inst/wp-atom.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-comments-popup.php(.*) 		BASE/wp-inst/wp-comments-popup.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-comments-post.php(.*) 		BASE/wp-inst/wp-comments-post.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-commentsrss2.php(.*) 		BASE/wp-inst/wp-commentsrss2.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-counter.php(.+)? 			BASE/wp-inst/wp-counter.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-feed.php(.*) 			BASE/wp-inst/wp-feed.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-images/(.*) 			BASE/wp-inst/wp-images/$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-links-opml.php(.*) 		BASE/wp-inst/wp-links-opml.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-login.php(.*) 			BASE/wp-inst/wp-login.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-mail.php(.*) 			BASE/wp-inst/wp-mail.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-pass.php(.*) 			BASE/wp-inst/wp-pass.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-rdf.php(.*) 			BASE/wp-inst/wp-rdf.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-register.php(.*) 			BASE/wp-inst/wp-register.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-rss.php(.*) 			BASE/wp-inst/wp-rss.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-rss2.php(.*) 			BASE/wp-inst/wp-rss2.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-sidebar.php(.*) 			BASE/wp-inst/wp-sidebar.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-trackback.php(.*) 		BASE/wp-inst/wp-trackback.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/xmlrpc.php(.*) 			BASE/wp-inst/xmlrpc.php [L]   
+RewriteRule ^([_0-9a-zA-Z-]+)/maintenance.php 			BASE/wp-inst/maintenance.php [L]   
+RewriteRule ^([_0-9a-zA-Z-]+)/favicon.ico /wp-inst/favicon.ico [L]   
 
 # pages
 RewriteCond REALPATH/wp-inst/wp-content/blogs/%{1} -d
-RewriteRule ^([_0-9a-z-]+)/(.*)/$				BASE/wp-inst/index.php?pagename=$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/(.*)/$				BASE/wp-inst/index.php?pagename=$2 [L]
 
 RewriteRule ^(.*)/$						BASE/wp-inst/index.php?pagename=$1 [L]
 
 # catch all rules
 RewriteCond REALPATH/wp-inst/wp-content/blogs/%{1} -d
-RewriteRule ^([_0-9a-z-]+)/                            BASE/wp-inst/index.php [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/                            BASE/wp-inst/index.php [L]
 
-RewriteRule ^([_0-9a-z-]+)/(.+)$ BASE/wp-inst/$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/(.+)$ BASE/wp-inst/$2 [L]
 
 RewriteCond %{REQUEST_FILENAME}  -d
 RewriteRule ^(.+[^/])$                            BASE/ [R,L]