Make SERVER_SOFTWARE compliant with RFC3875 (#11093)

cedric-anne · web-flow · commit c02348cf9dea · 2023-05-05T12:43:34.000+01:00
diff --git a/UPGRADING b/UPGRADING
@@ -68,6 +68,9 @@ PHP 8.3 UPGRADE NOTES
 3. Changes in SAPI modules
 ========================================
 
+- $_SERVER['SERVER_SOFTWARE'] value from the built-in CLI server changed
+  to make it compliant with RFC3875.
+
 ========================================
 4. Deprecated Functionality
 ========================================
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
@@ -696,7 +696,7 @@ static void sapi_cli_server_register_variables(zval *track_vars_array) /* {{{ */
 		}
 	}
 	{
-		zend_string *tmp = strpprintf(0, "PHP %s Development Server", PHP_VERSION);
+		zend_string *tmp = strpprintf(0, "PHP/%s (Development Server)", PHP_VERSION);
 		sapi_cli_server_register_known_var_str(track_vars_array, "SERVER_SOFTWARE", strlen("SERVER_SOFTWARE"), tmp);
 		zend_string_release_ex(tmp, /* persistent */ false);
 	}
diff --git a/sapi/cli/tests/php_cli_server_002.phpt b/sapi/cli/tests/php_cli_server_002.phpt
@@ -14,7 +14,7 @@ var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS));
 ?>
 --EXPECTF--
 string(%d) "string(%d) "%sphp_cli_server_002"
-string(%d) "PHP %s Development Server"
+string(%d) "PHP/%s (Development Server)"
 string(%d) "localhost"
 string(%d) "%s"
 "

Original file line number	Diff line number	Diff line change
`@@ -696,7 +696,7 @@ static void sapi_cli_server_register_variables(zval track_vars_array) / {{{ */`
`696`	`696`	`}`
`697`	`697`	`}`
`698`	`698`	`{`
`699`		`- zend_string *tmp = strpprintf(0, "PHP %s Development Server", PHP_VERSION);`
	`699`	`+ zend_string *tmp = strpprintf(0, "PHP/%s (Development Server)", PHP_VERSION);`
`700`	`700`	`sapi_cli_server_register_known_var_str(track_vars_array, "SERVER_SOFTWARE", strlen("SERVER_SOFTWARE"), tmp);`
`701`	`701`	`zend_string_release_ex(tmp, /* persistent */ false);`
`702`	`702`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS));`
`14`	`14`	`?>`
`15`	`15`	`--EXPECTF--`
`16`	`16`	`string(%d) "string(%d) "%sphp_cli_server_002"`
`17`		`-string(%d) "PHP %s Development Server"`
	`17`	`+string(%d) "PHP/%s (Development Server)"`
`18`	`18`	`string(%d) "localhost"`
`19`	`19`	`string(%d) "%s"`
`20`	`20`	`"`