diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-03-25 21:59:04 +0100 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-03-25 21:59:04 +0100 |
commit | 5e8116c579e393328dc475ac9c8327af39180457 (patch) | |
tree | 8f9b790152f3b1d85e466abc5ac5f3140146bb84 /sapi/cli | |
parent | 2fd930d839c65c570bd37e5a964332fd85024ac8 (diff) | |
parent | 0d2dadc0e267de36446bcd3b33600cf006c6ba0d (diff) | |
download | php-git-5e8116c579e393328dc475ac9c8327af39180457.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Update NEWS
[ci skip] Update NEWS
Fix #77794: Incorrect Date header format in built-in server
Diffstat (limited to 'sapi/cli')
-rw-r--r-- | sapi/cli/php_cli_server.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 544c1e14cc..deb61816a7 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -343,17 +343,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); } |