]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorPeter Kokot <peterkokot@gmail.com>
Mon, 25 Mar 2019 20:56:39 +0000 (21:56 +0100)
committerPeter Kokot <peterkokot@gmail.com>
Mon, 25 Mar 2019 20:56:39 +0000 (21:56 +0100)
* PHP-7.2:
  [ci skip] Update NEWS
  Fix #77794: Incorrect Date header format in built-in server

1  2 
sapi/cli/php_cli_server.c

index b324958052e7b12b8d9e790ef75f6609f427604d,cdcd93ac72c7e63e42b63f654fa593ef276b8248..38cc0949548298715a5e64558e43b5fd47599bbd
@@@ -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);