Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Sort the NEWS file alphabetically.
  Request non-keep-alive connections by default in HTTP 1.1 requests.

Author: cjbj

NEWS

@@ -14,14 +14,10 @@ PHP                                                                        NEWS
   . Implemented FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir
     or safe_mode). (Adam)
 
-- Session:
-  . Fixed Bug #65315 (session.hash_function silently fallback to default md5)
-    (Yasuo)
-  . Implemented Request #54649 (Create session_serializer_name()). (Yasuo)
-  . Implemented Request #17860 (Session write short circuit). (Yasuo)
-  . Implemented Request #20421 (session_abort() and session_reset() function).
-    (Yasuo)
-  . Implemented Request #11100 (session_gc() function). (Yasuo)
+- GMP:
+  . Moved GMP to use object as the underlying structure and implemented various
+    improvements based on this.
+    (RFC: https://wiki.php.net/rfc/operator_overloading_gmp). (Nikita)
 
 - mysqlnd:
   . Disabled flag for SP OUT variables for 5.5+ servers as they are not natively
@@ -39,9 +35,17 @@ PHP                                                                        NEWS
   . Fixed Bug #63657 (pgsqlCopyFromFile, pgsqlCopyToArray use Postgres < 7.3
     syntax). (Matteo)
 
-- GMP:
-  . Moved GMP to use object as the underlying structure and implemented various
-    improvements based on this.
-    (RFC: https://wiki.php.net/rfc/operator_overloading_gmp). (Nikita)
+- Session:
+  . Fixed Bug #65315 (session.hash_function silently fallback to default md5)
+    (Yasuo)
+  . Implemented Request #54649 (Create session_serializer_name()). (Yasuo)
+  . Implemented Request #17860 (Session write short circuit). (Yasuo)
+  . Implemented Request #20421 (session_abort() and session_reset() function).
+    (Yasuo)
+  . Implemented Request #11100 (session_gc() function). (Yasuo)
+
+- Standard:
+  . Implemented FR #65634 (HTTP wrapper is very slow with protocol_version
+    1.1). (Adam)
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

UPGRADING

@@ -98,3 +98,7 @@ PHP X.Y UPGRADE NOTES
 
 - File upload:
   Uploads equal or greater than 2GB in size are now accepted.
+
+- HTTP stream wrapper:
+  HTTP 1.1 requests now include a Connection: close header unless explicitly
+  overridden by setting a Connection header via the header context option.

ext/standard/http_fopen_wrapper.c

@@ -80,6 +80,7 @@
 #define HTTP_HEADER_FROM			8
 #define HTTP_HEADER_CONTENT_LENGTH	16
 #define HTTP_HEADER_TYPE			32
+#define HTTP_HEADER_CONNECTION		64
 
 #define HTTP_WRAPPER_HEADER_INIT    1
 #define HTTP_WRAPPER_REDIRECTED     2
@@ -386,8 +387,6 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, const char
 		strlcat(scratch, " HTTP/", scratch_len);
 		strlcat(scratch, protocol_version, scratch_len);
 		strlcat(scratch, "\r\n", scratch_len);
-		efree(protocol_version);
-		protocol_version = NULL;
 	} else {
 		strlcat(scratch, " HTTP/1.0\r\n", scratch_len);
 	}
@@ -490,6 +489,11 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, const char
 			                 *(s-1) == '\t' || *(s-1) == ' ')) {
 				 have_header |= HTTP_HEADER_TYPE;
 			}
+			if ((s = strstr(tmp, "connection:")) &&
+			    (s == tmp || *(s-1) == '\r' || *(s-1) == '\n' || 
+			                 *(s-1) == '\t' || *(s-1) == ' ')) {
+				 have_header |= HTTP_HEADER_CONNECTION;
+			}
 			/* remove Proxy-Authorization header */
 			if (use_proxy && use_ssl && (s = strstr(tmp, "proxy-authorization:")) &&
 			    (s == tmp || *(s-1) == '\r' || *(s-1) == '\n' || 
@@ -563,6 +567,16 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, const char
 		}
 	}
 
+	/* Send a Connection: close header when using HTTP 1.1 or later to avoid
+	 * hanging when the server interprets the RFC literally and establishes a
+	 * keep-alive connection, unless the user specifically requests something
+	 * else by specifying a Connection header in the context options. */
+	if (protocol_version &&
+	    ((have_header & HTTP_HEADER_CONNECTION) == 0) &&
+	    (strncmp(protocol_version, "1.0", MIN(protocol_version_len, 3)) > 0)) {
+		php_stream_write_string(stream, "Connection: close\r\n");
+	}
+
 	if (context && 
 	    php_stream_context_get_option(context, "http", "user_agent", &ua_zval) == SUCCESS &&
 		Z_TYPE_PP(ua_zval) == IS_STRING) {

ext/standard/tests/http/bug65634.phpt

@@ -0,0 +1,81 @@
+--TEST--
+Bug #65634 (HTTP wrapper is very slow with protocol_version 1.1)
+--INI--
+allow_url_fopen=1
+--SKIPIF--
+<?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>
+--FILE--
+<?php
+require 'server.inc';
+
+function do_test($version, $connection) {
+    $options = [
+        'http' => [
+            'protocol_version' => $version,
+        ],
+    ];
+
+    if ($connection) {
+        $options['http']['header'] = "Connection: $connection";
+    }
+
+    $ctx = stream_context_create($options);
+
+    $responses = ["data://text/plain,HTTP/$version 204 No Content\r\n\r\n"];
+    $pid = http_server('tcp://127.0.0.1:12342', $responses, $output);
+
+    $fd = fopen('http://127.0.0.1:12342/', 'rb', false, $ctx);
+    fseek($output, 0, SEEK_SET);
+    echo stream_get_contents($output);
+
+    http_server_kill($pid);
+}
+
+echo "HTTP/1.0, default behaviour:\n";
+do_test('1.0', null);
+
+echo "HTTP/1.0, connection: close:\n";
+do_test('1.0', 'close');
+
+echo "HTTP/1.0, connection: keep-alive:\n";
+do_test('1.0', 'keep-alive');
+
+echo "HTTP/1.1, default behaviour:\n";
+do_test('1.1', null);
+
+echo "HTTP/1.1, connection: close:\n";
+do_test('1.1', 'close');
+
+echo "HTTP/1.1, connection: keep-alive:\n";
+do_test('1.1', 'keep-alive');
+?>
+--EXPECT--
+HTTP/1.0, default behaviour:
+GET / HTTP/1.0
+Host: 127.0.0.1:12342
+
+HTTP/1.0, connection: close:
+GET / HTTP/1.0
+Host: 127.0.0.1:12342
+Connection: close
+
+HTTP/1.0, connection: keep-alive:
+GET / HTTP/1.0
+Host: 127.0.0.1:12342
+Connection: keep-alive
+
+HTTP/1.1, default behaviour:
+GET / HTTP/1.1
+Host: 127.0.0.1:12342
+Connection: close
+
+HTTP/1.1, connection: close:
+GET / HTTP/1.1
+Host: 127.0.0.1:12342
+Connection: close
+
+HTTP/1.1, connection: keep-alive:
+GET / HTTP/1.1
+Host: 127.0.0.1:12342
+Connection: keep-alive
+