X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cache_api.c;h=adba374d5c65ef90726a5e4d4f9100a07a092709;hp=c8ab27cdd8bac0fa322d56a80eb2823f1030285d;hb=c1cf3f178414800e4010735765ac8d727672584e;hpb=4fcbd8e8ae31611c5197ff2369673b5939fc2b80

diff --git a/http_cache_api.c b/http_cache_api.c
index c8ab27c..adba374 100644
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -63,9 +63,8 @@ PHP_HTTP_API time_t _http_last_modified(const void *data_ptr, http_send_mode dat
 {
 	php_stream_statbuf ssb;
 
-	switch (data_mode)
-	{
-		case SEND_DATA:	return HTTP_GET_REQUEST_TIME();
+	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;
 	}
@@ -85,7 +84,8 @@ PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t,
 	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;
 }
@@ -183,17 +183,17 @@ PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D)
 		return FAILURE;
 	}
 	
-	HTTP_G(etag).started = 1;
-	return php_start_ob_buffer_named("ob_etaghandler", HTTP_G(send).buffer_size, 1 TSRMLS_CC);
+	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;
+	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;
 	}
@@ -209,26 +209,28 @@ void _http_ob_etaghandler(char *output, uint output_len,
 	*handled_output = estrndup(output, output_len);
 	
 	/* are we supposed to run? */
-	if (HTTP_G(etag).started) {
+	if (HTTP_G->etag.started) {
 		/* initialize the etag context */
 		if (mode & PHP_OUTPUT_HANDLER_START) {
-			HTTP_G(etag).ctx = http_etag_init();
+			HTTP_G->etag.ctx = http_etag_init();
 		}
 		
 		/* update */
-		http_etag_update(HTTP_G(etag).ctx, output, output_len);
+		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);
+			char *etag = http_etag_finish(HTTP_G->etag.ctx);
 			
-			HTTP_G(etag).ctx = NULL;
+			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);
 			}