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

diff --git a/http_send_api.c b/http_send_api.c
index 93271db..88a27e1 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -106,8 +106,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 +122,8 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat
 				
 				efree(buf);
 			}
+			break;
 		}
-		break;
 
 		case SEND_DATA:
 		{
@@ -136,8 +135,8 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat
 				len -= got;
 				buf += got;
 			}
+			break;
 		}
-		break;
 
 		EMPTY_SWITCH_DEFAULT_CASE();
 	}
@@ -314,8 +313,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);
@@ -368,7 +366,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);
@@ -457,6 +455,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;
 	}
 
@@ -493,8 +501,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 +510,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) {