diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-24 14:42:52 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-24 14:43:02 +0200 |
| commit | 5435a4a9d4d93b0fb3dcc27e6c923a847aab0df9 (patch) | |
| tree | aec78715035c35ad89ab071a1285e6a6bbf740ce | |
| parent | 565baf05c07f3d1c2971a424fb03854c84b0eccc (diff) | |
| parent | 4a26628b292b7735d1d220509eab1155346ddc6e (diff) | |
| download | php-git-5435a4a9d4d93b0fb3dcc27e6c923a847aab0df9.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79030 Use usec from apache request time
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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 index 1cc5670eaa..b0d80c9149 100644 --- 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; |