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

Timestamp:

2011/10/31 13:54:41 (12 years ago)

Author:

kotani

Message:

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

• 新しいバージョンの配布ファイルを上書きすることで解決
• →2.11.4には含めないため一旦コミットキャンセル

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

• 0.11.0 -> 0.12.0
• →2.11.4には含めないため一旦コミットキャンセル

File:

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

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

@@ -25 +25 @@
  *
  * @package  SOAP
- * @category Web Services
+ * @category Web_Services
  */
 
@@ -327 +327 @@
     function _parseResponse()
     {
-        if (!preg_match("/^(.*?)\r?\n\r?\n(.*)/s",
+        if (preg_match("/^(.*?)\r?\n\r?\n(.*)/s",
                        $this->incoming_payload,
                        $match)) {
-            $this->_raiseSoapFault('Invalid HTTP Response');
-            return false;
-        }
-
-        $this->response = $match[2];
-        // Find the response error, some servers response with 500 for
-        // SOAP faults.
-        $this->_parseHeaders($match[1]);
-
-        list(, $code, $msg) = sscanf($this->result_headers[0], '%s %s %s');
-        unset($this->result_headers[0]);
-
-        switch($code) {
-            case 100: // Continue
-                $this->incoming_payload = $match[2];
-                return $this->_parseResponse();
-            case 200:
-            case 202:
-                $this->incoming_payload = trim($match[2]);
-                if (!strlen($this->incoming_payload)) {
-                    /* Valid one-way message response. */
-                    return true;
+            $this->response = $match[2];
+            // Find the response error, some servers response with 500 for
+            // SOAP faults.
+            $this->_parseHeaders($match[1]);
+
+            list(, $code, $msg) = sscanf($this->result_headers[0], '%s %s %s');
+            unset($this->result_headers[0]);
+
+            switch($code) {
+                case 100: // Continue
+                    $this->incoming_payload = $match[2];
+                    return $this->_parseResponse();
+                case 400:
+                    $this->_raiseSoapFault("HTTP Response $code Bad Request");
+                    return false;
+                    break;
+                case 401:
+                    $this->_raiseSoapFault("HTTP Response $code Authentication Failed");
+                    return false;
+                    break;
+                case 403:
+                    $this->_raiseSoapFault("HTTP Response $code Forbidden");
+                    return false;
+                    break;
+                case 404:
+                    $this->_raiseSoapFault("HTTP Response $code Not Found");
+                    return false;
+                    break;
+                case 407:
+                    $this->_raiseSoapFault("HTTP Response $code Proxy Authentication Required");
+                    return false;
+                    break;
+                case 408:
+                    $this->_raiseSoapFault("HTTP Response $code Request Timeout");
+                    return false;
+                    break;
+                case 410:
+                    $this->_raiseSoapFault("HTTP Response $code Gone");
+                    return false;
+                    break;
+                default:
+                    if ($code >= 400 && $code < 500) {
+                        $this->_raiseSoapFault("HTTP Response $code Not Found, Server message: $msg");
+                        return false;
+                    }
+            }
+
+            $this->_parseEncoding($match[1]);
+
+            if ($this->result_content_type == 'application/dime') {
+                // XXX quick hack insertion of DIME
+                if (PEAR::isError($this->_decodeDIMEMessage($this->response, $this->headers, $this->attachments))) {
+                    // _decodeDIMEMessage already raised $this->fault
+                    return false;
                 }
-                break;
-            case 400:
-                $this->_raiseSoapFault("HTTP Response $code Bad Request");
+                $this->result_content_type = $this->headers['content-type'];
+            } elseif (stristr($this->result_content_type, 'multipart/related')) {
+                $this->response = $this->incoming_payload;
+                if (PEAR::isError($this->_decodeMimeMessage($this->response, $this->headers, $this->attachments))) {
+                    // _decodeMimeMessage already raised $this->fault
+                    return false;
+                }
+            } elseif ($this->result_content_type != 'text/xml') {
+                $this->_raiseSoapFault($this->response);
                 return false;
-            case 401:
-                $this->_raiseSoapFault("HTTP Response $code Authentication Failed");
-                return false;
-            case 403:
-                $this->_raiseSoapFault("HTTP Response $code Forbidden");
-                return false;
-            case 404:
-                $this->_raiseSoapFault("HTTP Response $code Not Found");
-                return false;
-            case 407:
-                $this->_raiseSoapFault("HTTP Response $code Proxy Authentication Required");
-                return false;
-            case 408:
-                $this->_raiseSoapFault("HTTP Response $code Request Timeout");
-                return false;
-            case 410:
-                $this->_raiseSoapFault("HTTP Response $code Gone");
-                return false;
-            default:
-                if ($code >= 400 && $code < 500) {
-                    $this->_raiseSoapFault("HTTP Response $code Not Found, Server message: $msg");
-                    return false;
-                }
-                break;
-        }
-
-        $this->_parseEncoding($match[1]);
-
-        if ($this->result_content_type == 'application/dime') {
-            // XXX quick hack insertion of DIME
-            if (PEAR::isError($this->_decodeDIMEMessage($this->response, $this->headers, $this->attachments))) {
-                // _decodeDIMEMessage already raised $this->fault
-                return false;
-            }
-            $this->result_content_type = $this->headers['content-type'];
-        } elseif (stristr($this->result_content_type, 'multipart/related')) {
-            $this->response = $this->incoming_payload;
-            if (PEAR::isError($this->_decodeMimeMessage($this->response, $this->headers, $this->attachments))) {
-                // _decodeMimeMessage already raised $this->fault
-                return false;
-            }
-        } elseif ($this->result_content_type != 'text/xml') {
-            $this->_raiseSoapFault($this->response);
-            return false;
-        }
-
-        // if no content, return false
-        return strlen($this->response) > 0;
+            }
+            // if no content, return false
+            return strlen($this->response) > 0;
+        }
+        $this->_raiseSoapFault('Invalid HTTP Response');
+        return false;
     }
 
@@ -562 +558 @@
         }
 
-        $headers = array();
-        $action = isset($options['soapaction']) ? $options['soapaction'] : '';
-        $headers['Content-Type'] = "text/xml; charset=$this->encoding";
-        $headers['SOAPAction'] = '"' . $action . '"';
-        if (isset($options['headers'])) {
-            $headers = array_merge($headers, $options['headers']);
-        }
-        foreach ($headers as $header => $value) {
-            $headers[$header] = $header . ': ' . $value;
-        }
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($ch, CURLOPT_USERAGENT, $this->_userAgent);
+        if (!isset($options['soapaction'])) {
+            $options['soapaction'] = '';
+        }
+        if (!isset($options['headers']['Content-Type'])) {
+           $options['headers']['Content-Type'] = 'text/xml';
+        }
+        curl_setopt($ch, CURLOPT_HTTPHEADER,
+                    array('Content-Type: ' . $options['headers']['Content-Type']
+                         . ';charset=' . $this->encoding,
+                          'SOAPAction: "' . $options['soapaction'] . '"'));
+        curl_setopt($ch, CURLOPT_USERAGENT,
+                    $this->_userAgent);
 
         if ($this->timeout) {