X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cache_api.c;h=a70feb0775145664c05aafb3ddf6b6a4119b84bf;hp=7fc25cf845773623d67cb00a96f054ad6739fe43;hb=b86d629d9dcddf60e3b3abb3368f7fdab1879e7b;hpb=2b7331c5fdb73cb48f7f60a8e4ec88766581ced3

diff --git a/http_cache_api.c b/http_cache_api.c
index 7fc25cf..a70feb0 100644
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -24,6 +24,8 @@
 #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"
@@ -33,6 +35,30 @@
 
 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(log).cache && strlen(HTTP_G(log).cache)) {
+		php_stream *log = php_stream_open_wrapper(HTTP_G(log).cache, "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)
 {
@@ -50,17 +76,15 @@ 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;
-				}
-			}
-			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
-			);
+		{
+			php_stream_statbuf ssb;
+
+            if (php_stream_stat((php_stream *) data_ptr, &ssb)) {
+                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;
 
 		default:
@@ -79,24 +103,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(Z_STRVAL_P((zval *) data_ptr), &ssb) ? 0 : ssb.sb.st_mtime;
 	}
 }
 /* }}} */
@@ -159,7 +172,7 @@ PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified,
 	}
 
 	if (http_match_last_modified("HTTP_IF_MODIFIED_SINCE", last_modified)) {
-		return http_cache_exit();
+		return http_cache_exit(http_date(last_modified), 0);
 	}
 
 	return SUCCESS;
@@ -181,33 +194,19 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len,
 		if (!http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
 			return SUCCESS;
 		}
-		return http_cache_exit();
+		return http_cache_exit_ex((char *)etag, 1, 0);
 	}
 
 	/* 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;
 	}
-		
-}
-/* }}} */
-
-/* {{{ STATUS http_cache_exit() */
-PHP_HTTP_API STATUS _http_cache_exit(TSRMLS_D)
-{
-	if (SUCCESS != http_send_status(304)) {
-		http_error(E_WARNING, HTTP_E_HEADER, "Could not send 304 Not Modified");
-		return FAILURE;
-	}
-	/* TODO: cache_log */
-	zend_bailout();
-	return SUCCESS; /* fake */
 }
 /* }}} */
 
@@ -219,23 +218,23 @@ 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) {
 			make_digest(etag, digest);
 			http_send_header("Cache-Control: " HTTP_DEFAULT_CACHECONTROL);
 			http_send_etag(etag, 32);
 
 			if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
-				http_cache_exit();
+				http_cache_exit_ex(etag, 1, 0);
 			}
 		}
 	}