X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cache_api.c;h=98cd072aacdd37590ec8c1353c376c7b2ee94be5;hp=6fa1c523cac05804b5b2d5e544f5cf66dbccbfd0;hb=f0bcc141e62c022101d8d19c1d73e7b9ae41d0e9;hpb=30d6474a33615a15d485a3689e9d36490dcdacb2

diff --git a/http_cache_api.c b/http_cache_api.c
index 6fa1c52..98cd072 100644
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -18,51 +15,17 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
+
+#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);
-
-STATUS _http_cache_global_init(INIT_FUNC_ARGS)
-{
-	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_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)
@@ -82,7 +45,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;
@@ -95,7 +58,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);
 }
 /* }}} */
 
@@ -123,7 +86,7 @@ PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t,
 	HTTP_GSC(zmodified, entry, !enforce_presence);
 
 	modified = estrndup(Z_STRVAL_P(zmodified), Z_STRLEN_P(zmodified));
-	if (chr_ptr = strrchr(modified, ';')) {
+	if ((chr_ptr = strrchr(modified, ';'))) {
 		chr_ptr = 0;
 	}
 	retval = (t <= http_parse_date(modified));
@@ -163,6 +126,10 @@ PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified,
 {
 	char *sent_header = NULL;
 	
+	if (SG(headers_sent)) {
+		return FAILURE;
+	}
+	
 	if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) {
 		return FAILURE;
 	}
@@ -187,6 +154,10 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len,
 {
 	char *sent_header = NULL;
 	
+	if (SG(headers_sent)) {
+		return FAILURE;
+	}
+	
 	if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) {
 		return FAILURE;
 	}
@@ -224,7 +195,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;
@@ -251,7 +225,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);