Changeset 21410 for branches/version-2_11-dev/data/module/SOAP/Transport.php

Timestamp:

2012/01/17 16:32:25 (12 years ago)

Author:

Seasoft

Message:

2.12系へマイルストーン変更となったチケット分を差し戻し
r21326 #1536
r21325 #1528
r21324 #1547,#1546
r21323 #1546
r21322 #1543
r21321 #1536
r21320 #1536
r21319 #1544
r21318 #1521,#1522
r21317 #1431

File:

• branches/version-2_11-dev/data/module/SOAP/Transport.php (modified) (2 diffs)

branches/version-2_11-dev/data/module/SOAP/Transport.php

@@ -116 +116 @@
     }
 
-    function getTransport($url, $encoding = SOAP_DEFAULT_ENCODING)
+    function &getTransport($url, $encoding = SOAP_DEFAULT_ENCODING)
     {
         $urlparts = @parse_url($url);
 
         if (!$urlparts['scheme']) {
-            return SOAP_Base_Object::_raiseSoapFault("Invalid transport URI: $url");
+            $fault = SOAP_Base_Object::_raiseSoapFault("Invalid transport URI: $url");
+            return $fault;
         }
 
@@ -132 +133 @@
             $transport_type = strtoupper($urlparts['scheme']);
         }
+        $transport_include = 'SOAP/Transport/' . basename($transport_type) . '.php';
+        $res = @include_once($transport_include);
+        if (!$res) {
+            $fault = SOAP_Base_Object::_raiseSoapFault("No Transport for {$urlparts['scheme']}");
+            return $fault;
+        }
         $transport_class = "SOAP_Transport_$transport_type";
         if (!class_exists($transport_class)) {
-            if (!(@include_once('SOAP/Transport/' . basename($transport_type) . '.php'))) {
-                return SOAP_Base_Object::_raiseSoapFault("No Transport for {$urlparts['scheme']}");
-            }
+            $fault = SOAP_Base_Object::_raiseSoapFault("No Transport class $transport_class");
+            return $fault;
         }
-        if (!class_exists($transport_class)) {
-            return SOAP_Base_Object::_raiseSoapFault("No Transport class $transport_class");
-        }
+        $t =& new $transport_class($url, $encoding);
 
-        return new $transport_class($url, $encoding);
+        return $t;
     }