From 1f364c1ee12b2d09e5dd0a5f044476baadfe3a43 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Sat, 23 Oct 2004 13:48:05 +0000 Subject: - always convert apr_time_t to time_t using apr_time_sec() to be future-proof. - print apr_time_t values using APR_TIME_T and apr_snprintf. - remove redundant add_property_long calls. --- sapi/apache2filter/php_functions.c | 3 +-- sapi/apache2filter/sapi_apache2.c | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'sapi/apache2filter') diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c index b3ac9c2c09..8f0a293528 100644 --- a/sapi/apache2filter/php_functions.c +++ b/sapi/apache2filter/php_functions.c @@ -92,7 +92,7 @@ PHP_FUNCTION(virtual) #define ADD_LONG(name) \ add_property_long(return_value, #name, rr->name) #define ADD_TIME(name) \ - add_property_long(return_value, #name, rr->name / APR_USEC_PER_SEC); + add_property_long(return_value, #name, apr_time_sec(rr->name)); #define ADD_STRING(name) \ if (rr->name) add_property_string(return_value, #name, (char *) rr->name, 1) @@ -138,7 +138,6 @@ PHP_FUNCTION(apache_lookup_uri) ADD_LONG(allowed); ADD_LONG(sent_bodyct); ADD_LONG(bytes_sent); - ADD_LONG(request_time); ADD_LONG(mtime); ADD_TIME(request_time); diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index ffc8dfbd5b..2257b76c79 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -174,13 +174,13 @@ php_apache_sapi_get_stat(TSRMLS_D) ctx->finfo.st_dev = ctx->r->finfo.device; ctx->finfo.st_ino = ctx->r->finfo.inode; #ifdef NETWARE - ctx->finfo.st_atime.tv_sec = ctx->r->finfo.atime/1000000; - ctx->finfo.st_mtime.tv_sec = ctx->r->finfo.mtime/1000000; - ctx->finfo.st_ctime.tv_sec = ctx->r->finfo.ctime/1000000; + ctx->finfo.st_atime.tv_sec = apr_time_sec(ctx->r->finfo.atime); + ctx->finfo.st_mtime.tv_sec = apr_time_sec(ctx->r->finfo.mtime); + ctx->finfo.st_ctime.tv_sec = apr_time_sec(ctx->r->finfo.ctime); #else - ctx->finfo.st_atime = ctx->r->finfo.atime/1000000; - ctx->finfo.st_mtime = ctx->r->finfo.mtime/1000000; - ctx->finfo.st_ctime = ctx->r->finfo.ctime/1000000; + ctx->finfo.st_atime = apr_time_sec(ctx->r->finfo.atime); + ctx->finfo.st_mtime = apr_time_sec(ctx->r->finfo.mtime); + ctx->finfo.st_ctime = apr_time_sec(ctx->r->finfo.ctime); #endif ctx->finfo.st_size = ctx->r->finfo.size; -- cgit v1.2.1