aboutsummaryrefslogtreecommitdiffstats
path: root/actionwebservice/lib
diff options
context:
space:
mode:
authorKent Sibilev <ksibilev@gmail.com>2006-09-01 02:18:52 +0000
committerKent Sibilev <ksibilev@gmail.com>2006-09-01 02:18:52 +0000
commitb5521a2651b5444f10c20803279af6d9570069b7 (patch)
treea85cc3af32c8b3e1e477a1ba8a63c3696b9e5b6d /actionwebservice/lib
parent7749c9c2200ad190e3f9935c27f09ec9b95227f2 (diff)
downloadrails-b5521a2651b5444f10c20803279af6d9570069b7.tar.gz
rails-b5521a2651b5444f10c20803279af6d9570069b7.tar.bz2
rails-b5521a2651b5444f10c20803279af6d9570069b7.zip
ActionWebService WSDL generation ignores HTTP_X_FORWARDED_HOST
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4891 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionwebservice/lib')
-rw-r--r--actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
index a959150f9d..2c7d5a0948 100644
--- a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
+++ b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
@@ -167,7 +167,7 @@ module ActionWebService # :nodoc:
private
def base_uri
- host = request.env['HTTP_HOST'] || request.env['SERVER_NAME'] || 'localhost'
+ host = request.host_with_port
relative_url_root = request.relative_url_root
scheme = request.ssl? ? 'https' : 'http'
'%s://%s%s/%s/' % [scheme, host, relative_url_root, self.class.controller_path]