X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cache_api.c;h=4cc07b996da0e6fdb1d984b77bd13bf0b37af623;hp=7d61040fc75b1e891632f77f3a0b17b4bb856ba4;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=cf9967800843ea01e77b374b4d78fad4bc18a3f6

diff --git a/http_cache_api.c b/http_cache_api.c
index 7d61040..4cc07b9 100644
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -1,146 +1,121 @@
 /*
-   +----------------------------------------------------------------------+
-   | 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-2010, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
+#define HTTP_WANT_SAPI
+#include "php_http.h"
 
-#include "php.h"
+#include "php_output.h"
 #include "php_streams.h"
-#include "ext/standard/md5.h"
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
-#include "php_http_cache_api.h"
-#include "php_http_send_api.h"
 #include "php_http_api.h"
+#include "php_http_cache_api.h"
 #include "php_http_date_api.h"
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
+#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)
 {
-	char ssb_buf[128] = {0};
-	unsigned char digest[16];
-	PHP_MD5_CTX ctx;
-	char *new_etag = ecalloc(1, 33);
-
-	PHP_MD5Init(&ctx);
-
-	switch (data_mode)
-	{
-		case SEND_DATA:
-			PHP_MD5Update(&ctx, data_ptr, data_len);
-		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_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
-		break;
-
-		default:
-			efree(new_etag);
+	void *ctx = http_etag_init();
+	
+	if (data_mode == SEND_DATA) {
+		http_etag_update(ctx, data_ptr, data_len);
+	} else {
+		STATUS ss = FAILURE;
+		php_stream_statbuf ssb;
+		
+		if (data_mode == SEND_RSRC) {
+			ss = php_stream_stat((php_stream *) data_ptr, &ssb);
+		} else {
+			ss = php_stream_stat_path((char *) data_ptr, &ssb);
+		}
+		
+		if (SUCCESS != ss) {
+			efree(ctx);
 			return NULL;
-		break;
+		} else {
+			size_t ssb_len;
+			char ssb_buf[128];
+			
+			ssb_len = snprintf(ssb_buf, sizeof(ssb_buf), "%ld=%ld=%ld", (long) ssb.sb.st_mtime, 
+															(long) ssb.sb.st_ino, 
+															(long) ssb.sb.st_size);
+			http_etag_update(ctx, ssb_buf, ssb_len);
+		}
 	}
-
-	PHP_MD5Final(digest, &ctx);
-	make_digest(new_etag, digest);
-
-	return new_etag;
+	
+	return http_etag_finish(ctx);
 }
 /* }}} */
 
-/* {{{ time_t http_lmod(void *, http_send_mode) */
-PHP_HTTP_API time_t _http_lmod(const void *data_ptr, http_send_mode data_mode TSRMLS_DC)
+/* {{{ 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)
 {
-	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;
-		}
+	php_stream_statbuf ssb;
 
-		default:
-		{
-			php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &HTTP_G(ssb));
-			return HTTP_G(ssb).sb.st_mtime;
-		}
+	switch (data_mode) {
+		case SEND_DATA:	return HTTP_G->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;
 	}
 }
 /* }}} */
 
-/* {{{ zend_bool http_modified_match(char *, time_t) */
-PHP_HTTP_API zend_bool _http_modified_match_ex(const char *entry, time_t t, zend_bool enforce_presence TSRMLS_DC)
+/* {{{ zend_bool http_match_last_modified(char *, time_t) */
+PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t, zend_bool enforce_presence TSRMLS_DC)
 {
 	zend_bool retval;
 	zval *zmodified;
 	char *modified, *chr_ptr;
 
-	HTTP_GSC(zmodified, entry, !enforce_presence);
+	if (!(zmodified = http_get_server_var(entry, 1))) {
+		return !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));
+	
+	retval = (t <= http_parse_date_ex(modified, 1));
 	efree(modified);
 	return retval;
 }
 /* }}} */
 
-/* {{{ zend_bool http_etag_match(char *, char *) */
-PHP_HTTP_API zend_bool _http_etag_match_ex(const char *entry, const char *etag, zend_bool enforce_presence TSRMLS_DC)
+/* {{{ zend_bool http_match_etag(char *, char *) */
+PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag, zend_bool enforce_presence TSRMLS_DC)
 {
 	zval *zetag;
 	char *quoted_etag;
 	zend_bool result;
 
-	HTTP_GSC(zetag, entry, !enforce_presence);
+	if (!(zetag = http_get_server_var_ex(entry, strlen(entry)+1, 1))) {
+		return !enforce_presence;
+	}
 
 	if (NULL != strchr(Z_STRVAL_P(zetag), '*')) {
 		return 1;
 	}
 
-	quoted_etag = (char *) emalloc(strlen(etag) + 3);
-	sprintf(quoted_etag, "\"%s\"", etag);
-
+	spprintf(&quoted_etag, 0, "\"%s\"", etag);
 	if (!strchr(Z_STRVAL_P(zetag), ',')) {
 		result = !strcmp(Z_STRVAL_P(zetag), quoted_etag);
 	} else {
 		result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag));
 	}
 	efree(quoted_etag);
+	
 	return result;
 }
 /* }}} */
@@ -149,19 +124,27 @@ PHP_HTTP_API zend_bool _http_etag_match_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)
 {
-	if (cc_len) {
-		http_send_cache_control(cache_control, cc_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;
 	}
 
-	if (http_modified_match("HTTP_IF_MODIFIED_SINCE", last_modified)) {
-		if (SUCCESS == http_send_status(304)) {
-			zend_bailout();
-		} else {
-			http_error(E_WARNING, HTTP_E_HEADER, "Could not send 304 Not Modified");
-			return FAILURE;
-		}
+	if (SUCCESS != http_send_last_modified_ex(send_modified, &sent_header)) {
+		return FAILURE;
 	}
-	return http_send_last_modified(send_modified);
+
+	if (http_match_last_modified("HTTP_IF_MODIFIED_SINCE", last_modified)) {
+		http_exit_ex(304, sent_header, NULL, 0);
+	} else {
+		STR_FREE(sent_header);
+	}
+
+	return SUCCESS;
 }
 /* }}} */
 
@@ -169,36 +152,98 @@ 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)
 {
-	if (cc_len) {
-		http_send_cache_control(cache_control, cc_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;
 	}
 
 	if (etag_len) {
-		http_send_etag(etag, etag_len);
-		if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
-			if (SUCCESS == http_send_status(304)) {
-				zend_bailout();
-			} else {
-				http_error(E_WARNING, HTTP_E_HEADER, "Could not send 304 Not Modified");
-				return FAILURE;
-			}
+		if (SUCCESS != http_send_etag_ex(etag, etag_len, &sent_header)) {
+			return FAILURE;
 		}
-	}
-
-	/* if no etag is given and we didn't already start ob_etaghandler -- start it */
-	if (!HTTP_G(etag_started)) {
-		if (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 4096, 1)) {
-			HTTP_G(etag_started) = 1;
-			return SUCCESS;
+		if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
+			http_exit_ex(304, sent_header, NULL, 0);
 		} else {
-			http_error(E_WARNING, HTTP_E_OBUFFER, "Could not start ob_etaghandler");
-			return FAILURE;
+			STR_FREE(sent_header);
 		}
+		return SUCCESS;
 	}
-	return SUCCESS;
+	
+	/* start ob_etaghandler */
+	return http_start_ob_etaghandler();
 }
 /* }}} */
 
+PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D)
+{
+	/* already running? */
+	if (php_ob_handler_used("ob_etaghandler" TSRMLS_CC)) {
+		http_error(HE_WARNING, HTTP_E_RUNTIME, "ob_etaghandler can only be used once");
+		return FAILURE;
+	}
+	
+	HTTP_G->etag.started = 1;
+	return php_start_ob_buffer_named("ob_etaghandler", HTTP_G->send.buffer_size, 0 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;
+		}
+		return 1;
+	}
+	return 0;
+}
+
+/* {{{ void http_ob_etaghandler(char *, uint, char **, uint *, int) */
+void _http_ob_etaghandler(char *output, uint output_len,
+	char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
+{
+	/* passthru */
+	*handled_output_len = output_len;
+	*handled_output = estrndup(output, output_len);
+	
+	/* are we supposed to run? */
+	if (HTTP_G->etag.started) {
+		/* initialize the etag context */
+		if (mode & PHP_OUTPUT_HANDLER_START) {
+			HTTP_G->etag.ctx = http_etag_init();
+		}
+		
+		/* update */
+		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);
+			
+			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);
+			
+			if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
+				/* force exit; ob within ob does not work */
+				HTTP_G->force_exit = 1;
+				http_exit_ex(304, sent_header, etag, 0);
+			}
+			
+			STR_FREE(sent_header);
+			STR_FREE(etag);
+		}
+	}
+}
+/* }}} */
 
 /*
  * Local variables: