Changeset 21461 for branches/version-2_12-dev/data/module/SOAP/Server

Timestamp:

2012/02/09 01:26:58 (14 years ago)

Author:

Seasoft

Message:

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

• 0.12.0 -> 0.13.0
• SOAP_WSDL により、「Yahoo!デベロッパーネットワーク」の「オークション SOAP」を取得できることを確認した。

Location:

branches/version-2_12-dev/data/module/SOAP/Server

Files:

• Email.php (modified) (1 diff)
• TCP (added)
• TCP.php (modified) (3 diffs)
• TCP/Handler.php (added)

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

@@ -118 +118 @@
         }
 
-        $client =& new SOAP_Client(null);
+        $client = new SOAP_Client(null);
 
         return $client->parseResponse($data, $this->xml_encoding, $this->attachments);

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

@@ -22 +22 @@
 require_once 'SOAP/Server.php';
 
+require_once 'SOAP/Server/TCP/Handler.php';
+
+
 /**
  * SOAP Server Class that implements a TCP SOAP Server.
@@ -43 +46 @@
     var $localaddr;
     var $port;
-    var $listen;
-    var $reuse;
+    var $type;
 
     function SOAP_Server_TCP($localaddr = '127.0.0.1', $port = 10000,
-                             $listen = 5, $reuse = true)
+                             $type = 'sequential')
     {
         parent::SOAP_Server();
         $this->localaddr = $localaddr;
         $this->port = $port;
-        $this->listen = $listen;
-        $this->reuse = $reuse;
+        $this->type = $type;
     }
 
-    function run()
-    {
-        if (($sock = socket_create(AF_INET, SOCK_STREAM, 0)) < 0) {
-            return $this->_raiseSoapFault('socket_create() failed. Reason: ' . socket_strerror($sock));
+    function run($idleTimeout = null)
+    {        
+        $server = &Net_Server::create($this->type, $this->localaddr,
+                                      $this->port);
+        if (PEAR::isError($server)) {
+            echo $server->getMessage()."\n";
         }
-        if ($this->reuse &&
-            !@socket_setopt($sock, SOL_SOCKET, SO_REUSEADDR, 1)) {
-            return $this->_raiseSoapFault('socket_setopt() failed. Reason: ' . socket_strerror(socket_last_error($sock)));
-        }
-        if (($ret = socket_bind($sock, $this->localaddr, $this->port)) < 0) {
-            return $this->_raiseSoapFault('socket_bind() failed. Reason: ' . socket_strerror($ret));
-        }
-        if (($ret = socket_listen($sock, $this->listen)) < 0) {
-            return $this->_raiseSoapFault('socket_listen() failed. Reason: ' . socket_strerror($ret));
-        }
-
-        while (true) {
-            $data = null;
-            if (($msgsock = socket_accept($sock)) < 0) {
-                $this->_raiseSoapFault('socket_accept() failed. Reason: ' . socket_strerror($msgsock));
-                break;
-            }
-            while ($buf = socket_read($msgsock, 8192)) {
-                if (!$buf = trim($buf)) {
-                    continue;
-                }
-                $data .= $buf;
-            }
-
-            if ($data) {
-                $response = $this->service($data);
-                /* Write to the socket. */
-                if (!socket_write($msgsock, $response, strlen($response))) {
-                    return $this->_raiseSoapFault('Error sending response data reason ' . socket_strerror());
-                }
-            }
-
-            socket_close ($msgsock);
-        }
-
-        socket_close ($sock);
+        
+        $handler = &new SOAP_Server_TCP_Handler;
+        $handler->setSOAPServer($this);
+        
+        // hand over the object that handles server events
+        $server->setCallbackObject($handler);
+        $server->readEndCharacter = '</SOAP-ENV:Envelope>';
+        $server->setIdleTimeout($idleTimeout);
+        
+        // start the server
+        $server->start();
     }
 
@@ -102 +80 @@
     {
         /* TODO: we need to handle attachments somehow. */
-        return $this->parseRequest($data, $attachments);
+        $response = $this->parseRequest($data);
+        if ($this->fault) {
+            $response = $this->fault->message($this->response_encoding);
+        }
+        return $response;
+    }
+    
+    function onStart()
+    {
+    }
+    
+    function onIdle()
+    {
     }
 }