🩹 fix: fix issue #3

wifievent · Dec 16, 2021 · 5dd867c · 5dd867c
1 parent 05b2a6d
commit 5dd867c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/src/http.h b/src/http.h
@@ -11,3 +11,4 @@ typedef enum {HTTP1_0, HTTP1_1, HTTP_UNSUPPORTED} Protocol;
 
 #include <string>
 #include <vector>
+#include <glog/logging.h>
diff --git a/src/httprequest.cpp b/src/httprequest.cpp
@@ -193,6 +193,7 @@ int HTTPRequest::parseRequestPacket()
 int HTTPRequest::makeRequest()
 {
     string httpmethod, httpprotocol;
+    string tmppacket = "";
 
     switch(method_){
 		case GET:
@@ -221,13 +222,13 @@ int HTTPRequest::makeRequest()
 			break;
 	}
 
-    requestpacket_ += httpmethod + " " + url_ + " " + httpprotocol + CRLF;
+    tmppacket += httpmethod + " " + url_ + " " + httpprotocol + CRLF;
 	vector<pair<string, string>>::iterator iter;
     for(iter = headers_.begin(); iter != headers_.end(); iter++){
-        requestpacket_ += (*iter).first + ": " + (*iter).second + CRLF;
+        tmppacket += (*iter).first + ": " + (*iter).second + CRLF;
 	}
-    requestpacket_ += CRLF;
-    requestpacket_ += body_;
+    tmppacket += CRLF + body_;
+    requestpacket_ = tmppacket;
 	return 0;
 }
 
@@ -243,8 +244,13 @@ string* HTTPRequest::getRequestData()
 
 string HTTPRequest::updateCursor(size_t& cursorbegin, size_t& cursorend, string target, string obj, size_t next)
 {
-	string result;
+    string result = "";
+    size_t tmp = cursorend;
     cursorend = obj.find_first_of(target, cursorbegin);
+    if(cursorend == string::npos) {
+        cursorend = tmp;
+        return result;
+    }
     result = obj.substr(cursorbegin, cursorend - cursorbegin);
     cursorbegin = cursorend + next;
 	return result;

diff --git a/src/httpresponse.cpp b/src/httpresponse.cpp
@@ -134,7 +134,7 @@ string HTTPResponse::getResponseBody()
 int HTTPResponse::makeResponse()
 {
     string httpprotocol;
-    string tmppacket;
+    string tmppacket = "";
 
     switch(protocol_){
 		case HTTP1_0:
@@ -231,8 +231,13 @@ string* HTTPResponse::getResponseData()
 
 string HTTPResponse::updateCursor(size_t& cursorbegin, size_t& cursorend, string target, string obj, size_t next)
 {
-	string result;
+    string result = "";
+    size_t tmp = cursorend;
     cursorend = obj.find_first_of(target, cursorbegin);
+    if(cursorend == string::npos) {
+        cursorend = tmp;
+        return result;
+    }
     result = obj.substr(cursorbegin, cursorend - cursorbegin);
     cursorbegin = cursorend + next;
 	return result;
@@ -241,5 +246,6 @@ string HTTPResponse::updateCursor(size_t& cursorbegin, size_t& cursorend, string
 void HTTPResponse::resetData()
 {
     responsepacket_ = "";
+    DLOG(INFO) << "response header size:" << headers_.size();
     headers_.clear();
-}
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,4 @@ typedef enum {HTTP1_0, HTTP1_1, HTTP_UNSUPPORTED} Protocol;

		#include <string>
		#include <vector>
		#include <glog/logging.h>