X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http.c;h=0132ff93681d47a8953f6a4a2629b082d287e674;hb=fe453cd988e90c33a41987209642eb5fc90840e8;hp=bdaed8a86b3b888afeb08cbe6c86fdd460e7c2ae;hpb=ad4b13b9d6952c7b5f89c9339bbfab5f88975541;p=m6w6%2Fext-http

diff --git a/http.c b/http.c
index bdaed8a..0132ff9 100644
--- a/http.c
+++ b/http.c
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
+#define _WINSOCKAPI_
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
@@ -442,10 +443,14 @@ PHP_FUNCTION(http_cache_etag)
 	php_end_ob_buffers(0 TSRMLS_CC);
 	http_send_header("Cache-Control: private, must-revalidate, max-age=0");
 
+	if (etag_len) {
+		RETURN_SUCCESS(http_send_etag(etag, etag_len));
+	}
+
 	/* if no etag is given and we didn't already
 	 * start ob_etaghandler -- start it
 	 */
-	if (!HTTP_G(etag_started) && !etag_len) {
+	if (!HTTP_G(etag_started)) {
 		php_ob_set_internal_handler(_http_ob_etaghandler, (uint) 4096, "etag output handler", 0 TSRMLS_CC);
 		HTTP_G(etag_started) = 1;
 		RETURN_BOOL(php_start_ob_buffer_named("etag output handler", (uint) 4096, 0 TSRMLS_CC));
@@ -460,7 +465,6 @@ PHP_FUNCTION(http_cache_etag)
 		}
 	}
 
-	RETURN_SUCCESS(http_send_etag(etag, etag_len));
 }
 /* }}} */
 
@@ -1130,14 +1134,18 @@ PHP_RINIT_FUNCTION(http)
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
-	if (HTTP_G(ctype)) {
-		efree(HTTP_G(ctype));
-		HTTP_G(ctype) = NULL;
-	}
+	HTTP_G(etag_started) = 0;
+	HTTP_G(lmod) = 0;
+
 	if (HTTP_G(etag)) {
 		efree(HTTP_G(etag));
 		HTTP_G(etag) = NULL;
 	}
+
+	if (HTTP_G(ctype)) {
+		efree(HTTP_G(ctype));
+		HTTP_G(ctype) = NULL;
+	}
 #ifdef HTTP_HAVE_CURL
 	if (HTTP_G(curlbuf).body.data) {
 		efree(HTTP_G(curlbuf).body.data);