X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_cache_api.c;h=c8ab27cdd8bac0fa322d56a80eb2823f1030285d;hb=c64365b84429b86b4af55b283de3758af38d9369;hp=963bb7e1d0c1aecac81b10047662715b9407006c;hpb=92f5e5a5df0bff3d8076c1f5ed73590b40849501;p=m6w6%2Fext-http

diff --git a/http_cache_api.c b/http_cache_api.c
index 963bb7e..c8ab27c 100644
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -6,68 +6,22 @@
     | 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
-#include "php.h"
+#define HTTP_WANT_SAPI
+#include "php_http.h"
 
-#include "SAPI.h"
-#include "php_streams.h"
 #include "php_output.h"
-#include "ext/standard/md5.h"
-#include "ext/standard/sha1.h"
+#include "php_streams.h"
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_cache_api.h"
-#include "php_http_send_api.h"
 #include "php_http_date_api.h"
-
-#ifdef HTTP_HAVE_MHASH
-#	include <mhash.h>
-#endif
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
-PHP_MINIT_FUNCTION(http_cache)
-{
-	HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5);
-	HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1);
-	HTTP_LONG_CONSTANT("HTTP_ETAG_CRC32", HTTP_ETAG_CRC32);
-
-#ifdef HTTP_HAVE_HASH_EXT
-	HTTP_LONG_CONSTANT("HTTP_ETAG_SHA256", HTTP_ETAG_SHA256);
-	HTTP_LONG_CONSTANT("HTTP_ETAG_SHA384", HTTP_ETAG_SHA384);
-	HTTP_LONG_CONSTANT("HTTP_ETAG_SHA512", HTTP_ETAG_SHA512);
-	HTTP_LONG_CONSTANT("HTTP_ETAG_RIPEMD128", HTTP_ETAG_RIPEMD128);
-	HTTP_LONG_CONSTANT("HTTP_ETAG_RIPEMD160", HTTP_ETAG_RIPEMD160);
-#endif
-
-#ifdef HTTP_HAVE_MHASH
-	{
-		int l, i, c = mhash_count();
-		
-		for (i = 0; i <= c; ++i) {
-			char const_name[256] = {0};
-			const char *hash_name = mhash_get_hash_name_static(i);
-			
-			if (hash_name) {
-				l = snprintf(const_name, 255, "HTTP_ETAG_MHASH_%s", hash_name);
-				zend_register_long_constant(const_name, l + 1, i, CONST_CS|CONST_PERSISTENT, module_number TSRMLS_CC);
-			}
-		}
-	}
-#endif
-
-	return SUCCESS;
-}
+#include "php_http_send_api.h"
 
 /* {{{ 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)
@@ -87,7 +41,7 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m
 		}
 		
 		if (SUCCESS != ss) {
-			http_etag_free(&ctx);
+			efree(ctx);
 			return NULL;
 		} else {
 			size_t ssb_len;
@@ -100,7 +54,7 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m
 		}
 	}
 	
-	return http_etag_finish(&ctx);
+	return http_etag_finish(ctx);
 }
 /* }}} */
 
@@ -111,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;
 	}
@@ -237,7 +191,10 @@ PHP_HTTP_API zend_bool _http_interrupt_ob_etaghandler(TSRMLS_D)
 {
 	if (HTTP_G(etag).started) {
 		HTTP_G(etag).started = 0;
-		http_etag_free(&HTTP_G(etag).ctx);
+		if (HTTP_G(etag).ctx) {
+			efree(HTTP_G(etag).ctx);
+			HTTP_G(etag).ctx = NULL;
+		}
 		return 1;
 	}
 	return 0;
@@ -264,7 +221,9 @@ void _http_ob_etaghandler(char *output, uint 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_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL));
 			http_send_etag_ex(etag, strlen(etag), &sent_header);