From e7d11efe90f42ca23a9613d51476597dcb9d067c Mon Sep 17 00:00:00 2001
From: ZengYuhang <312384485@qq.com>
Date: Fri, 22 Apr 2016 15:41:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8Esocket.io=20c++?=
 =?UTF-8?q?=20client=E9=80=9A=E4=BF=A1=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/adapter/websocket/socket.io.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/adapter/websocket/socket.io.js b/src/adapter/websocket/socket.io.js
index f0702d89..ba3bdb65 100644
--- a/src/adapter/websocket/socket.io.js
+++ b/src/adapter/websocket/socket.io.js
@@ -128,8 +128,13 @@ export default class extends Base {
       url = `/${url}`;
     }
     request.url = url;
-
-    let http = await think.http(request, think.extend({}, request.res));
+    let http;
+    //socket.io c++ client发过来的requet没有res
+    if(!request.res){
+        http = await think.http(url);
+    }else{
+        let http = await think.http(request, think.extend({}, request.res));
+    }
     http.data = data;
     http.socket = socket;
     http.io = this.io;

From 532481ed6d7845929e7282d2d36aea797af10bbc Mon Sep 17 00:00:00 2001
From: ZengYuhang <312384485@qq.com>
Date: Sat, 23 Apr 2016 16:19:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AD=E6=B3=95?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/adapter/websocket/socket.io.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adapter/websocket/socket.io.js b/src/adapter/websocket/socket.io.js
index ba3bdb65..41f7e537 100644
--- a/src/adapter/websocket/socket.io.js
+++ b/src/adapter/websocket/socket.io.js
@@ -133,7 +133,7 @@ export default class extends Base {
     if(!request.res){
         http = await think.http(url);
     }else{
-        let http = await think.http(request, think.extend({}, request.res));
+        http = await think.http(request, think.extend({}, request.res));
     }
     http.data = data;
     http.socket = socket;