com php-src: Merge branch 'PHP-7.2' into PHP-7.3: sapi/cli/php _cli_server.c
| From: | Peter Kokot | Date: | Mon, 25 Mar 2019 20:56:39 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: sapi/cli/php _cli_server.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105340@lists.php.net to get a copy of this message | ||
Commit: 58e00df9fee69012a41140101880543be4f5ae9a
Author: Peter Kokot <peterkokot@gmail.com> Mon, 25 Mar 2019 21:56:39 +0100
Parents: e4d9d91462eb46249b7bed589603951a3a8cb6f9 72a2ab39ba977d542fdc33109dead3a87ea9f2ab
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=58e00df9fee69012a41140101880543be4f5ae9a
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
Fix #77794: Incorrect Date header format in built-in server
Bugs:
https://bugs.php.net/77794
Changed paths:
MM sapi/cli/php_cli_server.c
Diff:
diff --cc sapi/cli/php_cli_server.c
index b324958,cdcd93a..38cc094
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@@ -354,11 -355,11 +353,11 @@@ static void append_essential_headers(sm
}
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(dt);
+ zend_string_release_ex(dt, 0);
}
smart_str_appendl_ex(buffer, "Connection: close\r\n", sizeof("Connection:
close\r\n") - 1, persistent);