Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit 5435a4a9d4d9 · 2020-06-24T14:43:02.000+02:00
* PHP-7.3:
  Fixed bug #79030 Use usec from apache request time
diff --git a/NEWS b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2020, PHP 7.4.9
 
+- Apache:
+  . Fixed bug #79030 (Upgrade apache2handler's php_apache_sapi_get_request_time
+    to return usec). (Herbert256)
+
 - FTP:
   . Fixed bug #55857 (ftp_size on large files). (cmb)
 
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
@@ -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;

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