From 49b9c595188771940fefa4bcaf87ce8815ece359 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 29 Jan 2004 09:03:28 +0000 Subject: [PATCH] Support for nonWSDL mode was improved (SoapVal,SoapVar,SOAPAction...) --- ext/soap/TODO | 1 - ext/soap/interop/client_round2_interop.php | 2 +- ext/soap/interop/client_round2_params.php | 68 +++++----- ext/soap/interop/interop.wsdl.php | 25 ++-- ext/soap/php_encoding.c | 138 +++++++++++++-------- ext/soap/soap.c | 27 ++-- 6 files changed, 149 insertions(+), 112 deletions(-) diff --git a/ext/soap/TODO b/ext/soap/TODO index c4ac6891b8..c0f3e8e951 100644 --- a/ext/soap/TODO +++ b/ext/soap/TODO @@ -1,7 +1,6 @@ General ------- - rename soapobject to soapclient -- make sure soapvar and soapparam are really need - make sure soapserver.map(), soap_encode_to_xml() and soap_encode_to_zval() are really need - reimplement SoapObject::__getfunctions() and SoapObject::__gettypes() to return structures instead of strings diff --git a/ext/soap/interop/client_round2_interop.php b/ext/soap/interop/client_round2_interop.php index af89fc8593..a1dd706d7d 100644 --- a/ext/soap/interop/client_round2_interop.php +++ b/ext/soap/interop/client_round2_interop.php @@ -90,7 +90,7 @@ class Interop_Client $this->_getEndpoints($test, 1); // retreive endpoints from the endpoint server - $endpointArray = $soapclient->__call("GetEndpointInfo",array("groupName"=>$test),"http://soapinterop.org/info/","http://soapinterop.org/info/"); + $endpointArray = $soapclient->__call("GetEndpointInfo",array("groupName"=>$test),"http://soapinterop.org/","http://soapinterop.org/"); if ($soapclient->__isfault() || PEAR::isError($endpointArray)) { print "
".$soapclient->wire."\n";
             print_r($endpointArray);
diff --git a/ext/soap/interop/client_round2_params.php b/ext/soap/interop/client_round2_params.php
index b957313842..b8d54918ae 100644
--- a/ext/soap/interop/client_round2_params.php
+++ b/ext/soap/interop/client_round2_params.php
@@ -142,8 +142,8 @@ function make_2d($x, $y)
     return $a;
 }
 
-function soap_value($name, $value, $type) {
-    return new soapparam(new soapvar($value,$type),$name);
+function soap_value($name, $value, $type, $type_name=NULL, $type_ns=NULL) {
+    return new soapparam(new soapvar($value,$type,$type_name,$type_ns),$name);
 }
 
 class SOAPStruct {
@@ -184,22 +184,22 @@ $soap_tests['base'][] = new SOAP_Test('echoStringArray',
         array('inputStringArray' => array('good','bad')));
 $soap_tests['base'][] = new SOAP_Test('echoStringArray',
         array('inputStringArray' =>
-            soap_value('inputStringArray',array('good','bad'),SOAP_ENC_ARRAY)));
+            soap_value('inputStringArray',array('good','bad'),SOAP_ENC_ARRAY,"ArrayOfstring","http://soapinterop.org/xsd")));
 
 $soap_tests['base'][] = new SOAP_Test('echoStringArray(one)',
         array('inputStringArray' => array('good')));
 $soap_tests['base'][] = new SOAP_Test('echoStringArray(one)',
         array('inputStringArray' =>
-            soap_value('inputStringArray',array('good'),SOAP_ENC_ARRAY)));
+            soap_value('inputStringArray',array('good'),SOAP_ENC_ARRAY,"ArrayOfstring","http://soapinterop.org/xsd")));
 
 // empty array test
 $soap_tests['base'][] = new SOAP_Test('echoStringArray(empty)', array('inputStringArray' => array()));
-$soap_tests['base'][] = new SOAP_Test('echoStringArray(empty)', array('inputStringArray' => soap_value('inputStringArray',array(),SOAP_ENC_ARRAY)));
+$soap_tests['base'][] = new SOAP_Test('echoStringArray(empty)', array('inputStringArray' => soap_value('inputStringArray',array(),SOAP_ENC_ARRAY,"ArrayOfstring","http://soapinterop.org/xsd")));
 
 # XXX NULL Arrays not supported
 // null array test
 $soap_tests['base'][] = new SOAP_Test('echoStringArray(null)', array('inputStringArray' => NULL));
-$soap_tests['base'][] = new SOAP_Test('echoStringArray(null)', array('inputStringArray' => soap_value('inputStringArray',NULL,SOAP_ENC_ARRAY)));
+$soap_tests['base'][] = new SOAP_Test('echoStringArray(null)', array('inputStringArray' => soap_value('inputStringArray',NULL,SOAP_ENC_ARRAY,"ArrayOfstring","http://soapinterop.org/xsd")));
 
 //***********************************************************
 // Base echoInteger
@@ -215,7 +215,7 @@ $soap_tests['base'][] = new SOAP_Test('echoIntegerArray',
         array('inputIntegerArray' =>
             soap_value('inputIntegerArray',
                        array(new soapvar(12345,XSD_INT),new soapvar(654321,XSD_INT)),
-                    SOAP_ENC_ARRAY)));
+                    SOAP_ENC_ARRAY,"ArrayOfint","http://soapinterop.org/xsd")));
 
 //***********************************************************
 // Base echoFloat
@@ -231,13 +231,13 @@ $soap_tests['base'][] = new SOAP_Test('echoFloatArray',
         array('inputFloatArray' =>
             soap_value('inputFloatArray',
                        array(new soapvar(123.45,XSD_FLOAT),new soapvar(654.321,XSD_FLOAT)),
-                    SOAP_ENC_ARRAY)));
+                    SOAP_ENC_ARRAY,"ArrayOffloat","http://soapinterop.org/xsd")));
 //***********************************************************
 // Base echoStruct
 
 $soapstruct = new SOAPStruct('arg',34,325.325);
 # XXX no way to set a namespace!!!
-$soapsoapstruct = soap_value('inputStruct',$soapstruct,SOAP_ENC_OBJECT);
+$soapsoapstruct = soap_value('inputStruct',$soapstruct,SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd");
 $soap_tests['base'][] = new SOAP_Test('echoStruct', array('inputStruct' =>$soapstruct));
 $soap_tests['base'][] = new SOAP_Test('echoStruct', array('inputStruct' =>$soapsoapstruct));
 
@@ -247,7 +247,11 @@ $soap_tests['base'][] = new SOAP_Test('echoStruct', array('inputStruct' =>$soaps
 $soap_tests['base'][] = new SOAP_Test('echoStructArray', array('inputStructArray' => array(
         $soapstruct,$soapstruct,$soapstruct)));
 $soap_tests['base'][] = new SOAP_Test('echoStructArray', array('inputStructArray' =>
-        soap_value('inputStructArray',array($soapstruct,$soapstruct,$soapstruct),SOAP_ENC_ARRAY)));
+         soap_value('inputStructArray',array(
+           new soapvar($soapstruct,SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"),
+           new soapvar($soapstruct,SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"),
+           new soapvar($soapstruct,SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd")),
+         SOAP_ENC_ARRAY,"ArrayOfSOAPStruct","http://soapinterop.org/xsd")));
 
 
 //***********************************************************
@@ -331,7 +335,7 @@ $soap_tests['GroupB'][] = new SOAP_Test('echoStructAsSimpleTypes',
             (object)array('varString' => 'arg',
                 					'varInt'    => 34,
                           'varFloat'  => 325.325
-            ), SOAP_ENC_OBJECT)), $expect);
+            ), SOAP_ENC_OBJECT, "SOAPStruct","http://soapinterop.org/xsd")), $expect);
 
 //***********************************************************
 // GroupB echoSimpleTypesAsStruct
@@ -375,8 +379,7 @@ $soap_tests['GroupB'][] = new SOAP_Test('echo2DStringArray',
 //***********************************************************
 // GroupB echoNestedStruct
 
-$soap_tests['GroupB'][] = new SOAP_Test('echoNestedStruct',
-    array('inputStruct' => (object)array(
+$strstr = (object)array(
         'varString'=>'arg',
         'varInt'=>34,
         'varFloat'=>325.325,
@@ -384,8 +387,9 @@ $soap_tests['GroupB'][] = new SOAP_Test('echoNestedStruct',
             'varString'=>'arg',
             'varInt'=>34,
             'varFloat'=>325.325
-        )
-    )));
+        ));
+$soap_tests['GroupB'][] = new SOAP_Test('echoNestedStruct',
+    array('inputStruct' => $strstr));
 $soap_tests['GroupB'][] = new SOAP_Test('echoNestedStruct',
     array('inputStruct' =>
         soap_value('inputStruct',
@@ -393,33 +397,25 @@ $soap_tests['GroupB'][] = new SOAP_Test('echoNestedStruct',
 				        'varString'=>'arg',
         				'varInt'=>34,
 				        'varFloat'=>325.325,
-        				'varStruct' => (object)array(
+        				'varStruct' => new SoapVar((object)array(
 				            'varString'=>'arg',
         				    'varInt'=>34,
 				            'varFloat'=>325.325
-        				)
-//            array( #push struct elements into one soap value
-//                soap_value('varString','arg', XSD_STRING),
-//                soap_value('varInt',34, XSD_INT),
-//                soap_value('varFloat',325.325,XSD_FLOAT),
-//                soap_value('varStruct',
-//                    (object)array('varString' => 'arg',
-//                                  'varInt'    => 34,
-//                                  'varFloat'  => 325.325
-//                    ), SOAP_ENC_OBJECT
-            ), SOAP_ENC_OBJECT
-        )));
+        				), SOAP_ENC_OBJECT, "SOAPStruct","http://soapinterop.org/xsd")
+            ), SOAP_ENC_OBJECT, "SOAPStructStruct","http://soapinterop.org/xsd"
+        )),$strstr);
 
 //***********************************************************
 // GroupB echoNestedArray
 
-$soap_tests['GroupB'][] = new SOAP_Test('echoNestedArray',
-    array('inputStruct' => (object)array(
+$arrstr = (object)array(
         'varString'=>'arg',
         'varInt'=>34,
         'varFloat'=>325.325,
         'varArray' => array('red','blue','green')
-    )));
+    );
+$soap_tests['GroupB'][] = new SOAP_Test('echoNestedArray',
+    array('inputStruct' => $arrstr));
 $soap_tests['GroupB'][] = new SOAP_Test('echoNestedArray',
     array('inputStruct' =>
         soap_value('inputStruct',
@@ -427,13 +423,9 @@ $soap_tests['GroupB'][] = new SOAP_Test('echoNestedArray',
                           'varInt'    => 34,
                           'varFloat'  => 325.325,
                           'varArray'  =>
-                    array("red", "blue", "green")
-//                        soap_value('item','red', XSD_STRING),
-//                        soap_value('item','blue', XSD_STRING),
-//                        soap_value('item','green', XSD_STRING)
-//                    )
-                ), SOAP_ENC_OBJECT
-        )));
+                    new SoapVar(array("red", "blue", "green"), SOAP_ENC_ARRAY, "ArrayOfstring","http://soapinterop.org/xsd")
+                ), SOAP_ENC_OBJECT, "SOAPArrayStruct","http://soapinterop.org/xsd"
+        )),$arrstr);
 
 
 #//***********************************************************
diff --git a/ext/soap/interop/interop.wsdl.php b/ext/soap/interop/interop.wsdl.php
index b257c56b66..6ed2d17d66 100644
--- a/ext/soap/interop/interop.wsdl.php
+++ b/ext/soap/interop/interop.wsdl.php
@@ -7,13 +7,14 @@ echo "\n";
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
     xmlns:tns="http://soapinterop.org/"
+    xmlns:s="http://soapinterop.org/xsd"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
     xmlns="http://schemas.xmlsoap.org/wsdl/"
     targetNamespace="http://soapinterop.org/">
 
   
-  
+  
    
    
    
@@ -47,7 +48,7 @@ echo "\n";
    
     
      
-      
+      
      
     
    
@@ -61,10 +62,10 @@ echo "\n";
     
   
   
-    
+    
   
   
-    
+    
   
   
     
@@ -73,10 +74,10 @@ echo "\n";
     
   
   
-    
+    
   
   
-    
+    
   
   
     
@@ -85,22 +86,22 @@ echo "\n";
     
   
   
-    
+    
   
   
-    
+    
   
   
-    
+    
   
   
-    
+    
   
   
-    
+    
   
   
-    
+    
   
   
   
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 1b3dcca915..1cbaf788d2 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -222,17 +222,53 @@ xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr par
 	xmlNodePtr node = NULL;
 	TSRMLS_FETCH();
 
-	if (encode == NULL) {
-		encode = get_conversion(UNKNOWN_TYPE);
-	}
-	if (encode->to_xml_before) {
-		data = encode->to_xml_before(&encode->details, data);
-	}
-	if (encode->to_xml) {
-		node = encode->to_xml(&encode->details, data, style, parent);
-	}
-	if (encode->to_xml_after) {
-		node = encode->to_xml_after(&encode->details, node, style);
+	/* Special handling of class SoapVar */
+	if (data &&
+	    Z_TYPE_P(data) == IS_OBJECT &&
+	    Z_OBJCE_P(data) == soap_var_class_entry) {
+		zval **ztype, **zdata, **zns, **zstype, **zname, **znamens;
+		encodePtr enc;
+
+		if (zend_hash_find(Z_OBJPROP_P(data), "enc_type", sizeof("enc_type"), (void **)&ztype) == FAILURE) {
+			php_error(E_ERROR, "SOAP-ERROR: Encoding: SoapVar hasn't 'enc_type' propery");
+		}
+
+		enc = get_conversion(Z_LVAL_P(*ztype));
+
+		if (zend_hash_find(Z_OBJPROP_P(data), "enc_value", sizeof("enc_value"), (void **)&zdata) == FAILURE) {
+			node = master_to_xml(enc, NULL, style, parent);
+		} else {
+			node = master_to_xml(enc, *zdata, style, parent);
+		}
+
+		if (zend_hash_find(Z_OBJPROP_P(data), "enc_stype", sizeof("enc_stype"), (void **)&zstype) == SUCCESS) {
+			if (zend_hash_find(Z_OBJPROP_P(data), "enc_ns", sizeof("enc_ns"), (void **)&zns) == SUCCESS) {
+				set_ns_and_type_ex(node, Z_STRVAL_PP(zns), Z_STRVAL_PP(zstype));
+			} else {
+				set_ns_and_type_ex(node, NULL, Z_STRVAL_PP(zstype));
+			}
+		}
+
+		if (zend_hash_find(Z_OBJPROP_P(data), "enc_name", sizeof("enc_name"), (void **)&zname) == SUCCESS) {
+			xmlNodeSetName(node, Z_STRVAL_PP(zname));
+		}
+		if (zend_hash_find(Z_OBJPROP_P(data), "enc_namens", sizeof("enc_namens"), (void **)&znamens) == SUCCESS) {
+			xmlNsPtr nsp = encode_add_ns(node, Z_STRVAL_PP(znamens));
+			xmlSetNs(node, nsp);
+		}
+	} else {
+		if (encode == NULL) {
+			encode = get_conversion(UNKNOWN_TYPE);
+		}
+		if (encode->to_xml_before) {
+			data = encode->to_xml_before(&encode->details, data);
+		}
+		if (encode->to_xml) {
+			node = encode->to_xml(&encode->details, data, style, parent);
+		}
+		if (encode->to_xml_after) {
+			node = encode->to_xml_after(&encode->details, node, style);
+		}
 	}
 	return node;
 }
@@ -979,41 +1015,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
 	sdlTypePtr sdlType = type->sdl_type;
 	TSRMLS_FETCH();
 
-	/* Special handling of class SoapVar */
-	if (data &&
-	    Z_TYPE_P(data) == IS_OBJECT &&
-	    Z_OBJCE_P(data) == soap_var_class_entry) {
-		zval **ztype, **zdata, **zns, **zstype, **zname, **znamens;
-		encodePtr enc;
-
-		if (zend_hash_find(Z_OBJPROP_P(data), "enc_type", sizeof("enc_type"), (void **)&ztype) == FAILURE) {
-			php_error(E_ERROR, "SOAP-ERROR: Encoding: SoapVar hasn't 'enc_type' propery");
-		}
-
-		enc = get_conversion(Z_LVAL_P(*ztype));
-
-		if (zend_hash_find(Z_OBJPROP_P(data), "enc_value", sizeof("enc_value"), (void **)&zdata) == FAILURE) {
-			xmlParam = master_to_xml(enc, NULL, style, parent);
-		} else {
-			xmlParam = master_to_xml(enc, *zdata, style, parent);
-		}
-
-		if (zend_hash_find(Z_OBJPROP_P(data), "enc_stype", sizeof("enc_stype"), (void **)&zstype) == SUCCESS) {
-			if (zend_hash_find(Z_OBJPROP_P(data), "enc_ns", sizeof("enc_ns"), (void **)&zns) == SUCCESS) {
-				set_ns_and_type_ex(xmlParam, Z_STRVAL_PP(zns), Z_STRVAL_PP(zstype));
-			} else {
-				set_ns_and_type_ex(xmlParam, NULL, Z_STRVAL_PP(zstype));
-			}
-		}
-
-		if (zend_hash_find(Z_OBJPROP_P(data), "enc_name", sizeof("enc_name"), (void **)&zname) == SUCCESS) {
-			xmlNodeSetName(xmlParam, Z_STRVAL_PP(zname));
-		}
-		if (zend_hash_find(Z_OBJPROP_P(data), "enc_namens", sizeof("enc_namens"), (void **)&znamens) == SUCCESS) {
-			xmlNsPtr nsp = encode_add_ns(xmlParam, Z_STRVAL_PP(znamens));
-			xmlSetNs(xmlParam, nsp);
-		}
-	} else if (sdlType) {
+	if (sdlType) {
 		prop = NULL;
 		if (Z_TYPE_P(data) == IS_OBJECT) {
 			prop = Z_OBJPROP_P(data);
@@ -2462,6 +2464,7 @@ static void get_array_type(xmlNodePtr node, zval *array, smart_str *type TSRMLS_
 	HashTable *ht = HASH_OF(array);
 	int i, count, cur_type, prev_type, different;
 	zval **tmp;
+	char *prev_stype, *cur_stype, *prev_ns, *cur_ns;
 
 	if (!array || Z_TYPE_P(array) != IS_ARRAY) {
 		smart_str_appendl(type, "xsd:anyType", 11);
@@ -2482,31 +2485,64 @@ static void get_array_type(xmlNodePtr node, zval *array, smart_str *type TSRMLS_
 			if (zend_hash_find(Z_OBJPROP_PP(tmp), "enc_type", sizeof("enc_type"), (void **)&ztype) == FAILURE) {
 				php_error(E_ERROR, "SOAP-ERROR: Encoding: SoapVar hasn't 'enc_type' property");
 			}
-			cur_type = Z_LVAL_P(*ztype);
+			cur_type = Z_LVAL_PP(ztype);
+
+			if (zend_hash_find(Z_OBJPROP_PP(tmp), "enc_stype", sizeof("enc_stype"), (void **)&ztype) == SUCCESS) {
+			  cur_stype = Z_STRVAL_PP(ztype);
+			} else {
+			  cur_stype = NULL;
+			}
+			
+			if (zend_hash_find(Z_OBJPROP_PP(tmp), "enc_ns", sizeof("enc_ns"), (void **)&ztype) == SUCCESS) {
+			  cur_ns = Z_STRVAL_PP(ztype);
+			} else {
+			  cur_ns = NULL;
+			}
+				
 		} else if (Z_TYPE_PP(tmp) == IS_ARRAY && is_map(*tmp)) {
 			cur_type = APACHE_MAP;
+		  cur_stype = NULL;
+		  cur_ns = NULL;
 		} else {
 			cur_type = Z_TYPE_PP(tmp);
+		  cur_stype = NULL;
+		  cur_ns = NULL;
 		}
 
 		if (i > 0) {
-			if (cur_type != prev_type) {
+			if ((cur_type != prev_type) ||
+          (cur_stype != NULL && prev_stype != NULL && strcmp(cur_stype,prev_stype) != 0) ||
+          (cur_stype == NULL && cur_stype != prev_stype) ||
+          (cur_ns != NULL && prev_ns != NULL && strcmp(cur_ns,prev_ns) != 0) ||
+          (cur_ns == NULL && cur_ns != prev_ns)) {
 				different = TRUE;
 				break;
 			}
 		}
 
 		prev_type = cur_type;
+		prev_stype = cur_stype;
+		prev_ns = cur_ns;
 		zend_hash_move_forward(ht);
 	}
 
 	if (different || count == 0) {
 		smart_str_appendl(type, "xsd:anyType", 11);
 	} else {
-		encodePtr enc;
+		if (cur_stype != NULL) {
+			if (cur_ns) {
+				xmlNsPtr ns = encode_add_ns(node,cur_ns);
+				smart_str_appends(type,ns->prefix);
+				smart_str_appendc(type,':');
+			}
+			smart_str_appends(type,cur_stype);
+			smart_str_0(type);
+		} else {
+			encodePtr enc;
 
-		enc = get_conversion(cur_type);
-		get_type_str(node, enc->details.ns, enc->details.type_str, type);
+			enc = get_conversion(cur_type);
+			get_type_str(node, enc->details.ns, enc->details.type_str, type);
+		}
 	}
 }
 
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 61851169a4..57b2c0c3d9 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -1347,8 +1347,10 @@ static void do_soap_call(zval* thisObj,
                          int function_len,
                          int arg_count,
                          zval** real_args,
-                         zval* return_value
-						 TSRMLS_DC)
+                         zval* return_value,
+                         char* soap_action,
+                         char* call_uri
+                         TSRMLS_DC)
 {
 	zval **tmp;
 	zval **trace;
@@ -1425,11 +1427,18 @@ zend_try {
 		} else if (zend_hash_find(Z_OBJPROP_P(thisObj), "location", sizeof("location"),(void **) &location) == FAILURE) {
 			add_soap_fault(thisObj, "Client", "Error could not find \"location\" property", NULL, NULL TSRMLS_CC);
 		} else {
-	 		request = seralize_function_call(thisObj, NULL, function, Z_STRVAL_PP(uri), real_args, arg_count, soap_version TSRMLS_CC);
+			if (call_uri == NULL) {
+				call_uri = Z_STRVAL_PP(uri);
+			}
+	 		request = seralize_function_call(thisObj, NULL, function, call_uri, real_args, arg_count, soap_version TSRMLS_CC);
 
-			smart_str_appendl(&action, Z_STRVAL_PP(uri), Z_STRLEN_PP(uri));
-			smart_str_appendc(&action, '#');
-			smart_str_appends(&action, function);
+	 		if (soap_action == NULL) {
+				smart_str_appendl(&action, Z_STRVAL_PP(uri), Z_STRLEN_PP(uri));
+				smart_str_appendc(&action, '#');
+				smart_str_appends(&action, function);
+			} else {
+				smart_str_appends(&action, soap_action);
+			}
 			smart_str_0(&action);
 
 			ret = send_http_soap_request(thisObj, request, Z_STRVAL_PP(location), action.c, soap_version TSRMLS_CC);
@@ -1491,7 +1500,7 @@ PHP_METHOD(soapobject, __login)
 
 PHP_METHOD(soapobject, __call)
 {
-	char *function, *soap_action, *uri;
+	char *function, *soap_action = NULL, *uri = NULL;
 	int function_len, soap_action_len, uri_len, i = 0;
 	zval *args;
 	zval **real_args;
@@ -1514,7 +1523,7 @@ PHP_METHOD(soapobject, __call)
 			/*zval_add_ref(param);*/
 			real_args[i++] = *param;
 	}
-	do_soap_call(this_ptr, function, function_len, arg_count, real_args, return_value TSRMLS_CC);
+	do_soap_call(this_ptr, function, function_len, arg_count, real_args, return_value, soap_action, uri TSRMLS_CC);
 
 	efree(real_args);
 }
@@ -1625,7 +1634,7 @@ static void soap_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_proper
 		zval **arguments = (zval **) emalloc(sizeof(zval *) * arg_count);
 
 		zend_get_parameters_array(ht, arg_count, arguments);
-		do_soap_call(this_ptr, function, Z_STRLEN(function_name->element) + 1, arg_count, arguments, return_value TSRMLS_CC);
+		do_soap_call(this_ptr, function, Z_STRLEN(function_name->element) + 1, arg_count, arguments, return_value, NULL, NULL TSRMLS_CC);
 		efree(arguments);
 	}
 	zval_dtor(&function_name->element);
-- 
2.40.0