diff options
| author | Rowan Collins <rowan.collins@gmail.com> | 2016-10-23 18:24:58 +0000 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2016-11-17 11:04:56 +0100 |
| commit | aec1a5ecccd07984d459b82ba8771962bbeb6566 (patch) | |
| tree | 317abf83de1359c6f96ba588a66ba35d712ef00d /ext/standard/http_fopen_wrapper.c | |
| parent | 6122526cea24e4027a2f1fccc198219c543b53a2 (diff) | |
| download | php-git-aec1a5ecccd07984d459b82ba8771962bbeb6566.tar.gz | |
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Diffstat (limited to 'ext/standard/http_fopen_wrapper.c')
| -rw-r--r-- | ext/standard/http_fopen_wrapper.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index cf29975fa2..88a1091e38 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -699,6 +699,24 @@ finish: if ((options & STREAM_ONLY_GET_HEADERS) || ignore_errors) { reqok = 1; } + + /* status codes of 1xx are "informational", and will be followed by a real response + * e.g "100 Continue". RFC 7231 states that unexpected 1xx status MUST be parsed, + * and MAY be ignored. As such, we need to skip ahead to the "real" status*/ + if (response_code >= 100 && response_code < 200) { + /* consume lines until we find a line starting 'HTTP/1' */ + while ( + !php_stream_eof(stream) + && php_stream_get_line(stream, tmp_line, sizeof(tmp_line) - 1, &tmp_line_len) != NULL + && ( tmp_line_len < 6 || strncasecmp(tmp_line, "HTTP/1", 6) ) + ); + + if (tmp_line_len > 9) { + response_code = atoi(tmp_line + 9); + } else { + response_code = 0; + } + } /* all status codes in the 2xx range are defined by the specification as successful; * all status codes in the 3xx range are for redirection, and so also should never * fail */ |