0
@@ -544,7 +544,7 @@ private:
0
     addHeader(headers, "REMOTE_PORT",     apr_psprintf(r->pool, "%d", r->connection->remote_addr->port));
0
     addHeader(headers, "REMOTE_USER",     r->user);
0
     addHeader(headers, "REQUEST_METHOD",  r->method);
0
-		addHeader(headers, "REQUEST_URI",     r->uri);
0
+		addHeader(headers, "REQUEST_URI",     r->unparsed_uri);
0
     addHeader(headers, "QUERY_STRING",    r->args ? r->args : "");
0
     if (strcmp(baseURI, "/") != 0) {
0
       addHeader(headers, "SCRIPT_NAME", baseURI);

0
@@ -80,7 +80,15 @@ shared_examples_for "MyCook(tm) beta" do
0
     response = get_response('/welcome/headers_test')
0
     response["X-Foo"].should == "Bar"
0
   end
0
-	
0
+
0
+	it "supports %2f in URIs" do
0
+		get('/welcome/show_id/foo%2fbar').should == 'foo/bar'
0
+	end
0
+
0
+	it "has AbstractRequest which returns a request_uri without hostname, with query_string" do
0
+		get('/welcome/request_uri?foo=bar%20escaped').should =~ %r{/welcome/request_uri\?foo=bar%20escaped}
0
+	end
0
+
0
   it "supports restarting via restart.txt" do
0
     begin
0
       controller = "#{@stub.app_root}/app/controllers/test_controller.rb"

0
@@ -71,6 +71,7 @@ CustomLog <%= @server_root %>/access.log combined
0
   <VirtualHost *:<%= @port %>>
0
     ServerName <%= vhost.domain %>
0
     DocumentRoot "<%= vhost.document_root %>"
0
+		AllowEncodedSlashes On
0
     <% for line in vhost.additional_configs %>
0
       <%= line %>
0
     <% end %>

0
@@ -36,4 +36,12 @@ class WelcomeController < ApplicationController
0
   def terminate
0
     exit!
0
   end
0
+
0
+	def show_id
0
+		render :text => params[:id]
0
+	end
0
+
0
+	def request_uri
0
+		render :text => request.request_uri
0
+	end
0
 end