archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.2' into PHP-7.3

Browse source 
* PHP-7.2:
  [ci skip] Update NEWS
  Fix #77794: Incorrect Date header format in built-in server
This commit is contained in:
Peter Kokot 2019-03-25 21:56:39 +01:00
commit 58e00df9fe
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sapi/cli/php_cli_server.c
View file

@ -347,17 +347,16 @@ static void append_essential_headers(smart_str* buffer, php_cli_server_client *c
struct timeval tv = {0};
if (NULL != (val = zend_hash_str_find_ptr(&client->request.headers, "host", sizeof("host")-1))) {
smart_str_appendl_ex(buffer, "Host", sizeof("Host") - 1, persistent);
smart_str_appendl_ex(buffer, ": ", sizeof(": ") - 1, persistent);
smart_str_appends_ex(buffer, "Host: ", persistent);
smart_str_appends_ex(buffer, val, persistent);
smart_str_appendl_ex(buffer, "\r\n", 2, persistent);
smart_str_appends_ex(buffer, "\r\n", persistent);
}
if (!gettimeofday(&tv, NULL)) {
zend_string *dt = php_format_date("r", 1, tv.tv_sec, 1);
smart_str_appendl_ex(buffer, "Date: ", 6, persistent);
zend_string *dt = php_format_date("D, d M Y H:i:s", sizeof("D, d M Y H:i:s") - 1, tv.tv_sec, 0);
smart_str_appends_ex(buffer, "Date: ", persistent);
smart_str_appends_ex(buffer, dt->val, persistent);
smart_str_appendl_ex(buffer, "\r\n", 2, persistent);
smart_str_appends_ex(buffer, " GMT\r\n", persistent);
zend_string_release_ex(dt, 0);
}