lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-08-09 03:22:45 +03:00
Code Activity

Resolve merge conflict

Browse Source
This commit is contained in:
xtne6f
2016-06-07 05:08:56 +09:00
committed by bel
parent 1afdde421f
commit e0175ea806
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/civetweb.c
View File

@@ -6909,23 +6909,12 @@ parse_http_headers(char **buf, struct mg_request_info *ri)
for (i = 0; i < (int)ARRAY_SIZE(ri->http_headers); i++) {
char *dp = *buf;
while ((*dp != ':') && (*dp != '\r') && (*dp != 0)) {
while ((*dp != ':') && (*dp >= 32) && (*dp <= 126)) {
dp++;
}
if (!*dp) {
/* neither : nor \r\n. This is not a valid field. */
if ((dp == *buf) || (*dp != ':')) {
/* This is not a valid field. */
break;
}
if (*dp == '\r') {
if (dp[1] == '\n') {
/* \r\n */
ri->http_headers[i].name = *buf;
ri->http_headers[i].value = "";
*buf = dp;
} else {
/* stray \r. This is not valid. */
break;
}
} else {
/* (*dp == ':') */
*dp = 0;
@@ -6935,7 +6924,10 @@ parse_http_headers(char **buf, struct mg_request_info *ri)
} while (*dp == ' ');
ri->http_headers[i].value = dp;
*buf = strstr(dp, "\r\n");
*buf = dp + strcspn(dp, "\r\n");
if (((*buf)[0] != '\r') || ((*buf)[1] != '\n')) {
*buf = NULL;
}
}
ri->num_headers = i + 1;
@@ -6948,7 +6940,7 @@ parse_http_headers(char **buf, struct mg_request_info *ri)
break;
}
if (*buf[0] == '\r') {
if ((*buf)[0] == '\r') {
/* This is the end of the header */
break;
}