From a71db536614534ea96cac9fd11076183e4d254fd Mon Sep 17 00:00:00 2001 From: J Date: Sat, 18 Apr 2015 14:33:57 +0800 Subject: [PATCH 1/3] for #384,refine code for empty body request. --- trunk/src/app/srs_app_http.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/trunk/src/app/srs_app_http.cpp b/trunk/src/app/srs_app_http.cpp index ed6a2cb4e..a5831086b 100644 --- a/trunk/src/app/srs_app_http.cpp +++ b/trunk/src/app/srs_app_http.cpp @@ -1441,8 +1441,9 @@ int SrsHttpParser::parse_message_imp(SrsStSocket* skt) } // consume the parsed bytes. - if (nparsed && nparsed - header_parsed > 0) { + if (nparsed && header_parsed && nparsed - header_parsed >= 0) { buffer->read_slice(header_parsed); + header_parsed = 0; } // ok atleast header completed, From 8adbdc39e35cd4772a3961299eb7fc77068c048a Mon Sep 17 00:00:00 2001 From: J Date: Sat, 18 Apr 2015 14:42:16 +0800 Subject: [PATCH 2/3] for #384,refine code for empty body request. --- trunk/src/app/srs_app_http.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/src/app/srs_app_http.cpp b/trunk/src/app/srs_app_http.cpp index a5831086b..56ecd1aea 100644 --- a/trunk/src/app/srs_app_http.cpp +++ b/trunk/src/app/srs_app_http.cpp @@ -1441,7 +1441,7 @@ int SrsHttpParser::parse_message_imp(SrsStSocket* skt) } // consume the parsed bytes. - if (nparsed && header_parsed && nparsed - header_parsed >= 0) { + if (nparsed && header_parsed && (nparsed - header_parsed >= 0)) { buffer->read_slice(header_parsed); header_parsed = 0; } From aca02b6d6bd334281b19c95300d5248a336a7c7b Mon Sep 17 00:00:00 2001 From: J Date: Sat, 18 Apr 2015 14:51:33 +0800 Subject: [PATCH 3/3] for #384,refine code for empty body request. --- trunk/src/app/srs_app_http.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/trunk/src/app/srs_app_http.cpp b/trunk/src/app/srs_app_http.cpp index 56ecd1aea..3c0567cd1 100644 --- a/trunk/src/app/srs_app_http.cpp +++ b/trunk/src/app/srs_app_http.cpp @@ -1441,9 +1441,8 @@ int SrsHttpParser::parse_message_imp(SrsStSocket* skt) } // consume the parsed bytes. - if (nparsed && header_parsed && (nparsed - header_parsed >= 0)) { + if (nparsed && header_parsed) { buffer->read_slice(header_parsed); - header_parsed = 0; } // ok atleast header completed,