Permalink
Browse files

add charset=utf-8 to SOAP response content type, and make base_uri

respect relative_url_root for the endpoint of SOAP messages (Shugo
Maeda). if WSDL was retrieved over HTTPS, use HTTPS in the endpoint
URLs as well.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1244 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 74c9fd2 commit 896fea505b67f6dd842a58c72bcd919c593d925a @bitserf bitserf committed Apr 28, 2005
View
6 actionwebservice/CHANGELOG
@@ -1,5 +1,11 @@
*SVN*
+* Fix that generated WSDL was not using relative_url_root for base URI #1210 [Shugo Maeda]
+
+* Use UTF-8 encoding for SOAP responses #1211 [Shugo Maeda]
+
+* If the WSDL was retrieved over HTTPS, use HTTPS URLs in the WSDL too
+
* Fix that casting change in 0.7.0 would convert nil values to the default value for the type instead of leaving it as nil
View
12 actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
@@ -167,8 +167,16 @@ def wsdl
private
def base_uri
- host = @request ? (@request.env['HTTP_HOST'] || @request.env['SERVER_NAME']) : 'localhost'
- 'http://%s/%s/' % [host, controller_name]
+ if @request
+ host = @request.env['HTTP_HOST'] || @request.env['SERVER_NAME']
+ relative_url_root = @request.relative_url_root
+ scheme = @request.ssl? ? 'https' : 'http'
+ else
+ host = 'localhost'
+ relative_url_root = ""
+ scheme = 'http'
+ end
+ '%s://%s%s/%s/' % [scheme, host, relative_url_root, controller_name]
end
def to_wsdl
View
2 actionwebservice/lib/action_web_service/protocol/soap_protocol.rb
@@ -93,7 +93,7 @@ def encode_response(method_name, return_value, return_type)
end
end
envelope = create_soap_envelope(response)
- Response.new(SOAP::Processor.marshal(envelope), 'text/xml', return_value)
+ Response.new(SOAP::Processor.marshal(envelope), 'text/xml; charset=utf-8', return_value)
end
def protocol_client(api, protocol_name, endpoint_uri, options={})

0 comments on commit 896fea5

Please sign in to comment.