Nuke references.

git-svn-id: http://svn.php.net/repository/pear/packages/SOAP/trunk@262764 c90b9560-bf6c-de11-be94-00142212c4b1
pear · Jul 15, 2008 · 42ad1a1 · 42ad1a1
1 parent 983d2ea
commit 42ad1a1
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/Transport.php b/Transport.php
@@ -115,13 +115,12 @@ function send($msg, $options = null)
         return $this->_raiseSoapFault('SOAP_Transport::send() not implemented.');
     }
 
-    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");
         }
 
         if (strcasecmp($urlparts['scheme'], 'mailto') == 0) {
@@ -132,20 +131,17 @@ function &getTransport($url, $encoding = SOAP_DEFAULT_ENCODING)
             /* Handle other transport types */
             $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']}");
+            }
+        }
+        if (!class_exists($transport_class)) {
+            return SOAP_Base_Object::_raiseSoapFault("No Transport class $transport_class");
         }
-        $t =& new $transport_class($url, $encoding);
 
-        return $t;
+        return new $transport_class($url, $encoding);
     }
 
 }