X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=6fc9cc00916f3bfbc23ebf30b817bf1a780d0623;hp=3f6f2a6ef524c75e9b5071b9ba8e52cd55338eba;hb=3e637b9941c071b4fef38a7cde0cd6e2357ee4f0;hpb=afd561b680a07837192efbdb9ffe248def36f8e9

diff --git a/http_send_api.c b/http_send_api.c
index 3f6f2a6..6fc9cc0 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -158,7 +158,11 @@ PHP_HTTP_API STATUS _http_send_header_ex(const char *name, size_t name_len, cons
 	header[header_len] = '\0';
 	snprintf(header, header_len, "%s: %s", name, value);
 	ret = http_send_header_string_ex(header, replace);
-	efree(header);
+	if (sent_header) {
+		*sent_header = header;
+	} else {
+		efree(header);
+	}
 	return ret;
 }
 /* }}} */
@@ -185,7 +189,7 @@ PHP_HTTP_API STATUS _http_send_last_modified_ex(time_t t, char **sent_header TSR
 		return FAILURE;
 	}
 
-	ret = http_send_header_ex("Last-Modified", lenof("Last-Modifed"), date, strlen(date), 1, sent_header);
+	ret = http_send_header_ex("Last-Modified", lenof("Last-Modified"), date, strlen(date), 1, sent_header);
 	efree(date);
 
 	/* remember */
@@ -227,10 +231,7 @@ PHP_HTTP_API STATUS _http_send_etag_ex(const char *etag, size_t etag_len, char *
 /* {{{ STATUS http_send_content_type(char *, size_t) */
 PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, size_t ct_len TSRMLS_DC)
 {
-	if (!strchr(content_type, '/')) {
-		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Content-Type '%s' doesn't seem to consist of a primary and a secondary part", content_type);
-		return FAILURE;
-	}
+	HTTP_CHECK_CONTENT_TYPE(content_type, return FAILURE);
 
 	/* remember for multiple ranges */
 	STR_FREE(HTTP_G(send).content_type);
@@ -351,10 +352,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 	}
 
 	/* stop on-the-fly etag generation */
-	if (cache_etag = HTTP_G(etag).started) {
-		/* interrupt ob_etaghandler */
-		HTTP_G(etag).started = 0;
-	}
+	cache_etag = http_interrupt_ob_etaghandler();
 
 	/* enable partial dl and resume */
 	http_send_header_string("Accept-Ranges: bytes");
@@ -383,13 +381,11 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 	/* send 304 Not Modified if etag matches - DON'T return on ETag generation failure */
 	if (!no_cache && cache_etag) {
 		char *etag = NULL;
-
-		if (!(etag = http_etag(data_ptr, data_size, data_mode))) {
-			http_error(HE_NOTICE, HTTP_E_RUNTIME, "Failed to generate ETag for data source");
-		} else {
+		
+		if (etag = http_etag(data_ptr, data_size, data_mode)) {
 			char *sent_header = NULL;
 			
-			http_send_etag_ex(etag, 32, &sent_header);
+			http_send_etag_ex(etag, strlen(etag), &sent_header);
 			if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
 				return http_exit_ex(304, sent_header, NULL, 0);
 			} else {