X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cache_api.c;h=52d76ea079eceb8a00c55a420a8949631b5ad337;hp=8d2b47f5e23cd29e9bfc76efaad131a2f56ccc45;hb=f4c1d51952b2f8b15107c02ae0f44c859a02d071;hpb=ae1297f5908f5683e7384395e5ae0e5a295be576

diff --git a/http_cache_api.c b/http_cache_api.c
index 8d2b47f..52d76ea 100644
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -18,14 +18,13 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-
 #include "php.h"
+
+#include "SAPI.h"
 #include "php_streams.h"
 #include "php_output.h"
 #include "ext/standard/md5.h"
 
-#include "SAPI.h"
-
 #include "php_http.h"
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
@@ -35,33 +34,10 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
-/* {{{ STATUS http_cache_exit(char *, zend_bool) */
-STATUS _http_cache_exit_ex(char *cache_token, zend_bool etag, zend_bool free_token TSRMLS_DC)
-{
-	if (HTTP_G(cache_log) && strlen(HTTP_G(cache_log))) {
-		php_stream *log = php_stream_open_wrapper(HTTP_G(cache_log), "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
-
-		if (log) {
-			time_t now;
-			struct tm nowtm;
-			char datetime[128];
-
-			time(&now);
-			strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm));
- 			php_stream_printf(log TSRMLS_CC, "%s [%s] %32s %s\n", datetime, etag ? "ETAG":"LMOD", cache_token, SG(request_info).request_uri);
- 			php_stream_close(log);
-		}
-	}
-	if (free_token && cache_token) {
-		efree(cache_token);
-	}
-	return http_exit_ex(304, NULL, 0);
-}
-/* }}} */
-
 /* {{{ 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)
 {
+	php_stream_statbuf ssb;
 	char ssb_buf[128] = {0};
 	unsigned char digest[16];
 	PHP_MD5_CTX ctx;
@@ -76,22 +52,27 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m
 		break;
 
 		case SEND_RSRC:
-			if (!HTTP_G(ssb).sb.st_ino) {
-				if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) {
-					return NULL;
-				}
+		{
+			if (php_stream_stat((php_stream *) data_ptr, &ssb)) {
+				efree(new_etag);
+				return NULL;
 			}
-			snprintf(ssb_buf, 127, "%ld=%ld=%ld",
-				HTTP_G(ssb).sb.st_mtime,
-				HTTP_G(ssb).sb.st_ino,
-				HTTP_G(ssb).sb.st_size
-			);
+
+			snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size);
 			PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
+		}
 		break;
 
 		default:
-			efree(new_etag);
-			return NULL;
+		{
+			if (php_stream_stat_path((char *) data_ptr, &ssb)) {
+				efree(new_etag);
+				return NULL;
+			}
+
+			snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size);
+			PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
+		}
 		break;
 	}
 
@@ -105,24 +86,13 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m
 /* {{{ time_t http_last_modified(void *, http_send_mode) */
 PHP_HTTP_API time_t _http_last_modified(const void *data_ptr, http_send_mode data_mode TSRMLS_DC)
 {
+	php_stream_statbuf ssb;
+
 	switch (data_mode)
 	{
-		case SEND_DATA:
-		{
-			return time(NULL);
-		}
-
-		case SEND_RSRC:
-		{
-			php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb));
-			return HTTP_G(ssb).sb.st_mtime;
-		}
-
-		default:
-		{
-			php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &HTTP_G(ssb));
-			return HTTP_G(ssb).sb.st_mtime;
-		}
+		case SEND_DATA:	return time(NULL);
+		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;
 	}
 }
 /* }}} */
@@ -176,16 +146,20 @@ PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag,
 PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified,
 	time_t send_modified, const char *cache_control, size_t cc_len TSRMLS_DC)
 {
+	char *sent_header = NULL;
+	
 	if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) {
 		return FAILURE;
 	}
 
-	if (SUCCESS != http_send_last_modified(send_modified)) {
+	if (SUCCESS != http_send_last_modified_ex(send_modified, &sent_header)) {
 		return FAILURE;
 	}
 
 	if (http_match_last_modified("HTTP_IF_MODIFIED_SINCE", last_modified)) {
-		return http_cache_exit(http_date(last_modified), 0);
+		http_exit_ex(304, sent_header, NULL, 0);
+	} else {
+		STR_FREE(sent_header);
 	}
 
 	return SUCCESS;
@@ -196,31 +170,34 @@ PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified,
 PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len,
 	const char *cache_control, size_t cc_len TSRMLS_DC)
 {
+	char *sent_header = NULL;
+	
 	if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) {
 		return FAILURE;
 	}
 
 	if (etag_len) {
-		if (SUCCESS != http_send_etag(etag, etag_len)) {
+		if (SUCCESS != http_send_etag_ex(etag, etag_len, &sent_header)) {
 			return FAILURE;
 		}
-		if (!http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
-			return SUCCESS;
+		if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
+			http_exit_ex(304, sent_header, NULL, 0);
+		} else {
+			STR_FREE(sent_header);
 		}
-		return http_cache_exit_ex(etag, 1, 0);
+		return SUCCESS;
 	}
 
 	/* if no etag is given and we didn't already start ob_etaghandler -- start it */
-	if (HTTP_G(etag_started)) {
+	if (HTTP_G(etag).started) {
 		return SUCCESS;
 	}
 
-	if (HTTP_G(etag_started) = (SUCCESS == php_start_ob_buffer_named("ob_etaghandler", HTTP_SENDBUF_SIZE, 1 TSRMLS_CC))) {
+	if (HTTP_G(etag).started = (SUCCESS == php_start_ob_buffer_named("ob_etaghandler", HTTP_SENDBUF_SIZE, 1 TSRMLS_CC))) {
 		return SUCCESS;
 	} else {
 		return FAILURE;
 	}
-
 }
 /* }}} */
 
@@ -232,23 +209,27 @@ PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
 	unsigned char digest[16];
 
 	if (mode & PHP_OUTPUT_HANDLER_START) {
-		HTTP_G(etag_started) = 1;
-		PHP_MD5Init(&HTTP_G(etag_md5));
+		HTTP_G(etag).started = 1;
+		PHP_MD5Init(&HTTP_G(etag).md5ctx);
 	}
 
-	PHP_MD5Update(&HTTP_G(etag_md5), output, output_len);
+	PHP_MD5Update(&HTTP_G(etag).md5ctx, output, output_len);
 
 	if (mode & PHP_OUTPUT_HANDLER_END) {
-		PHP_MD5Final(digest, &HTTP_G(etag_md5));
+		PHP_MD5Final(digest, &HTTP_G(etag).md5ctx);
 
 		/* just do that if desired */
-		if (HTTP_G(etag_started)) {
+		if (HTTP_G(etag).started) {
+			char *sent_header = NULL;
+			
 			make_digest(etag, digest);
-			http_send_header("Cache-Control: " HTTP_DEFAULT_CACHECONTROL);
-			http_send_etag(etag, 32);
+			http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL));
+			http_send_etag_ex(etag, 32, &sent_header);
 
 			if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
-				http_cache_exit_ex(etag, 1, 0);
+				http_exit_ex(304, sent_header, NULL, 0);
+			} else {
+				STR_FREE(sent_header);
 			}
 		}
 	}