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

Timestamp:

2011/10/25 00:02:55 (13 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/Server.php (modified) (7 diffs)

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

@@ -176 +176 @@
             /* We'll try to build our endpoint. */
             $this->endpoint = 'http://' . $_SERVER['SERVER_NAME'];
-            if ($_SERVER['SERVER_PORT']) {
+            if (isset($_SERVER['SERVER_PORT'])) {
                 $this->endpoint .= ':' . $_SERVER['SERVER_PORT'];
             }
@@ -186 +186 @@
         if (isset($_SERVER['CONTENT_TYPE'])) {
             if (strcasecmp($_SERVER['CONTENT_TYPE'], 'application/dime') == 0) {
-                $this->_decodeDIMEMessage($data, $headers, $attachments);
+                $this->_decodeDIMEMessage($data, $this->headers, $attachments);
                 $useEncoding = 'DIME';
             } elseif (stristr($_SERVER['CONTENT_TYPE'], 'multipart/related')) {
@@ -193 +193 @@
                     stripslashes($_SERVER['CONTENT_TYPE']) .
                     "\r\n\r\n" . $data;
-                $this->_decodeMimeMessage($data, $headers, $attachments);
+                $this->_decodeMimeMessage($data, $this->headers, $attachments);
                 $useEncoding = 'Mime';
             }
-            if (!isset($headers['content-type'])) {
-                $headers['content-type'] = stripslashes($_SERVER['CONTENT_TYPE']);
+            if (!isset($this->headers['content-type'])) {
+                $this->headers['content-type'] = stripslashes($_SERVER['CONTENT_TYPE']);
             }
             if (!$this->fault &&
-                !$this->_getContentEncoding($headers['content-type'])) {
+                !$this->_getContentEncoding($this->headers['content-type'])) {
                 $this->xml_encoding = SOAP_DEFAULT_ENCODING;
                 /* Found encoding we don't understand; return a fault. */
@@ -210 +210 @@
          * WSDL file. */
         if (!$this->fault && !$test &&
-            ($_SERVER['REQUEST_METHOD'] != 'POST' ||
-             strncmp($headers['content-type'], 'text/xml', 8) != 0)) {
+            ((isset($_SERVER['REQUEST_METHOD']) &&
+              $_SERVER['REQUEST_METHOD'] != 'POST') ||
+             (isset($this->headers['content-type']) &&
+              strncmp($this->headers['content-type'], 'text/xml', 8) != 0))) {
             /* This is not possibly a valid SOAP request, try to return a WSDL
              * file. */
-            $this->_raiseSoapFault('Invalid SOAP request, must be POST with content-type: text/xml, got: ' . (isset($headers['content-type']) ? $headers['content-type'] : 'Nothing!'), '', '', 'Server');
+            $got = isset($this->headers['content-type']) ? $this->headers['content-type'] : 'Nothing!';
+            $this->_raiseSoapFault('Invalid SOAP request, must be POST with content-type: text/xml, got: ' . $got, '', '', 'Server');
         }
 
@@ -380 +383 @@
     {
         /* Parse response, get SOAP_Parser object. */
-        $parser =& new SOAP_Parser($data, $this->xml_encoding, $attachments);
-        /* If fault occurred during message parsing. */
+        $parser = new SOAP_Parser($data, $this->xml_encoding, $attachments);
+
         if ($parser->fault) {
+            /* Fault occurred during message parsing. */
             $this->fault = $parser->fault;
+            return null;
+        }
+        if (!count($parser->root_struct_name)) {
+            /* No method specified. */
+            $this->_raiseSoapFault('No method specified in request.');
             return null;
         }
@@ -544 +553 @@
         if (is_array($requestArray)) {
             if (isset($requestArray['faultcode']) ||
-                isset($requestArray['SOAP-ENV:faultcode'])) {
+                isset($requestArray[SOAP_BASE::SOAPENVPrefix().':faultcode'])) {
                 $faultcode = $faultstring = $faultdetail = $faultactor = '';
                 foreach ($requestArray as $k => $v) {
@@ -800 +809 @@
      * @return void
      */
-    function addObjectWSDL(&$wsdl_obj, $targetNamespace, $service_name,
+    function addObjectWSDL($wsdl_obj, $targetNamespace, $service_name,
                            $service_desc = '')
     {