Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix #81496: CLI server logs wrong request method

Author: krakjoe

NEWS

@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.1.0RC4
 
+- CLI:
+  . Fixed bug #81496 (Server logs incorrect request method). (lauri)
+
 - Core:
   . Fixed bug #75941 (Fix compile failure on Solaris with clang). (Jaromír
     Doleček)

sapi/cli/php_cli_server.c

@@ -1152,7 +1152,7 @@ static void php_cli_server_log_response(php_cli_server_client *client, int statu
 #endif
 
 	/* basic */
-	spprintf(&basic_buf, 0, "%s [%d]: %s %s", client->addr_str, status, SG(request_info).request_method, client->request.request_uri);
+	spprintf(&basic_buf, 0, "%s [%d]: %s %s", client->addr_str, status, php_http_method_str(client->request.request_method), client->request.request_uri);
 	if (!basic_buf) {
 		return;
 	}