[PHP-CVS] cvs: php-src /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c

[Joe Orton]

jorton          Sat Oct 23 08:56:20 2004 EDT

  Modified files:              
    /php-src/sapi/apache2handler        sapi_apache2.c 
    /php-src/sapi/apache2filter sapi_apache2.c 
  Log:
  Fix the get_request_time implementation for the 2.0 SAPIs to return
  seconds not microseconds and to use TSRM stuff correctly.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.45&r2=1.46&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.45 
php-src/sapi/apache2handler/sapi_apache2.c:1.46
--- php-src/sapi/apache2handler/sapi_apache2.c:1.45     Wed Oct 20 05:28:47 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Sat Oct 23 08:56:19 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.45 2004/10/20 09:28:47 jorton Exp $ */
+/* $Id: sapi_apache2.c,v 1.46 2004/10/23 12:56:19 jorton Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -277,13 +277,9 @@
        }
 }
 
-static time_t php_apache_sapi_get_request_time(void) {
-       php_struct *ctx;
-       TSRMLS_FETCH();
-       
-       ctx = SG(server_context);
-
-       return ctx->r->request_time;
+static time_t php_apache_sapi_get_request_time(TSRMLS_D) {
+       php_struct *ctx = SG(server_context);
+       return apr_time_sec(ctx->r->request_time);
 }
 
 extern zend_module_entry php_apache_module;
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.129&r2=1.130&ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.129 
php-src/sapi/apache2filter/sapi_apache2.c:1.130
--- php-src/sapi/apache2filter/sapi_apache2.c:1.129     Fri Sep 24 11:44:57 2004
+++ php-src/sapi/apache2filter/sapi_apache2.c   Sat Oct 23 08:56:20 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.129 2004/09/24 15:44:57 hyanantha Exp $ */
+/* $Id: sapi_apache2.c,v 1.130 2004/10/23 12:56:20 jorton Exp $ */
 
 #include <fcntl.h>
 
@@ -299,13 +299,10 @@
        return OK;
 }
 
-static time_t
-php_apache_sapi_get_request_time(void)
+static time_t php_apache_sapi_get_request_time(TSRMLS_D)
 {
-       TSRMLS_FETCH();
        php_struct *ctx = SG(server_context);
-
-       return ctx->r->request_time;
+       return apr_time_sec(ctx->r->request_time);
 }
 
 extern zend_module_entry php_apache_module;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php