Possible fix for #367.

cfwheels · May 26, 2015 · 696b738 · 696b738
1 parent afe4ba7
commit 696b738
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/.htaccess b/.htaccess
@@ -6,5 +6,7 @@
 
 # Options +FollowSymLinks
 # RewriteEngine On
+# RewriteCond %{REQUEST_URI} ^.*/index.cfm/(.*)$ [NC]
+# RewriteRule ^.*/index.cfm/(.*)$ ./rewrite.cfm/$1 [NS,L]
 # RewriteCond %{REQUEST_URI} !^.*/(flex2gateway|jrunscripts|cfide|cfformgateway|cffileservlet|railo-context|lucee|files|images|javascripts|miscellaneous|stylesheets|robots.txt|favicon.ico|sitemap.xml|rewrite.cfm)($|/.*$) [NC]
 # RewriteRule ^(.*)$ ./rewrite.cfm/$1 [NS,L]
diff --git a/wheels/CHANGELOG b/wheels/CHANGELOG
@@ -3,6 +3,8 @@
 Bug Fixes
 =========
 
+* Fixed rewrite rules so base URL is rewritten correctly on Apache - #367 [Jeremy Keczan, Per Djurner]
+* Removed incorrect path info information set by Apache - #367 [David Belanger, Per Djurner]
 * Fixed routing bug when running from a sub folder on Adobe ColdFusion 10  - [Brant Nielsen, Per Djurner]
 
 Miscellaneous

diff --git a/wheels/global/internal.cfm b/wheels/global/internal.cfm
@@ -298,6 +298,12 @@
 				}
 			}
 		}
+
+		// some web servers incorrectly place rewrite.cfm in the path_info but since that should never be there we can safely remove it
+		if (Find("rewrite.cfm/", loc.rv.path_info))
+		{
+			Replace(loc.rv.path_info, "rewrite.cfm/", "");
+		}
 	</cfscript>
 	<cfreturn loc.rv>
 </cffunction>