Fix #80931: HTTP stream hangs if server doesn't close connection

ext/standard/filters.c

@@ -1760,6 +1760,7 @@ typedef struct _php_consumed_filter_data {
 	size_t consumed;
 	zend_off_t offset;
 	uint8_t persistent;
+	size_t length;
 } php_consumed_filter_data;
 
 static php_stream_filter_status_t consumed_filter_filter(
@@ -1790,6 +1791,9 @@ static php_stream_filter_status_t consumed_filter_filter(
 		php_stream_seek(stream, data->offset + data->consumed, SEEK_SET);
 	}
 	data->consumed += consumed;
+	if (data->consumed >= data->length) {
+		stream->eof = 1;
+	}
 
 	return PSFS_PASS_ON;
 }
@@ -1822,6 +1826,7 @@ static php_stream_filter *consumed_filter_create(const char *filtername, zval *f
 	data->persistent = persistent;
 	data->consumed = 0;
 	data->offset = ~0;
+	data->length = filterparams == NULL ? (size_t) -1 : Z_LVAL_P(filterparams);
 	fops = &consumed_filter_ops;
 
 	return php_stream_filter_alloc(fops, data, persistent);
@@ -1851,9 +1856,10 @@ typedef struct _php_chunked_filter_data {
 	size_t chunk_size;
 	php_chunked_filter_state state;
 	int persistent;
+	zend_bool dechunk;
 } php_chunked_filter_data;
 
-static size_t php_dechunk(char *buf, size_t len, php_chunked_filter_data *data)
+static size_t php_dechunk_ex(char *buf, size_t len, php_chunked_filter_data *data, zend_bool dechunk)
 {
 	char *p = buf;
 	char *end = p + len;
@@ -1920,7 +1926,7 @@ static size_t php_dechunk(char *buf, size_t len, php_chunked_filter_data *data)
 				}
 			case CHUNK_BODY:
 				if ((size_t) (end - p) >= data->chunk_size) {
-					if (p != out) {
+					if (dechunk && p != out) {
 						memmove(out, p, data->chunk_size);
 					}
 					out += data->chunk_size;
@@ -1931,7 +1937,7 @@ static size_t php_dechunk(char *buf, size_t len, php_chunked_filter_data *data)
 						return out_len;
 					}
 				} else {
-					if (p != out) {
+					if (dechunk && p != out) {
 						memmove(out, p, end - p);
 					}
 					data->chunk_size -= end - p;
@@ -1961,7 +1967,7 @@ static size_t php_dechunk(char *buf, size_t len, php_chunked_filter_data *data)
 				p = end;
 				continue;
 			case CHUNK_ERROR:
-				if (p != out) {
+				if (dechunk && p != out) {
 					memmove(out, p, end - p);
 				}
 				out_len += end - p;
@@ -1971,6 +1977,11 @@ static size_t php_dechunk(char *buf, size_t len, php_chunked_filter_data *data)
 	return out_len;
 }
 
+static size_t php_dechunk(char *buf, size_t len, php_chunked_filter_data *data)
+{
+	return php_dechunk_ex(buf, len, data, 1);
+}
+
 static php_stream_filter_status_t php_chunked_filter(
 	php_stream *stream,
 	php_stream_filter *thisfilter,
@@ -1987,14 +1998,22 @@ static php_stream_filter_status_t php_chunked_filter(
 	while (buckets_in->head) {
 		bucket = php_stream_bucket_make_writeable(buckets_in->head);
 		consumed += bucket->buflen;
-		bucket->buflen = php_dechunk(bucket->buf, bucket->buflen, data);
+		if (data->dechunk) {
+			bucket->buflen = php_dechunk(bucket->buf, bucket->buflen, data);
+		} else {
+			(void) php_dechunk_ex(bucket->buf, bucket->buflen, data, 0);
+		}
 		php_stream_bucket_append(buckets_out, bucket);
 	}
 
 	if (bytes_consumed) {
 		*bytes_consumed = consumed;
 	}
 
+	if (data->state == CHUNK_TRAILER) {
+		stream->eof = 1;
+	}
+
 	return PSFS_PASS_ON;
 }
 
@@ -2026,6 +2045,7 @@ static php_stream_filter *chunked_filter_create(const char *filtername, zval *fi
 	data->state = CHUNK_SIZE_START;
 	data->chunk_size = 0;
 	data->persistent = persistent;
+	data->dechunk = filterparams == NULL || zend_is_true(filterparams);
 	fops = &chunked_filter_ops;
 
 	return php_stream_filter_alloc(fops, data, persistent);

ext/standard/http_fopen_wrapper.c

@@ -144,10 +144,12 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
 	int header_init = ((flags & HTTP_WRAPPER_HEADER_INIT) != 0);
 	int redirected = ((flags & HTTP_WRAPPER_REDIRECTED) != 0);
 	zend_bool follow_location = 1;
-	php_stream_filter *transfer_encoding = NULL;
+	php_stream_filter *body_filter = NULL;
 	int response_code;
 	smart_str req_buf = {0};
 	zend_bool custom_request_method;
+	zend_bool server_closes_connection = 0;
+	zend_bool chunked_encoding = 0;
 
 	tmp_line[0] = '\0';
 
@@ -664,6 +666,9 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
 			php_stream_get_line(stream, tmp_line, sizeof(tmp_line) - 1, &tmp_line_len) != NULL) {
 			zval http_response;
 
+			if (strncasecmp(tmp_line, "HTTP/1.1", sizeof("HTTP/1.1")-1) < 0) {
+				server_closes_connection = 1;
+			}
 			if (tmp_line_len > 9) {
 				response_code = atoi(tmp_line + 9);
 			} else {
@@ -793,6 +798,10 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
 			} else if (!strncasecmp(http_header_line, "Content-Length:", sizeof("Content-Length:")-1)) {
 				file_size = atoi(http_header_value);
 				php_stream_notify_file_size(context, file_size, http_header_line, 0);
+			} else if (!strncasecmp(http_header_line, "Connection:", sizeof("Connection:")-1)
+				&& !strncasecmp(http_header_value, "Close", sizeof("Close")-1)
+			) {
+				server_closes_connection = 1;
 			} else if (
 				!strncasecmp(http_header_line, "Transfer-Encoding:", sizeof("Transfer-Encoding:")-1)
 				&& !strncasecmp(http_header_value, "Chunked", sizeof("Chunked")-1)
@@ -806,11 +815,13 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
 						decode = zend_is_true(tmpzval);
 					}
 					if (decode) {
-						transfer_encoding = php_stream_filter_create("dechunk", NULL, php_stream_is_persistent(stream));
-						if (transfer_encoding) {
+						body_filter = php_stream_filter_create("dechunk", NULL, php_stream_is_persistent(stream));
+						if (body_filter) {
 							/* don't store transfer-encodeing header */
 							continue;
 						}
+					} else {
+						chunked_encoding = 1;
 					}
 				}
 			}
@@ -949,12 +960,22 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
 		/* restore mode */
 		strlcpy(stream->mode, mode, sizeof(stream->mode));
 
-		if (transfer_encoding) {
-			php_stream_filter_append(&stream->readfilters, transfer_encoding);
+		if (body_filter == NULL && !server_closes_connection) {
+			zval param;
+			if (chunked_encoding) {
+				ZVAL_FALSE(&param);
+				body_filter = php_stream_filter_create("dechunk", &param, php_stream_is_persistent(stream));
+			} else if (file_size > 0) {
+				ZVAL_LONG(&param, file_size);
+				body_filter = php_stream_filter_create("consumed", &param, php_stream_is_persistent(stream));
+			}
+		}
+		if (body_filter) {
+			php_stream_filter_append(&stream->readfilters, body_filter);
 		}
 	} else {
-		if (transfer_encoding) {
-			php_stream_filter_free(transfer_encoding);
+		if (body_filter) {
+			php_stream_filter_free(body_filter);
 		}
 	}
 

ext/standard/tests/http/bug80931.phpt

@@ -0,0 +1,56 @@
+--TEST--
+Bug #80931 (HTTP stream hangs if server doesn't close connection)
+--INI--
+allow_url_fopen=1
+--SKIPIF--
+<?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>
+--FILE--
+<?php
+require_once 'server.inc';
+
+$responses = array(
+    "data://text/plain,HTTP/1.1 200\r\nContent-Length: 10\r\n\r\n0123456789",
+    "data://text/plain,HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n4\r\n****\r\n0\r\n\r\n",
+    "data://text/plain,HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n4\r\n****\r\n0\r\n\r\n",
+);
+$pid = http_server("tcp://127.0.0.1:12342", $responses, $output);
+
+$options = [
+    'http'=> [
+        'protocol_version' => "1.1",
+        'header' => "Connection: keep-alive",
+    ]
+];
+
+$stream = fopen("http://127.0.0.1:12342/", "r", false, stream_context_create($options));
+$t0 = microtime(true);
+var_dump(stream_get_contents($stream));
+$t1 = microtime(true);
+var_dump($t1 - $t0 < 2);
+
+$stream = fopen("http://127.0.0.1:12342/", "r", false, stream_context_create($options));
+$t0 = microtime(true);
+var_dump(stream_get_contents($stream));
+$t1 = microtime(true);
+var_dump($t1 - $t0 < 2);
+
+$options['http']['auto_decode'] = false;
+$stream = fopen("http://127.0.0.1:12342/", "r", false, stream_context_create($options));
+$t0 = microtime(true);
+var_dump(stream_get_contents($stream));
+$t1 = microtime(true);
+var_dump($t1 - $t0 < 2);
+
+http_server_kill($pid);
+?>
+--EXPECT--
+string(10) "0123456789"
+bool(true)
+string(4) "****"
+bool(true)
+string(14) "4
+****
+0
+
+"
+bool(true)

ext/standard/tests/http/server.inc

@@ -54,6 +54,7 @@ function http_server($socket_string, array $files, &$output = null) {
 		// read headers
 
 		$content_length = 0;
+		$keep_alive = false;
 
 		stream_set_blocking($sock, 0);
 		while (!feof($sock)) {
@@ -70,6 +71,8 @@ function http_server($socket_string, array $files, &$output = null) {
 
 				if (preg_match('#^Content-Length\s*:\s*([[:digit:]]+)\s*$#i', $line, $matches)) {
 					$content_length = (int) $matches[1];
+				} elseif (preg_match('#^Connection\s*:\s*keep-alive\s*$#i', $line, $matches)) {
+					$keep_alive = true;
 				}
 			}
 		}
@@ -86,6 +89,10 @@ function http_server($socket_string, array $files, &$output = null) {
 		$fd = fopen($file, 'rb');
 		stream_copy_to_stream($fd, $sock);
 
+		if ($keep_alive) {
+			sleep(2);
+		}
+
 		fclose($sock);
 	}