X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=103dc958a77fc8df65b32f8c5169c10c0156f682;hp=9c30e6cf3d8abf527123a9c28cd2b4a51acfe9a0;hb=7b88d9022c90eb12e5fe195af8644935141c9d68;hpb=01ed83fb41d0421368dddd8ace671f4b5bf9dd8d

diff --git a/http_send_api.c b/http_send_api.c
index 9c30e6c..103dc95 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -16,6 +16,7 @@
 #	include "config.h"
 #endif
 
+#define HTTP_WANT_ZLIB
 #define HTTP_WANT_MAGIC
 #include "php_http.h"
 
@@ -30,8 +31,6 @@
 #include "php_http_headers_api.h"
 #include "php_http_send_api.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 #define http_flush(d, l) _http_flush((d), (l) TSRMLS_CC)
 /* {{{ static inline void http_flush() */
 static inline void _http_flush(const char *data, size_t data_len TSRMLS_DC)
@@ -70,16 +69,13 @@ static inline void _http_flush(const char *data, size_t data_len TSRMLS_DC)
 #define http_send_response_start(b, cl) _http_send_response_start((b), (cl) TSRMLS_CC)
 static inline void _http_send_response_start(void **buffer, size_t content_length TSRMLS_DC)
 {
-	if (http_encoding_response_start(content_length)) {
+	int encoding;
+	
+	if ((encoding = http_encoding_response_start(content_length))) {
 #ifdef HTTP_HAVE_ZLIB
-		char *encoded;
-		size_t encoded_len;
-		http_encoding_stream *s = emalloc(sizeof(http_encoding_stream));
-		
-		http_encoding_stream_init(s, HTTP_G(send).gzip_encoding == HTTP_ENCODING_GZIP, -1, &encoded, &encoded_len);
-		phpstr_chunked_output(&s->storage, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
-		STR_FREE(encoded);
-		*buffer = s;
+		*buffer = http_encoding_deflate_stream_init(NULL, 
+			(encoding == HTTP_ENCODING_GZIP) ? 
+				HTTP_DEFLATE_TYPE_GZIP : HTTP_DEFLATE_TYPE_ZLIB);
 #endif
 	}
 }
@@ -89,14 +85,14 @@ 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).gzip_encoding) {
+	if (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_stream_update(s, data, data_len, &encoded, &encoded_len);
-		phpstr_chunked_output(&s->storage, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
+		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 TSRMLS_CC);
 		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");
@@ -160,16 +156,16 @@ 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).gzip_encoding) {
+	if (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_stream_finish(s, &encoded, &encoded_len);
-		phpstr_chunked_output(&s->storage, encoded, encoded_len, 0, _http_flush TSRMLS_CC);
+		http_encoding_deflate_stream_finish(s, &encoded, &encoded_len);
+		phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, 0, _http_flush TSRMLS_CC);
+		http_encoding_deflate_stream_free(&s);
 		STR_FREE(encoded);
-		efree(s);
 #else
 		http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug");
 #endif
@@ -456,9 +452,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;
+	
+	HTTP_CHECK_OPEN_BASEDIR(magicfile, return NULL);
+	
 	/*	magic_load() fails if MAGIC_MIME is set because it 
 		cowardly adds .mime to the file name */
-	struct magic_set *magic = magic_open(magicmode &~ MAGIC_MIME);
+	magic = magic_open(magicmode &~ MAGIC_MIME);
 	
 	if (!magic) {
 		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode);
@@ -487,6 +487,7 @@ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod
 			break;
 			
 			default:
+				HTTP_CHECK_OPEN_BASEDIR(data_ptr, magic_close(magic); return NULL);
 				ctype = magic_file(magic, data_ptr);
 			break;
 		}