summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorOleg Morozenkov <omorozenkov@gmail.com>2015-11-12 18:12:28 +0300
committerOleg Morozenkov <omorozenkov@gmail.com>2015-11-12 18:12:28 +0300
commit91574f7b7f28e5c7c03c2af5507d7dff4fa31fed (patch)
tree1e6062b822b03d18b47d3a400ec89e1a9dbb663d /src/net
parent7179cc9bd0d43bf0cf645bcb3247c1183dd8c818 (diff)
parent2f857ce94ae9fe80bb0d0bd96aa40e262a24f30a (diff)
Merge pull request #6 from flode/master
Fix several bugs
Diffstat (limited to 'src/net')
-rw-r--r--src/net/HttpParser.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/net/HttpParser.cpp b/src/net/HttpParser.cpp
index 7c4f9e2..4b57bc1 100644
--- a/src/net/HttpParser.cpp
+++ b/src/net/HttpParser.cpp
@@ -196,11 +196,15 @@ string HttpParser::parseHttp(bool isRequest, const string& data, map<string, str
string HttpParser::parseHttp(bool isRequest, const string& data) {
size_t headerEnd = data.find("\r\n\r\n");
- if (headerEnd == data.npos) {
+ if (headerEnd != data.npos) {
+ headerEnd += 4;
+ } else {
headerEnd = data.find("\n\n");
- }
- if (headerEnd == data.npos) {
- headerEnd = 0;
+ if (headerEnd != data.npos) {
+ headerEnd += 2;
+ } else {
+ headerEnd = 0;
+ }
}
return data.substr(headerEnd);
}