Merge branch 'PHP-7.4'

nikic · nikic · commit 1af78bc8a4af · 2020-06-24T14:43:13.000+02:00
* PHP-7.4:
  Fixed bug #79030 Use usec from apache request time
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
@@ -366,7 +366,7 @@ static void php_apache_sapi_log_message_ex(const 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;

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ static void php_apache_sapi_log_message_ex(const char msg, request_rec r)`
`366`	`366`	`static double php_apache_sapi_get_request_time(void)`
`367`	`367`	`{`
`368`	`368`	`php_struct *ctx = SG(server_context);`
`369`		`- return ((double) apr_time_as_msec(ctx->r->request_time)) / 1000.0;`
	`369`	`+ return ((double) ctx->r->request_time) / 1000000.0;`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`extern zend_module_entry php_apache_module;`