Changeset 5895

Timestamp:

01/12/07 07:01:39 (2 years ago)

Author:

bitsweat

Message:

Set request.envREQUEST_URI? when absent.

Files:

• trunk/actionpack/lib/action_controller/request.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/request_test.rb (modified) (5 diffs)

trunk/actionpack/lib/action_controller/request.rb

@@ -146 +146 @@
-    end
-
-s the request URI correctly, taking into account the idiosyncracies
-of the various servers
+ the request URI, accounting for server idiosyncracies.
+WEBrick includes the full URL. IIS leaves REQUEST_URI blank
-    def request_uri
-      if uri = @env['REQUEST_URI']
-
-
+
+
+
+
-        script_filename = @env['SCRIPT_NAME'].to_s.match(%r{[^/]+$})
-        uri = @env['PATH_INFO']
@@ -158 +160 @@
-          uri << '?' << env_qs
-        end
-
+@env['REQUEST_URI'] = 
-      end
-    end

trunk/actionpack/test/controller/request_test.rb

@@ -175 +175 @@
-    assert_equal "/path/of/some/uri", @request.path
-
+    @request.set_REQUEST_URI nil
-    @request.relative_url_root = nil
-    @request.env['PATH_INFO'] = "/path/of/some/uri?mapped=1"
@@ -181 +182 @@
-    assert_equal "/of/some/uri", @request.path
-
+    @request.set_REQUEST_URI nil
-    @request.relative_url_root = nil
-    @request.env['PATH_INFO'] = "/path/of/some/uri"
@@ -187 +189 @@
-    assert_equal "/path/of/some/uri", @request.path
-
+    @request.set_REQUEST_URI nil
-    @request.relative_url_root = nil
-    @request.env['PATH_INFO'] = "/"
@@ -192 +195 @@
-    assert_equal "/", @request.path
-
+    @request.set_REQUEST_URI nil
-    @request.relative_url_root = nil
-    @request.env['PATH_INFO'] = "/?m=b"
-    assert_equal "/?m=b", @request.request_uri
-    assert_equal "/", @request.path
-
+
+
-    @request.relative_url_root = nil
-    @request.env['PATH_INFO'] = "/"
-    @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
-    assert_equal "/", @request.request_uri
-
-
+
+
+
-    @request.relative_url_root = nil
-    @request.env['PATH_INFO'] = "/hieraki/"
-    @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
-    assert_equal "/hieraki/", @request.request_uri
-    
-
+
+
-    @request.set_REQUEST_URI '/hieraki/dispatch.cgi'
-    @request.relative_url_root = '/hieraki'
-    
+
-    @request.relative_url_root = nil
-
-    @request.set_REQUEST_URI '/hieraki/dispatch.cgi'
-    @request.relative_url_root = '/foo'
-    
+
-    @request.relative_url_root = nil
-
@@ -227 +233 @@
-    assert_equal "/some/path", @request.path
-  end
-
+
-
-  def test_host_with_port