summaryrefslogtreecommitdiff
path: root/framework/Web
diff options
context:
space:
mode:
authorwei <>2007-01-19 07:47:59 +0000
committerwei <>2007-01-19 07:47:59 +0000
commite3ea3400bd54336be58caef9efd0d0ac9c189054 (patch)
tree535a1c9b7bc4b8b93198639ce72a84aa7901ed57 /framework/Web
parent88f239a7af4de3d2a6beca21674b8ff9887c9c13 (diff)
Enforce encoding of wsdl and soap service headers and <xml>
Diffstat (limited to 'framework/Web')
-rw-r--r--framework/Web/Services/TSoapService.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/framework/Web/Services/TSoapService.php b/framework/Web/Services/TSoapService.php
index d838217e..087b5664 100644
--- a/framework/Web/Services/TSoapService.php
+++ b/framework/Web/Services/TSoapService.php
@@ -244,11 +244,12 @@ class TSoapService extends TService
{
Prado::trace("Running SOAP service",'System.Web.Services.TSoapService');
$server=$this->createServer();
+ $this->getResponse()->setContentType('text/xml');
+ $this->getResponse()->setCharset($server->getEncoding());
if($this->getIsWsdlRequest())
{
// server WSDL file
Prado::trace("Generating WSDL",'System.Web.Services.TSoapService');
- $this->getResponse()->setContentType('text/xml');
$this->getResponse()->write($server->getWsdl());
}
else
@@ -441,14 +442,14 @@ class TSoapServer extends TApplicationComponent
if(is_string($wsdl))
return $wsdl;
Prado::using('System.3rdParty.WsdlGen.WsdlGenerator');
- $wsdl=WsdlGenerator::generate($providerClass, $this->getUri());
+ $wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
$cache->set(self::WSDL_CACHE_PREFIX.$providerClass,$wsdl);
return $wsdl;
}
else
{
Prado::using('System.3rdParty.WsdlGen.WsdlGenerator');
- return WsdlGenerator::generate($providerClass, $this->getUri());
+ return WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
}
}
else