several bug fixes as provided by users on soap email list

git-svn-id: http://svn.php.net/repository/pear/packages/SOAP/trunk@127554 c90b9560-bf6c-de11-be94-00142212c4b1
pear · May 18, 2003 · 3eb51c1 · 3eb51c1
1 parent eea12ba
commit 3eb51c1
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 22 deletions.
diff --git a/Base.php b/Base.php
@@ -91,7 +91,8 @@
 define('SCHEMA_DISCO_SCL',          'http://schemas.xmlsoap.org/disco/scl/');
 
 define('SCHEMA_SOAP',               'http://schemas.xmlsoap.org/wsdl/soap/');
-define('SCHEMA_HTTP',               'http://schemas.xmlsoap.org/wsdl/http/');
+define('SCHEMA_SOAP_HTTP',          'http://schemas.xmlsoap.org/soap/http/');
+define('SCHEMA_WSDL_HTTP',          'http://schemas.xmlsoap.org/wsdl/http/');
 define('SCHEMA_MIME',               'http://schemas.xmlsoap.org/wsdl/mime/');
 define('SCHEMA_WSDL',               'http://schemas.xmlsoap.org/wsdl/');
 define('SCHEMA_DIME',               'http://schemas.xmlsoap.org/ws/2002/04/dime/wsdl/');

diff --git a/Client.php b/Client.php
@@ -95,13 +95,6 @@ class SOAP_Client extends SOAP_Base
      */
     var $__options = array('trace'=>0);
 
-    /**
-     * Available categories when using options
-     *
-     * @var array
-     */
-    var $__optionCategories = array('curl');
-
     /**
      * encoding
      *
@@ -295,21 +288,18 @@ function &call($method, &$params, $namespace = false, $soapAction = false)
      * $soapclient->setopt('curl', CURLOPT_VERBOSE, 1)
      * to affect an option when using SSL connections
      *
-     * The category has to be a registered one.
-     *
      * @access public
      * @param  string  $category  category to which the option applies
      * @param  string  $option    option name
      * @param  string  $value     option value
      * @return void
-     * @see    SOAP_Client::__optionCategories
      */
     function setOpt($category, $option, $value=NULL)
     {
         if ($value) {
-            if (in_array($category, $this->__optionCategories)) {
-                $this->__options[$category][$option] = $value;
-            }
+            if (!isset($this->__options[$category]))
+                $this->__options[$category] = array();
+            $this->__options[$category][$option] = $value;
         } else {
             $this->__options[$category] = $option;
         }

diff --git a/Disco.php b/Disco.php
@@ -118,7 +118,7 @@ function _generate_WSDL()
         $this->_wsdl['definitions']['binding']['attr']['name'] = $this->_bindingname;
         $this->_wsdl['definitions']['binding']['attr']['type'] = 'tns:' . $this->_portname;
         $this->_wsdl['definitions']['binding']['soap:binding']['attr']['style'] = 'rpc';
-        $this->_wsdl['definitions']['binding']['soap:binding']['attr']['transport'] = SCHEMA_HTTP;
+        $this->_wsdl['definitions']['binding']['soap:binding']['attr']['transport'] = SCHEMA_SOAP_HTTP;
 
         # SERVICE
         $this->_wsdl['definitions']['service']['attr']['name'] = $this->_service_name . 'Service';

diff --git a/Server.php b/Server.php
@@ -475,7 +475,7 @@ function verifyMethod($request)
 
         // if we aliased the soap method name to a php function,
         // change the call_method so we do the right thing.
-        if (array_key_exists('alias',$map)) {
+        if (array_key_exists('alias',$map) && !empty($map['alias'])) {
             $this->call_methodname = $map['alias'];
         }
 

diff --git a/Server/Email.php b/Server/Email.php
@@ -195,7 +195,7 @@ function service(&$data, $endpoint = '', $send_response = TRUE, $dump = FALSE)
                 $from = array_key_exists('reply-to',$this->headers) ? $this->headers['reply-to']:$this->headers['from'];
                 # XXX what if no from?????
                 
-                $soap_transport =& new SOAP_Transport('mailto:'.$from, $this->response_encoding);
+                $soap_transport =& SOAP_Transport::getTransport('mailto:'.$from, $this->response_encoding);
                 $from = $this->endpoint ? $this->endpoint : $this->headers['to'];
                 $headers['In-Reply-To']=$this->headers['message-id'];
                 $options = array('from' => $from, 'subject'=> $this->headers['subject'], 'headers' => $headers);

diff --git a/Server/Email_Gateway.php b/Server/Email_Gateway.php
@@ -75,7 +75,7 @@ function service(&$data, $gateway='', $endpoint = '', $send_response = TRUE, $du
 
         # call the HTTP Server
         if (!$response) {
-            $soap_transport =& new SOAP_Transport($gateway, $this->xml_encoding);
+            $soap_transport =& SOAP_Transport::getTransport($gateway, $this->xml_encoding);
             if ($soap_transport->fault) {
                 $response = $soap_transport->fault->message();
             }
@@ -129,7 +129,7 @@ function service(&$data, $gateway='', $endpoint = '', $send_response = TRUE, $du
                 $from = array_key_exists('reply-to',$this->headers) ? $this->headers['reply-to']:$this->headers['from'];
                 # XXX what if no from?????
                 
-                $soap_transport =& new SOAP_Transport('mailto:'.$from, $this->response_encoding);
+                $soap_transport =& SOAP_Transport::getTransport('mailto:'.$from, $this->response_encoding);
                 $from = $this->endpoint ? $this->endpoint : $this->headers['to'];
                 $headers = array('In-Reply-To'=>$this->headers['message-id']);
                 $options = array('from' => $from, 'subject'=> $this->headers['subject'], 'headers' => $headers);

diff --git a/Transport/HTTP.php b/Transport/HTTP.php
@@ -483,7 +483,10 @@ function &_sendHTTPS(&$msg, $options)
             curl_setopt($ch, CURLOPT_PROXYUSERPWD, $options['proxy_user'] . ':' . $options['proxy_pass']);
         }
 
-        curl_setopt($ch, CURLOPT_HTTPHEADER ,    array('Content-Type: text/xml;charset=' . $this->encoding, 'SOAPAction: ""'));
+        if (!isset($options['soapaction'])) {
+            $options['soapaction'] = '';
+        }
+        curl_setopt($ch, CURLOPT_HTTPHEADER ,    array('Content-Type: text/xml;charset=' . $this->encoding, 'SOAPAction: "'.$options['soapaction'].'"'));
         curl_setopt($ch, CURLOPT_USERAGENT ,     $this->_userAgent);
 
         if ($this->timeout) {

diff --git a/WSDL.php b/WSDL.php
@@ -1070,7 +1070,7 @@ function startElement($parser, $name, $attrs) {
                     break;                    
                 }
                 break;
-            case SCHEMA_HTTP:
+            case SCHEMA_WSDL_HTTP:
                 switch($qname->name) {
                 case 'binding':
                     // sect 4.4
@@ -1165,7 +1165,7 @@ function startElement($parser, $name, $attrs) {
                 // what TYPE of port is it?  SOAP or HTTP?
                 $ns = $qname->ns?$this->wsdl->namespaces[strtolower($qname->ns)]:SCHEMA_WSDL;
                 switch($ns) {
-                case SCHEMA_HTTP:
+                case SCHEMA_WSDL_HTTP:
                     $this->wsdl->services[$this->currentService]['ports'][$this->currentPort]['type']='http';
                     break;
                 case SCHEMA_SOAP: