X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_cache_api.c;h=a03a9616f1dba581c81b7b706681dc268a57c1c1;hb=e78857a010ae86f5dddb593cbe96d67e5bd6f13d;hp=f8d1bf029fc396e22648b24c7ce3a75720848b67;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb;p=m6w6%2Fext-http

diff --git a/http_cache_api.c b/http_cache_api.c
index f8d1bf0..a03a961 100644
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -6,19 +6,15 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
 #include "php_http.h"
 
-#include "SAPI.h"
 #include "php_output.h"
 #include "php_streams.h"
 
@@ -27,8 +23,6 @@
 #include "php_http_date_api.h"
 #include "php_http_send_api.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 /* {{{ char *http_etag(void *, size_t, http_send_mode) */
 PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC)
 {
@@ -71,7 +65,7 @@ PHP_HTTP_API time_t _http_last_modified(const void *data_ptr, http_send_mode dat
 
 	switch (data_mode)
 	{
-		case SEND_DATA:	return time(NULL);
+		case SEND_DATA:	return HTTP_GET_REQUEST_TIME();
 		case SEND_RSRC:	return php_stream_stat((php_stream *) data_ptr, &ssb) ? 0 : ssb.sb.st_mtime;
 		default:		return php_stream_stat_path((char *) data_ptr, &ssb) ? 0 : ssb.sb.st_mtime;
 	}
@@ -189,17 +183,17 @@ PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D)
 		return FAILURE;
 	}
 	
-	HTTP_G(etag).started = 1;
-	return php_start_ob_buffer_named("ob_etaghandler", HTTP_G(send).buffer_size, 1 TSRMLS_CC);
+	HTTP_G->etag.started = 1;
+	return php_start_ob_buffer_named("ob_etaghandler", HTTP_G->send.buffer_size, 1 TSRMLS_CC);
 }
 
 PHP_HTTP_API zend_bool _http_interrupt_ob_etaghandler(TSRMLS_D)
 {
-	if (HTTP_G(etag).started) {
-		HTTP_G(etag).started = 0;
-		if (HTTP_G(etag).ctx) {
-			efree(HTTP_G(etag).ctx);
-			HTTP_G(etag).ctx = NULL;
+	if (HTTP_G->etag.started) {
+		HTTP_G->etag.started = 0;
+		if (HTTP_G->etag.ctx) {
+			efree(HTTP_G->etag.ctx);
+			HTTP_G->etag.ctx = NULL;
 		}
 		return 1;
 	}
@@ -215,21 +209,21 @@ void _http_ob_etaghandler(char *output, uint output_len,
 	*handled_output = estrndup(output, output_len);
 	
 	/* are we supposed to run? */
-	if (HTTP_G(etag).started) {
+	if (HTTP_G->etag.started) {
 		/* initialize the etag context */
 		if (mode & PHP_OUTPUT_HANDLER_START) {
-			HTTP_G(etag).ctx = http_etag_init();
+			HTTP_G->etag.ctx = http_etag_init();
 		}
 		
 		/* update */
-		http_etag_update(HTTP_G(etag).ctx, output, output_len);
+		http_etag_update(HTTP_G->etag.ctx, output, output_len);
 		
 		/* finish */
 		if (mode & PHP_OUTPUT_HANDLER_END) {
 			char *sent_header = NULL;
-			char *etag = http_etag_finish(HTTP_G(etag).ctx);
+			char *etag = http_etag_finish(HTTP_G->etag.ctx);
 			
-			HTTP_G(etag).ctx = NULL;
+			HTTP_G->etag.ctx = NULL;
 			
 			http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL));
 			http_send_etag_ex(etag, strlen(etag), &sent_header);