Changeset 3894

Timestamp:

03/16/06 04:16:08 (3 years ago)

Author:

david

Message:

Fixed proxy support for lighttpd (closes #3267) [stephen_purcell@yahoo.com]

Files:

• trunk/actionpack/lib/action_controller/cgi_process.rb (modified) (1 diff)
• trunk/actionpack/test/controller/cgi_test.rb (modified) (2 diffs)

trunk/actionpack/lib/action_controller/cgi_process.rb

@@ -76 +76 @@
-    end
-
+    def host_with_port
+      if forwarded = env["HTTP_X_FORWARDED_HOST"]
+        forwarded.split(/,\s?/).last
+      elsif http_host = env['HTTP_HOST']
+        http_host
+      elsif server_name = env['SERVER_NAME']
+        server_name
+      else
+        "#{env['SERVER_ADDR']}:#{env['SERVER_PORT']}"
+      end
+    end
+
-    def host
-
-
-
-
-
-
-
-
-
+
+
+
-    def port
-@env["HTTP_X_FORWARDED_HOST"] ? standard_port : (port_from_http_host || super)
-end
-
-def port_from_http_hos
-$1.to_i if @env['HTTP_HOST'] && /:(\d+)$/ =~ @env['HTTP_HOST']
+if host_with_port =~ /:(\d+)$/
+    $1.to_i
+  else
+    standard_por
+end
-    end
-

trunk/actionpack/test/controller/cgi_test.rb

@@ -331 +331 @@
-    @request_hash['HTTP_X_FORWARDED_HOST'] = "www.firsthost.org, www.secondhost.org"
-    assert_equal "www.secondhost.org", @request.host
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  def test_cookie_syntax_resilience
-    cookies = CGI::Cookie::parse(@request_hash["HTTP_COOKIE"]);
@@ -343 +361 @@
-    assert_equal ["yes"], alt_cookies["is_admin"]
-  end
-  
-end