Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #79030 Use usec from apache request time
This commit is contained in:
Nikita Popov 2020-06-24 14:42:52 +02:00
commit 5435a4a9d4
2 changed files with 5 additions and 1 deletions

View file

@ -362,7 +362,7 @@ static void php_apache_sapi_log_message_ex(char *msg, request_rec *r)
static double php_apache_sapi_get_request_time(void)
{
php_struct *ctx = SG(server_context);
return ((double) apr_time_as_msec(ctx->r->request_time)) / 1000.0;
return ((double) ctx->r->request_time) / 1000000.0;
}
extern zend_module_entry php_apache_module;