Index: SAPI.c
===================================================================
RCS file: /repository/php-src/main/SAPI.c,v
retrieving revision 1.202.2.7.2.13
diff -u -r1.202.2.7.2.13 SAPI.c
--- SAPI.c	25 Apr 2007 14:18:01 -0000	1.202.2.7.2.13
+++ SAPI.c	25 May 2007 08:30:27 -0000
@@ -986,12 +986,14 @@
 
 SAPI_API time_t sapi_get_request_time(TSRMLS_D)
 {
+	if(SG(global_request_time)) return SG(global_request_time);
+
 	if (sapi_module.get_request_time) {
-		return sapi_module.get_request_time(TSRMLS_C);
+		SG(global_request_time) = (SG(server_context))?sapi_module.get_request_time(TSRMLS_C):time(0);
 	} else {
-		if(!SG(global_request_time)) SG(global_request_time) = time(0);
-		return SG(global_request_time);
+		SG(global_request_time) = time(0);
 	}
+	return SG(global_request_time);
 }
 
 /*