changes fro feedback

Author: devnexen

sapi/cli/php_cli_server.c

@@ -1685,25 +1685,25 @@ static void php_cli_server_client_save_header(php_cli_server_client *client)
 	GC_MAKE_PERSISTENT_LOCAL(lc_header_name);
 
 	zval *entry = zend_hash_find(&client->request.headers, lc_header_name);
-	bool is_forwarded_header = strstr(ZSTR_VAL(lc_header_name), "forwarded");
+	bool with_comma = !zend_string_equals_literal(lc_header_name, "set-cookie");
 
 	/**
-	 * **Forwarded** HTTP family headers can have 1 or more values separated by a comma while still
-	 * possibly be set separately by the client.
+	 * `Set-Cookie` HTTP header being the exception, they can have 1 or more values separated
+	 * by a comma while still possibly be set separately by the client.
 	 **/
-	if ((entry == NULL && is_forwarded_header) || !is_forwarded_header) {
+	if ((entry == NULL && with_comma) || !with_comma) {
 		ZVAL_STR(&tmp, client->current_header_value);
 
 		/* Add the wrapped zend_string to the HashTable */
 		zend_hash_add(&client->request.headers, lc_header_name, &tmp);
 		zend_hash_add(&client->request.headers_original_case, client->current_header_name, &tmp);
 	} else {
 		zend_string *curval = Z_STR_P(entry);
-		zend_string *newval = zend_string_alloc(ZSTR_LEN(curval) + ZSTR_LEN(client->current_header_value) + 2, /* persistent */true);
+		zend_string *newval = zend_string_alloc(ZSTR_LEN(curval) + ZSTR_LEN(client->current_header_value) + 3, /* persistent */true);
 
 		memcpy(ZSTR_VAL(newval), ZSTR_VAL(curval), ZSTR_LEN(curval));
-		memcpy(ZSTR_VAL(newval) + ZSTR_LEN(curval), ",", 1);
-		memcpy(ZSTR_VAL(newval) + ZSTR_LEN(curval) + 1, ZSTR_VAL(client->current_header_value), ZSTR_LEN(client->current_header_value) + 1);
+		memcpy(ZSTR_VAL(newval) + ZSTR_LEN(curval), ", ", 2);
+		memcpy(ZSTR_VAL(newval) + ZSTR_LEN(curval) + 2, ZSTR_VAL(client->current_header_value), ZSTR_LEN(client->current_header_value) + 1);
 
 		ZVAL_STR(&tmp, newval);
 

sapi/cli/tests/gh16137.phpt

@@ -17,4 +17,4 @@ $ctx = stream_context_create(array('http' => array (
 var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS, true, $ctx));
 ?>
 --EXPECT--
-string(23) "127.0.0.1,192.168.1.254"
+string(24) "127.0.0.1, 192.168.1.254"