Merge pull request #1 from Sybit-GmbH/master

Support of HTTP/1.1
wooxo · Dec 4, 2015 · c020c74 · c020c74
2 parents cf779e0 + 0ef7f9c
commit c020c74
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "nusphere/nusoap",
-    "version": "0.9.5",
+    "version": "0.9.6",
     "type": "library",
     "description": "NuSoap Repository for Composer with some fixes",
     "authors": [

diff --git a/lib/changelog b/lib/changelog
@@ -646,3 +646,6 @@
 - nusoap_client: do not assign the return value of new by reference (it is deprecated) (thanks Pier-Luc Duchaine)
 - nusoap_base: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine)
 - nusoapmime: do not assign the return value of new by reference (it is deprecated)
+
+2015-12-03, version 0.9.6
+- soap_transport_http: added isSkippableCurlHeader() to support HTTP/1.1
diff --git a/lib/class.soap_transport_http.php b/lib/class.soap_transport_http.php
@@ -603,13 +603,14 @@ function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword =
 	 */
 	function isSkippableCurlHeader(&$data) {
 		$skipHeaders = array(	'HTTP/1.1 100',
-								'HTTP/1.0 301',
-								'HTTP/1.1 301',
-								'HTTP/1.0 302',
-								'HTTP/1.1 302',
-								'HTTP/1.0 401',
-								'HTTP/1.1 401',
-								'HTTP/1.0 200 Connection established');
+                                        'HTTP/1.0 301',
+                                        'HTTP/1.1 301',
+                                        'HTTP/1.0 302',
+                                        'HTTP/1.1 302',
+                                        'HTTP/1.0 401',
+                                        'HTTP/1.1 401',
+                                        'HTTP/1.0 200 Connection established',
+                                        'HTTP/1.1 200 Connection Established');
 		foreach ($skipHeaders as $hd) {
 			$prefix = substr($data, 0, strlen($hd));
 			if ($prefix == $hd) return true;

diff --git a/lib/class.wsdl.php b/lib/class.wsdl.php
@@ -25,6 +25,7 @@ class wsdl extends nusoap_base {
     var $currentOperation;
     var $portTypes = array();
     var $currentPortType;
+    var $currentPortOperation = '';
     var $bindings = array();
     var $currentBinding;
     var $ports = array();