From 11a5492791e6ed467a73bf20e0c7b6828bf0a3e2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 22 Mar 2005 12:11:43 +0000
Subject: Removed SCRIPT_NAME from the WEBrick environment to prevent conflicts
 with PATH_INFO #896 [Nicholas Seckar] Removed ? from the dispatch.f/cgi
 redirect line to get rid of 'complete/path/from/request.html' => nil being in
 the @params now that the ENV[REQUEST_URI] is used to determine the path #895
 [dblack/Nicholas Seckar]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@972 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 railties/lib/webrick_server.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib/webrick_server.rb')

diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb
index cc45867128..43acffab86 100644
--- a/railties/lib/webrick_server.rb
+++ b/railties/lib/webrick_server.rb
@@ -69,6 +69,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
 
   def handle_dispatch(req, res, origin = nil)
     env = req.meta_vars.clone
+    env.delete "SCRIPT_NAME"
     env["QUERY_STRING"] = req.request_uri.query
     env["REQUEST_URI"] = origin if origin
     
-- 
cgit v1.2.3