# include "config.h"
#endif
+#define HTTP_WANT_ZLIB
#define HTTP_WANT_MAGIC
#include "php_http.h"
#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_P(s->storage), encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
STR_FREE(encoded);
*buffer = s;
#endif
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_P(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");
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_P(s->storage), encoded, encoded_len, 0, _http_flush TSRMLS_CC);
STR_FREE(encoded);
efree(s);
#else
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);
break;
default:
+ HTTP_CHECK_OPEN_BASEDIR(data_ptr, magic_close(magic); return NULL);
ctype = magic_file(magic, data_ptr);
break;
}