nodejs/http-parser
1
0
Fork 0
mirror of https://github.com/nodejs/http-parser.git synced 2025-10-22 08:22:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tolerate non-compliant status line responses

Browse Source 
- original fix is from daeon: https://github.com/daeon/http-parser/

  "Tolerate web servers which do not return a status message in the
   return response.

   I have noticed this usse on several websites such downloads from
   mediafire.com"

- original pull request: https://github.com/nodejs/http-parser/pull/254
- i merely added the status_cb_called unit test check, there already
  is a test that triggers this without the patch (a 301 without a
  reason phrase).

PR-URL: https://github.com/nodejs/http-parser/pull/367
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
This commit is contained in:
Thomas 'fake' Jakobi
2017-05-20 14:10:51 +02:00
committed by Fedor Indutny
parent 9f489a474d
commit 3b0da34d83
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
http_parser.c
View File

@@ -863,10 +863,9 @@ reexecute:
UPDATE_STATE(s_res_status_start); UPDATE_STATE(s_res_status_start);
break; break;
case CR: case CR:
UPDATE_STATE(s_res_line_almost_done);
break;
case LF: case LF:
UPDATE_STATE(s_header_field_start); UPDATE_STATE(s_res_status_start);
REEXECUTE();
break; break;
default: default:
SET_ERRNO(HPE_INVALID_STATUS); SET_ERRNO(HPE_INVALID_STATUS);
@@ -888,19 +887,13 @@ reexecute:
case s_res_status_start: case s_res_status_start:
{ {
if (ch == CR) {
UPDATE_STATE(s_res_line_almost_done);
break;
}
if (ch == LF) {
UPDATE_STATE(s_header_field_start);
break;
}
MARK(status); MARK(status);
UPDATE_STATE(s_res_status); UPDATE_STATE(s_res_status);
parser->index = 0; parser->index = 0;
if (ch == CR || ch == LF)
REEXECUTE();
break; break;
} }

5
test.c
View File

@@ -78,6 +78,7 @@ struct message {
int message_begin_cb_called; int message_begin_cb_called;
int headers_complete_cb_called; int headers_complete_cb_called;
int message_complete_cb_called; int message_complete_cb_called;
int status_cb_called;
int message_complete_on_eof; int message_complete_on_eof;
int body_is_final; int body_is_final;
}; };
@@ -1981,6 +1982,9 @@ int
response_status_cb (http_parser *p, const char *buf, size_t len) response_status_cb (http_parser *p, const char *buf, size_t len)
{ {
assert(p == parser); assert(p == parser);
messages[num_messages].status_cb_called = TRUE;
strlncat(messages[num_messages].response_status, strlncat(messages[num_messages].response_status,
sizeof(messages[num_messages].response_status), sizeof(messages[num_messages].response_status),
buf, buf,
@@ -2405,6 +2409,7 @@ message_eq (int index, int connect, const struct message *expected)
} else { } else {
MESSAGE_CHECK_NUM_EQ(expected, m, status_code); MESSAGE_CHECK_NUM_EQ(expected, m, status_code);
MESSAGE_CHECK_STR_EQ(expected, m, response_status); MESSAGE_CHECK_STR_EQ(expected, m, response_status);
assert(m->status_cb_called);
} }
if (!connect) { if (!connect) {