new hprose for PHP with pecl.

hprose · Apr 2, 2015 · 5a1d6c3 · 5a1d6c3
1 parent d2bdf0b
commit 5a1d6c3
Show file tree

Hide file tree

Showing 52 changed files with 29 additions and 5,127 deletions.
diff --git a/php5.3/Hprose.php → Hprose.php b/php5.3/Hprose.php → Hprose.php
@@ -14,7 +14,7 @@
  *                                                        *
  * hprose for php 5.3+                                    *
  *                                                        *
- * LastModified: Apr 1, 2015                              *
+ * LastModified: Apr 2, 2015                              *
  * Author: Ma Bingyao <[email protected]>                  *
  *                                                        *
 \**********************************************************/
@@ -54,19 +54,19 @@ function hprose_unserialize($data, $simple = false) {
         }
     }
 
-    require('Hprose/HttpClient.php');
-    require('Hprose/HttpService.php');
-    require('Hprose/Swoole/HttpService.php');
+    require('Hprose/Http/Client.php');
+    require('Hprose/Http/Service.php');
+    require('Hprose/Swoole/Http/Service.php');
     require('Hprose/Filter/JSONRPC/ClientFilter.php');
     require('Hprose/Filter/JSONRPC/ServiceFilter.php');
     require('Hprose/Filter/XMLRPC/ClientFilter.php');
     require('Hprose/Filter/XMLRPC/ServiceFilter.php');
 
-    class_alias('Hprose\\HttpClient', 'HproseHttpClient');
-    class_alias('Hprose\\HttpService', 'HproseHttpService');
-    class_alias('Hprose\\HttpServer', 'HproseHttpServer');
-    class_alias('Hprose\\Swoole\\HttpService', 'HproseSwooleHttpService');
-    class_alias('Hprose\\Swoole\\HttpServer', 'HproseSwooleHttpServer');
+    class_alias('Hprose\\Http\\Client', 'HproseHttpClient');
+    class_alias('Hprose\\Http\\Service', 'HproseHttpService');
+    class_alias('Hprose\\Http\\Server', 'HproseHttpServer');
+    class_alias('Hprose\\Swoole\\Http\\Service', 'HproseSwooleHttpService');
+    class_alias('Hprose\\Swoole\\Http\\Server', 'HproseSwooleHttpServer');
     class_alias('Hprose\\Filter\\JSONRPC\\ClientFilter', 'HproseJSONRPCClientFilter');
     class_alias('Hprose\\Filter\\JSONRPC\\ServiceFilter', 'HproseJSONRPCServiceFilter');
     class_alias('Hprose\\Filter\\XMLRPC\\ClientFilter', 'HproseXMLRPCClientFilter');

diff --git a/php5.3/Hprose/BytesIO.php → Hprose/BytesIO.php b/php5.3/Hprose/BytesIO.php → Hprose/BytesIO.php
diff --git a/php5.3/Hprose/ClassManager.php → Hprose/ClassManager.php b/php5.3/Hprose/ClassManager.php → Hprose/ClassManager.php
diff --git a/php5.3/Hprose/Client.php → Hprose/Client.php b/php5.3/Hprose/Client.php → Hprose/Client.php
diff --git a/php5.3/Hprose/Filter.php → Hprose/Filter.php b/php5.3/Hprose/Filter.php → Hprose/Filter.php
diff --git a/....3/Hprose/Filter/JSONRPC/ClientFilter.php → Hprose/Filter/JSONRPC/ClientFilter.php b/....3/Hprose/Filter/JSONRPC/ClientFilter.php → Hprose/Filter/JSONRPC/ClientFilter.php
diff --git a/...3/Hprose/Filter/JSONRPC/ServiceFilter.php → Hprose/Filter/JSONRPC/ServiceFilter.php b/...3/Hprose/Filter/JSONRPC/ServiceFilter.php → Hprose/Filter/JSONRPC/ServiceFilter.php
diff --git a/php5.3/Hprose/Filter/XMLRPC/ClientFilter.php → Hprose/Filter/XMLRPC/ClientFilter.php b/php5.3/Hprose/Filter/XMLRPC/ClientFilter.php → Hprose/Filter/XMLRPC/ClientFilter.php
diff --git a/....3/Hprose/Filter/XMLRPC/ServiceFilter.php → Hprose/Filter/XMLRPC/ServiceFilter.php b/....3/Hprose/Filter/XMLRPC/ServiceFilter.php → Hprose/Filter/XMLRPC/ServiceFilter.php
diff --git a/php5.3/Hprose/Formatter.php → Hprose/Formatter.php b/php5.3/Hprose/Formatter.php → Hprose/Formatter.php
diff --git a/php5.3/Hprose/HttpClient.php → Hprose/Http/Client.php b/php5.3/Hprose/HttpClient.php → Hprose/Http/Client.php
@@ -10,17 +10,17 @@
 
 /**********************************************************\
  *                                                        *
- * Hprose/HttpClient.php                                  *
+ * Hprose/Http/Client.php                                 *
  *                                                        *
  * hprose http client class for php 5.3+                  *
  *                                                        *
- * LastModified: Mar 26, 2015                             *
+ * LastModified: Apr 2, 2015                              *
  * Author: Ma Bingyao <[email protected]>                  *
  *                                                        *
 \**********************************************************/
 
-namespace Hprose {
-    class HttpClient extends Client {
+namespace Hprose\Http {
+    class Client extends \Hprose\Client {
         private static $cookieManager = array();
         private $host = '';
         private $path = '';

diff --git a/php5.3/Hprose/HttpService.php → Hprose/Http/Service.php b/php5.3/Hprose/HttpService.php → Hprose/Http/Service.php
@@ -10,17 +10,17 @@
 
 /**********************************************************\
  *                                                        *
- * Hprose/HttpServer.php                                  *
+ * Hprose/Http/Server.php                                 *
  *                                                        *
  * hprose http server class for php 5.3+                  *
  *                                                        *
- * LastModified: Mar 29, 2015                             *
+ * LastModified: Apr 2, 2015                              *
  * Author: Ma Bingyao <[email protected]>                  *
  *                                                        *
 \**********************************************************/
 
-namespace Hprose {
-    class HttpService extends Service {
+namespace Hprose\Http {
+    class Service extends \Hprose\Service {
         private $crossDomain = false;
         private $P3P = false;
         private $get = true;
@@ -87,8 +87,12 @@ public function removeAccessControlAllowOrigin($origin) {
             unset($this->origins[strtolower($origin)]);
         }
         public function handle() {
-            $request = file_get_contents("php://input");
-
+            if (isset($HTTP_RAW_POST_DATA)) {
+                $request = $HTTP_RAW_POST_DATA;
+            }
+            else {
+                $request = file_get_contents("php://input");
+            }
             $context = new \stdClass();
             $context->server = $this;
             $context->userdata = new \stdClass();
@@ -136,7 +140,7 @@ public function handle() {
         }
     }
 
-    class HttpServer extends HttpService {
+    class Server extends Service {
         public function start() {
             $this->handle();
         }

diff --git a/php5.3/Hprose/RawReader.php → Hprose/RawReader.php b/php5.3/Hprose/RawReader.php → Hprose/RawReader.php
diff --git a/php5.3/Hprose/Reader.php → Hprose/Reader.php b/php5.3/Hprose/Reader.php → Hprose/Reader.php
diff --git a/php5.3/Hprose/ResultMode.php → Hprose/ResultMode.php b/php5.3/Hprose/ResultMode.php → Hprose/ResultMode.php
diff --git a/php5.3/Hprose/Service.php → Hprose/Service.php b/php5.3/Hprose/Service.php → Hprose/Service.php
diff --git a/php5.3/Hprose/Swoole/HttpService.php → Hprose/Swoole/Http/Service.php b/php5.3/Hprose/Swoole/HttpService.php → Hprose/Swoole/Http/Service.php
@@ -14,13 +14,13 @@
  *                                                        *
  * hprose swoole http service library for php 5.3+        *
  *                                                        *
- * LastModified: Apr 1, 2015                              *
+ * LastModified: Apr 2, 2015                              *
  * Author: Ma Bingyao <[email protected]>                  *
  *                                                        *
 \**********************************************************/
 
-namespace Hprose\Swoole {
-    class HttpService extends \Hprose\Service {
+namespace Hprose\Swoole\Http {
+    class Service extends \Hprose\Service {
         private $crossDomain = false;
         private $P3P = false;
         private $get = true;
@@ -138,7 +138,7 @@ public function handle($request, $response) {
         }
     }
 
-    class HttpServer extends HttpService {
+    class Server extends Service {
         private $http;
         public function __construct($host, $port) {
             $this->http = new \swoole_http_server($host, $port);

diff --git a/php5.3/Hprose/Tags.php → Hprose/Tags.php b/php5.3/Hprose/Tags.php → Hprose/Tags.php
diff --git a/php5.3/Hprose/Writer.php → Hprose/Writer.php b/php5.3/Hprose/Writer.php → Hprose/Writer.php
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     },
     "autoload": {
         "classmap": [
-            "./php5/"
+            "./"
         ]
     }
 }
diff --git a/php5/HproseBaseHttpClient.php b/php5/HproseBaseHttpClient.php
diff --git a/php5/HproseClassManager.php b/php5/HproseClassManager.php