Skip to content

Commit

Permalink
* Fix leaking of attachments from the last response into the next req…
Browse files Browse the repository at this point in the history
…uest of the client (Bug #5004).

git-svn-id: http://svn.php.net/repository/pear/packages/SOAP/trunk@227779 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information
Jan Schneider committed Jan 21, 2007
1 parent 9622ac4 commit d580633
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
11 changes: 5 additions & 6 deletions Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -358,16 +358,15 @@ function &call($method, &$params, $namespace = false, $soapAction = false)
return $fault;
}

$this->__attachments =& $this->_soap_transport->attachments;
$this->__result_encoding = $this->_soap_transport->result_encoding;

if (isset($this->__options['result']) &&
$this->__options['result'] != 'parse') {
return $this->xml;
}

$result = &$this->__parse($this->xml, $this->__result_encoding, $this->__attachments);
$this->__result_encoding = $this->_soap_transport->result_encoding;

$result = &$this->__parse($this->xml, $this->__result_encoding,
$this->_soap_transport->attachments);
return $result;
}

Expand Down Expand Up @@ -465,8 +464,8 @@ function &__generate($method, &$params, $namespace = false,
$soapAction = false)
{
$this->fault = null;
$this->__options['input']='parse';
$this->__options['result']='parse';
$this->__options['input'] = 'parse';
$this->__options['result'] = 'parse';
$this->__options['parameters'] = false;

if ($params && gettype($params) != 'array') {
Expand Down
3 changes: 2 additions & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
* Fix decoding of values of type long (simunek@vol.cz, Bug #6042).
* Send cookies if using HTTPS transport (Bug #6684).
* Fix leaking of message input or output in generated WSDL if using dispatch methods without input or output (Bug #6462).
* Don't check for existing methods in addToMap() if using a call handler in the server (Bug #5684).</notes>
* Don't check for existing methods in addToMap() if using a call handler in the server (Bug #5684).
* Fix leaking of attachments from the last response into the next request of the client (Bug #5004).</notes>
<filelist>
<dir name="/" baseinstalldir="SOAP">
<file role="php" name="Base.php">
Expand Down

0 comments on commit d580633

Please sign in to comment.