aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Breedt <bitserf@gmail.com>2005-07-06 22:10:35 +0000
committerLeon Breedt <bitserf@gmail.com>2005-07-06 22:10:35 +0000
commitf8be47a6a3088440f71b2995c1402020d9df13d3 (patch)
tree4803e8804b966fde50e2199fe362b36fb6b0e733
parentd01c44d550998190108ee31647e42393a65b6469 (diff)
downloadrails-f8be47a6a3088440f71b2995c1402020d9df13d3.tar.gz
rails-f8be47a6a3088440f71b2995c1402020d9df13d3.tar.bz2
rails-f8be47a6a3088440f71b2995c1402020d9df13d3.zip
ensure the second manual WS request of scaffolding contains the same state as
the original request as much as possible (so that things relying on hostnames &c will keep on working) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1743 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionwebservice/CHANGELOG4
-rw-r--r--actionwebservice/lib/action_web_service/scaffolding.rb1
2 files changed, 5 insertions, 0 deletions
diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG
index a7404078c4..5a91d7d07a 100644
--- a/actionwebservice/CHANGELOG
+++ b/actionwebservice/CHANGELOG
@@ -1,3 +1,7 @@
+*SVN*
+
+* Fix scaffolding for Action Pack controller changes
+
*0.8.0* (6 July, 2005)
* Fix WSDL generation by aliasing #inherited instead of trying to overwrite it, or the WSDL action may end up not being defined in the controller
diff --git a/actionwebservice/lib/action_web_service/scaffolding.rb b/actionwebservice/lib/action_web_service/scaffolding.rb
index da3d6c137c..3f0399405c 100644
--- a/actionwebservice/lib/action_web_service/scaffolding.rb
+++ b/actionwebservice/lib/action_web_service/scaffolding.rb
@@ -141,6 +141,7 @@ module ActionWebService
def prepare_request(new_request, service_name, method_name)
new_request.parameters.update(request.parameters)
+ request.env.each{ |k, v| new_request.env[k] = v unless new_request.env.has_key?(k) }
if web_service_dispatching_mode == :layered && @protocol.is_a?(ActionWebService::Protocol::Soap::SoapProtocol)
new_request.env['HTTP_SOAPACTION'] = "/\#{controller_name()}/\#{service_name}/\#{method_name}"
end