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

Timestamp:

2011/10/25 00:02:55 (12 years ago)

Author:

Seasoft

Message:

#1521 (PEAR::SOAP 配布と異なる部分がある)

• 新しいバージョンの配布ファイルを上書きすることで解決

#1522 (PEAR::SOAP をバージョンアップ)

• 0.11.0 -> 0.12.0

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']) {
-            $fault = SOAP_Base_Object::_raiseSoapFault("Invalid transport URI: $url");
-            return $fault;
+            return SOAP_Base_Object::_raiseSoapFault("Invalid transport URI: $url");
         }
 
@@ -133 +132 @@
             $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)) {
-            $fault = SOAP_Base_Object::_raiseSoapFault("No Transport class $transport_class");
-            return $fault;
+            if (!(@include_once('SOAP/Transport/' . basename($transport_type) . '.php'))) {
+                return SOAP_Base_Object::_raiseSoapFault("No Transport for {$urlparts['scheme']}");
+            }
         }
-        $t =& new $transport_class($url, $encoding);
+        if (!class_exists($transport_class)) {
+            return SOAP_Base_Object::_raiseSoapFault("No Transport class $transport_class");
+        }
 
-        return $t;
+        return new $transport_class($url, $encoding);
     }