X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cache_api.c;h=b6bc23714bd292882716ae66692118290b66095e;hp=7c748cc46023c73769fc5099bce37d003aed13bf;hb=refs%2Fheads%2Fv1.7.x;hpb=2f39230d83bdf816dcae52c7e5a1b019347f0e7b

diff --git a/http_cache_api.c b/http_cache_api.c
index 7c748cc..b6bc237 100644
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -45,9 +45,9 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m
 			return NULL;
 		} else {
 			size_t ssb_len;
-			char ssb_buf[128] = {0};
+			char ssb_buf[128];
 			
-			ssb_len = snprintf(ssb_buf, 127, "%ld=%ld=%ld", (long) ssb.sb.st_mtime, 
+			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);
@@ -64,7 +64,7 @@ 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();
+		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;
 	}
@@ -78,14 +78,16 @@ PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t,
 	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, ';'))) {
 		chr_ptr = 0;
 	}
 	
-	retval = (t <= http_parse_date(modified));
+	retval = (t <= http_parse_date_ex(modified, 1));
 	efree(modified);
 	return retval;
 }
@@ -98,7 +100,9 @@ PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag,
 	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;
@@ -178,13 +182,24 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len,
 PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D)
 {
 	/* already running? */
+#ifdef PHP_OUTPUT_NEWAPI
+    STATUS rv;
+
+    if (php_output_handler_conflict(ZEND_STRL("ob_etaghandler"), ZEND_STRL("ob_etaghandler") TSRMLS_CC)) {
+        return FAILURE;
+    }
+#else
 	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;
 	}
-	
+#endif
 	HTTP_G->etag.started = 1;
+#ifdef PHP_OUTPUT_NEWAPI
+    return php_output_start_internal(ZEND_STRL("ob_etaghandler"), _http_ob_etaghandler, HTTP_G->send.buffer_size, 0 TSRMLS_CC);
+#else
 	return php_start_ob_buffer_named("ob_etaghandler", HTTP_G->send.buffer_size, 0 TSRMLS_CC);
+#endif
 }
 
 PHP_HTTP_API zend_bool _http_interrupt_ob_etaghandler(TSRMLS_D)