- fix inclusion of zlib.h

[m6w6/ext-http] / http_send_api.c

diff --git a/http_send_api.c b/http_send_api.c
index 8b2567437b625ce8af5035a67d9da404e910ad4d..6403cf26fe97708e33b7d50d5d2dbb8b51036464 100644 (file)
--- 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"
 
@@ -32,7 +33,7 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
-#define http_flush(d, l) _http_flush((d), (l) SRMLS_CC)
+#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)
 {
@@ -74,10 +75,11 @@ static inline void _http_send_response_start(void **buffer, size_t content_lengt
 #ifdef HTTP_HAVE_ZLIB
                char *encoded;
                size_t encoded_len;
+               int gzip = (HTTP_G(send).gzip_encoding == HTTP_ENCODING_GZIP);
                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);
+               http_encoding_stream_init(s, gzip?HTTP_ENCODING_STREAM_GZIP_HEADER:0, -1, &encoded, &encoded_len);
+               phpstr_chunked_output(&PHPSTR(s->storage), encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
                STR_FREE(encoded);
                *buffer = s;
 #endif
@@ -96,7 +98,7 @@ static inline void _http_send_response_data_plain(void **buffer, const char *dat
                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);
+               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");
@@ -167,7 +169,7 @@ static inline void _http_send_response_finish(void **buffer TSRMLS_DC)
                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);
+               phpstr_chunked_output(&PHPSTR(s->storage), encoded, encoded_len, 0, _http_flush TSRMLS_CC);
                STR_FREE(encoded);
                efree(s);
 #else
@@ -456,9 +458,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 +493,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;
                }