X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=d1a2ebeb08d3234c4dce327210b3c26cabbcb954;hp=88a27e1a7684cf83d6a82b422a76cf59fcd7e90c;hb=9c3bc2cb7b5217a91a8defbbe7c5c20f33938d59;hpb=1bb903f3aad484c7adf638af3365cb7c668d3281

diff --git a/http_send_api.c b/http_send_api.c
index 88a27e1..d1a2ebe 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -35,28 +35,12 @@ 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);
 	
-#define HTTP_MSEC(s) (s * 1000)
-#define HTTP_USEC(s) (HTTP_MSEC(s) * 1000)
-#define HTTP_NSEC(s) (HTTP_USEC(s) * 1000)
-#define HTTP_NANOSEC (1000 * 1000 * 1000)
-#define HTTP_DIFFSEC (0.001)
-
-	if (HTTP_G->send.throttle_delay >= HTTP_DIFFSEC) {
-#if defined(PHP_WIN32)
-		Sleep((DWORD) HTTP_MSEC(HTTP_G->send.throttle_delay));
-#elif defined(HAVE_USLEEP)
-		usleep(HTTP_USEC(HTTP_G->send.throttle_delay));
-#elif defined(HAVE_NANOSLEEP)
-		struct timespec req, rem;
-
-		req.tv_sec = (time_t) HTTP_G->send.throttle_delay;
-		req.tv_nsec = HTTP_NSEC(HTTP_G->send.throttle_delay) % HTTP_NANOSEC;
-
-		while (nanosleep(&req, &rem) && (errno == EINTR) && (HTTP_NSEC(rem.tv_sec) + rem.tv_nsec) > HTTP_NSEC(HTTP_DIFFSEC))) {
-			req.tv_sec = rem.tv_sec;
-			req.tv_nsec = rem.tv_nsec;
-		}
+#if 0
+	fprintf(stderr, "Flushing after writing %u bytes\n", (uint) data_len);
 #endif
+	
+	if (HTTP_G->send.throttle_delay >= HTTP_DIFFSEC) {
+		http_sleep(HTTP_G->send.throttle_delay);
 	}
 }
 /* }}} */
@@ -67,7 +51,7 @@ static inline void _http_send_response_start(void **buffer, size_t content_lengt
 {
 	int encoding;
 	
-	if ((encoding = http_encoding_response_start(content_length))) {
+	if ((encoding = http_encoding_response_start(content_length, 0))) {
 #ifdef HTTP_HAVE_ZLIB
 		*buffer = http_encoding_deflate_stream_init(NULL, 
 			(encoding == HTTP_ENCODING_GZIP) ? 
@@ -81,20 +65,26 @@ static inline void _http_send_response_start(void **buffer, size_t content_lengt
 #define http_send_response_data_plain(b, d, dl) _http_send_response_data_plain((b), (d), (dl) TSRMLS_CC)
 static inline void _http_send_response_data_plain(void **buffer, const char *data, size_t data_len TSRMLS_DC)
 {
-	if (HTTP_G->send.deflate.encoding) {
+	if (HTTP_G->send.deflate.response && HTTP_G->send.deflate.encoding) {
 #ifdef HTTP_HAVE_ZLIB
 		char *encoded;
 		size_t encoded_len;
 		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);
 	}
 }
 /* }}} */
@@ -147,20 +137,24 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat
 #define http_send_response_finish(b) _http_send_response_finish((b) TSRMLS_CC)
 static inline void _http_send_response_finish(void **buffer TSRMLS_DC)
 {
-	if (HTTP_G->send.deflate.encoding) {
+	if (HTTP_G->send.deflate.response && HTTP_G->send.deflate.encoding) {
 #ifdef HTTP_HAVE_ZLIB
 		char *encoded = NULL;
 		size_t encoded_len = 0;
 		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);
 	}
 }
@@ -484,15 +478,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));