X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_send_api.c;h=ebecb33e94fa482ee448b903e01e911cb8c7ff57;hb=5498a30670c7166d92df816e25f33467dd1033d0;hp=82bdff01402d8108d8eaca91a95e7fe166c02f22;hpb=1a4ecd0664889f053891e861096f2ae1bc23e6e6;p=m6w6%2Fext-http

diff --git a/http_send_api.c b/http_send_api.c
index 82bdff0..ebecb33 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -35,6 +35,10 @@ static inline void _http_flush(void *nothing, const char *data, size_t data_len
 	php_end_ob_buffer(1, 1 TSRMLS_CC);
 	sapi_flush(TSRMLS_C);
 	
+#if 0
+	fprintf(stderr, "Flushing after writing %u bytes\n", (uint) data_len);
+#endif
+	
 #define HTTP_MSEC(s) (s * 1000)
 #define HTTP_USEC(s) (HTTP_MSEC(s) * 1000)
 #define HTTP_NSEC(s) (HTTP_USEC(s) * 1000)
@@ -88,13 +92,19 @@ static inline void _http_send_response_data_plain(void **buffer, const char *dat
 		http_encoding_stream *s = *((http_encoding_stream **) buffer);
 		
 		http_encoding_deflate_stream_update(s, data, data_len, &encoded, &encoded_len);
-		phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, HTTP_G->send.buffer_size, _http_flush, NULL TSRMLS_CC);
+		if (HTTP_G->send.buffer_size) {
+			phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, HTTP_G->send.buffer_size, _http_flush, NULL TSRMLS_CC);
+		} else {
+			http_flush(encoded, encoded_len);
+		}
 		efree(encoded);
 #else
 		http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug");
 #endif
-	} else {
+	} else if (HTTP_G->send.buffer_size) {
 		phpstr_chunked_output((phpstr **) buffer, data, data_len, HTTP_G->send.buffer_size, _http_flush, NULL TSRMLS_CC);
+	} else {
+		http_flush(data, data_len);
 	}
 }
 /* }}} */
@@ -106,8 +116,7 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat
 	char *buf;
 	long got, len = end - begin;
 	
-	switch (mode)
-	{
+	switch (mode) {
 		case SEND_RSRC:
 		{
 			php_stream *s = (php_stream *) data;
@@ -123,8 +132,8 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat
 				
 				efree(buf);
 			}
+			break;
 		}
-		break;
 
 		case SEND_DATA:
 		{
@@ -136,8 +145,8 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat
 				len -= got;
 				buf += got;
 			}
+			break;
 		}
-		break;
 
 		EMPTY_SWITCH_DEFAULT_CASE();
 	}
@@ -155,13 +164,17 @@ static inline void _http_send_response_finish(void **buffer TSRMLS_DC)
 		http_encoding_stream *s = *((http_encoding_stream **) buffer);
 		
 		http_encoding_deflate_stream_finish(s, &encoded, &encoded_len);
-		phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, 0, _http_flush, NULL TSRMLS_CC);
+		if (HTTP_G->send.buffer_size) {
+			phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, 0, _http_flush, NULL TSRMLS_CC);
+		} else {
+			http_flush(encoded, encoded_len);
+		}
 		http_encoding_deflate_stream_free(&s);
 		STR_FREE(encoded);
 #else
 		http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug");
 #endif
-	} else {
+	} else if (HTTP_G->send.buffer_size) {
 		phpstr_chunked_output((phpstr **) buffer, NULL, 0, 0, _http_flush, NULL TSRMLS_CC);
 	}
 }
@@ -314,8 +327,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 	zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0);
 	range_status = http_get_request_ranges(&ranges, data_size);
 
-	switch (range_status)
-	{
+	switch (range_status) {
 		case RANGE_ERR:
 		{
 			zend_hash_destroy(&ranges);
@@ -341,9 +353,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);
@@ -368,7 +380,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 				char boundary_str[32], range_header_str[256];
 				size_t boundary_len, range_header_len;
 				
-				boundary_len = snprintf(boundary_str, lenof(boundary_str), "%lu%0.9f", (ulong) HTTP_GET_REQUEST_TIME(), (float) php_combined_lcg(TSRMLS_C));
+				boundary_len = snprintf(boundary_str, lenof(boundary_str), "%lu%0.9f", (ulong) HTTP_G->request.time, (float) php_combined_lcg(TSRMLS_C));
 				range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Type: multipart/byteranges; boundary=%s", boundary_str);
 				
 				http_send_status_header_ex(206, range_header_str, range_header_len, 1);
@@ -379,8 +391,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;
 
@@ -457,6 +469,16 @@ PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_strea
 	php_stream_statbuf ssb;
 
 	if ((!file) || php_stream_stat(file, &ssb)) {
+		char *defct = sapi_get_default_content_type(TSRMLS_C);
+		
+		http_send_content_type(defct, strlen(defct));
+		http_send_header_string("Content-Disposition:");
+		http_error(HE_WARNING, HTTP_E_RESPONSE, "File not found; stat failed");
+		STR_FREE(defct);
+		
+		if (HTTP_G->send.not_found_404) {
+			http_exit_ex(404, NULL, estrdup("File not found\n"), 0);
+		}
 		return FAILURE;
 	}
 
@@ -476,15 +498,13 @@ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod
 	char *ct = NULL;
 
 #ifdef HTTP_HAVE_MAGIC
-	struct magic_set *magic;
+	struct magic_set *magic = NULL;
 	
 	HTTP_CHECK_OPEN_BASEDIR(magicfile, return NULL);
 	
-	/*	magic_load() fails if MAGIC_MIME is set because it 
-		cowardly adds .mime to the file name */
-	magic = magic_open(magicmode &~ MAGIC_MIME);
-	
-	if (!magic) {
+	if (!data_ptr) {
+		http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Supplied payload is empty");
+	} else if (!(magic = magic_open(magicmode &~ MAGIC_MIME))) {
 		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode);
 	} else if (-1 == magic_load(magic, magicfile)) {
 		http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to load magic database '%s' (%s)", magicfile, magic_error(magic));
@@ -493,8 +513,7 @@ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod
 		
 		magic_setflags(magic, magicmode);
 		
-		switch (data_mode)
-		{
+		switch (data_mode) {
 			case SEND_RSRC:
 			{
 				char *buffer;
@@ -503,17 +522,17 @@ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod
 				b_len = php_stream_copy_to_mem(data_ptr, &buffer, 65536, 0);
 				ctype = magic_buffer(magic, buffer, b_len);
 				efree(buffer);
+				break;
 			}
-			break;
 			
 			case SEND_DATA:
 				ctype = magic_buffer(magic, data_ptr, data_len);
-			break;
+				break;
 			
 			default:
 				HTTP_CHECK_OPEN_BASEDIR(data_ptr, magic_close(magic); return NULL);
 				ctype = magic_file(magic, data_ptr);
-			break;
+				break;
 		}
 		
 		if (ctype) {