if not complete http parse, will pass EOF to http parser when connection closed; if http parser not consume received data, will close connection.

Author: duzhongwei

include/brynet/net/http/HttpParser.hpp

@@ -22,6 +22,7 @@ class HTTPParser
     {
         mLastWasValue = true;
 
+        mIsUpgrade = false;
         mIsWebSocket = false;
         mIsKeepAlive = false;
         mISCompleted = false;
@@ -44,6 +45,11 @@ class HTTPParser
 
     virtual ~HTTPParser() = default;
 
+    bool isUpgrade() const
+    {
+        return mIsUpgrade;
+    }
+
     bool isWebSocket() const
     {
         return mIsWebSocket;
@@ -54,6 +60,12 @@ class HTTPParser
         return mIsKeepAlive;
     }
 
+
+    bool isCompleted() const
+    {
+        return mISCompleted;
+    }
+
     int method() const
     {
         // mMethod's value defined in http_method, such as  HTTP_GET、HTTP_POST.
@@ -137,6 +149,8 @@ class HTTPParser
     void clearParse()
     {
         mMethod = -1;
+        mIsUpgrade = false;
+        mIsWebSocket = false;
         mISCompleted = false;
         mLastWasValue = true;
         mUrl.clear();
@@ -154,7 +168,8 @@ class HTTPParser
         const size_t nparsed = http_parser_execute(&mParser, &mSettings, buffer, len);
         if (mISCompleted)
         {
-            mIsWebSocket = mParser.upgrade;
+            mIsUpgrade = mParser.upgrade;
+            mIsWebSocket = mIsUpgrade && hasEntry("Upgrade", "websocket");
             mIsKeepAlive = hasEntry("Connection", "Keep-Alive");
             mMethod = mParser.method;
             http_parser_init(&mParser, mParserType);
@@ -163,11 +178,6 @@ class HTTPParser
         return nparsed;
     }
 
-    bool isCompleted() const
-    {
-        return mISCompleted;
-    }
-
 private:
     static int sChunkHeader(http_parser* hp)
     {
@@ -288,7 +298,8 @@ class HTTPParser
     http_parser_settings mSettings;
 
     int mMethod = -1;
-    bool mIsWebSocket;
+    bool mIsUpgrade = false;
+    bool mIsWebSocket = false;
     bool mIsKeepAlive;
     bool mISCompleted;
 

include/brynet/net/http/HttpService.hpp

@@ -182,16 +182,22 @@ class HttpService
     {
         /*TODO::keep alive and timeout close */
         auto& session = httpSession->getSession();
+        auto httpParser = std::make_shared<HTTPParser>(HTTP_BOTH);
+
+        session->setDisConnectCallback([httpSession, httpParser](const TcpConnection::Ptr&) {
+            if (!httpParser->isCompleted())
+            {
+                // try pass EOF to http parser
+                HttpService::ProcessHttp(nullptr, 0, httpParser, httpSession);
+            }
 
-        session->setDisConnectCallback([httpSession](const TcpConnection::Ptr&) {
             const auto& tmp = httpSession->getCloseCallback();
             if (tmp != nullptr)
             {
                 tmp(httpSession);
             }
         });
 
-        auto httpParser = std::make_shared<HTTPParser>(HTTP_BOTH);
         session->setDataCallback([httpSession, httpParser](
                                          brynet::base::BasePacketReader& reader) {
             size_t retLen = 0;
@@ -203,12 +209,22 @@ class HttpService
                                                        httpParser,
                                                        httpSession);
             }
+            else if (httpParser->isUpgrade())
+            {
+                // TODO::not support other upgrade protocol
+            }
             else
             {
                 retLen = HttpService::ProcessHttp(reader.begin(),
                                                   reader.size(),
                                                   httpParser,
                                                   httpSession);
+                // if http_parser_execute not consume all data that indicate cause error in parser.
+                // so we need close connection.
+                if (retLen != reader.size())
+                {
+                    httpSession->postClose();
+                }
             }
 
             reader.addPos(retLen);