diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-24 14:43:13 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-24 14:43:13 +0200 |
| commit | 1af78bc8a4afdc43772a8634d235cb80772824b6 (patch) | |
| tree | 21cc95b51b847beb1c9814fbbbdaf3c5ac75fd0e /sapi/apache2handler | |
| parent | 18f58080dcb07295c09ae2f757691c96a5a312de (diff) | |
| parent | 5435a4a9d4d93b0fb3dcc27e6c923a847aab0df9 (diff) | |
| download | php-git-1af78bc8a4afdc43772a8634d235cb80772824b6.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79030 Use usec from apache request time
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 126d09b1c6..2266b46e58 100644 --- 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; |