X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=93271dbd68ac407689eb09bd9b3f50881ddae0a9;hp=fd4c4745b627f3ab5d05df27d11b1731a18162d5;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hpb=5685b2140c8948fe617766ce154bb7462729ea6f

diff --git a/http_send_api.c b/http_send_api.c
index fd4c474..93271db 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -99,12 +99,12 @@ static inline void _http_send_response_data_plain(void **buffer, const char *dat
 }
 /* }}} */
 
-#define HTTP_CHUNK_AVAIL(len, cs) ((len -= cs) >= 0)
 /* {{{ http_send_response_data_fetch */
 #define http_send_response_data_fetch(b, d, l, m, s, e) _http_send_response_data_fetch((b), (d), (l), (m), (s), (e) TSRMLS_CC)
 static inline void _http_send_response_data_fetch(void **buffer, const void *data, size_t data_len, http_send_mode mode, size_t begin, size_t end TSRMLS_DC)
 {
-	long len = end - begin, chunk_size = 40960;
+	char *buf;
+	long got, len = end - begin;
 	
 	switch (mode)
 	{
@@ -113,16 +113,14 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat
 			php_stream *s = (php_stream *) data;
 
 			if (SUCCESS == php_stream_seek(s, begin, SEEK_SET)) {
-				char *buf = emalloc(chunk_size);
-
-				while (HTTP_CHUNK_AVAIL(len, chunk_size)) {
-					http_send_response_data_plain(buffer, buf, php_stream_read(s, buf, chunk_size));
-				}
-				/* read & write left over */
-				if (len) {
-					http_send_response_data_plain(buffer, buf, php_stream_read(s, buf, chunk_size + len));
+				buf = emalloc(HTTP_SENDBUF_SIZE);
+				
+				while (len > 0) {
+					got = php_stream_read(s, buf, MIN(len, HTTP_SENDBUF_SIZE));
+					http_send_response_data_plain(buffer, buf, got);
+					len -= got;
 				}
-	
+				
 				efree(buf);
 			}
 		}
@@ -130,15 +128,13 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat
 
 		case SEND_DATA:
 		{
-			char *s = (char *) data + begin;
-
-			while (HTTP_CHUNK_AVAIL(len, chunk_size)) {
-				http_send_response_data_plain(buffer, s, chunk_size);
-				s += chunk_size;
-			}
-			/* write left over */
-			if (len) {
-				http_send_response_data_plain(buffer, s, chunk_size + len);
+			buf = (char *) data + begin;
+			
+			while (len > 0) {
+				got = MIN(len, HTTP_SENDBUF_SIZE);
+				http_send_response_data_plain(buffer, buf, got);
+				len -= got;
+				buf += got;
 			}
 		}
 		break;
@@ -242,18 +238,19 @@ PHP_HTTP_API STATUS _http_send_etag_ex(const char *etag, size_t etag_len, char *
 {
 	STATUS status;
 	char *etag_header;
+	size_t etag_header_len;
 
 	if (!etag_len){
 		http_error_ex(HE_WARNING, HTTP_E_HEADER, "Attempt to send empty ETag (previous: %s)\n", HTTP_G->send.unquoted_etag);
 		return FAILURE;
 	}
 
+	etag_header_len = spprintf(&etag_header, 0, "ETag: \"%s\"", etag);
+	status = http_send_header_string_ex(etag_header, etag_header_len, 1);
+	
 	/* remember */
 	STR_SET(HTTP_G->send.unquoted_etag, estrndup(etag, etag_len));
 
-	etag_len = spprintf(&etag_header, 0, "ETag: \"%s\"", etag);
-	status = http_send_header_string_ex(etag_header, etag_len, 1);
-	
 	if (sent_header) {
 		*sent_header = etag_header;
 	} else {
@@ -303,7 +300,6 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 	void *s = NULL;
 	HashTable ranges;
 	http_range_status range_status;
-	int cache_etag = http_interrupt_ob_etaghandler();
 	
 	if (!data_ptr) {
 		return FAILURE;
@@ -345,9 +341,9 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 				/* single range */
 				zval **range, **begin, **end;
 				
-				if (	SUCCESS != zend_hash_index_find(&ranges, 0, (void **) &range) ||
-						SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void **) &begin) ||
-						SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void **) &end)) {
+				if (	SUCCESS != zend_hash_index_find(&ranges, 0, (void *) &range) ||
+						SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin) ||
+						SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)) {
 					/* this should never happen */
 					zend_hash_destroy(&ranges);
 					http_send_status(500);
@@ -383,8 +379,8 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 				}
 				
 				FOREACH_HASH_VAL(pos, &ranges, range) {
-					if (	SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void **) &begin) &&
-							SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void **) &end)) {
+					if (	SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin) &&
+							SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)) {
 						char preface_str[512];
 						size_t preface_len;
 
@@ -412,12 +408,16 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 		case RANGE_NO:
 		{
 			zend_hash_destroy(&ranges);
-			
+
 			/* send 304 Not Modified if etag matches - DON'T return on ETag generation failure */
-			if (!no_cache && cache_etag) {
+			if (!no_cache && (http_interrupt_ob_etaghandler() || (HTTP_G->send.unquoted_etag != NULL))) {
 				char *etag = NULL;
 				
-				if ((etag = http_etag(data_ptr, data_size, data_mode))) {
+				if (HTTP_G->send.unquoted_etag) {
+					etag = estrdup(HTTP_G->send.unquoted_etag);
+				}
+				
+				if (etag || (etag = http_etag(data_ptr, data_size, data_mode))) {
 					char *sent_header = NULL;
 					
 					http_send_etag_ex(etag, strlen(etag), &sent_header);
@@ -425,6 +425,8 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 						return http_exit_ex(304, sent_header, NULL, 0);
 					} else {
 						STR_FREE(sent_header);
+						/* no caching for Last-Modified if ETags really don't match */
+						no_cache = http_got_server_var("HTTP_IF_NONE_MATCH");
 					}
 					efree(etag);
 				}