| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#define HTTP_WANT_ZLIB
#include "php_http.h"
#include "php_http_api.h"
#include "php_http_send_api.h"
#include "php_http_headers_api.h"
-ZEND_EXTERN_MODULE_GLOBALS(http);
+/* {{{ */
+#ifdef HTTP_HAVE_ZLIB
+PHP_MINIT_FUNCTION(http_encoding)
+{
+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_LEVEL_DEF", HTTP_DEFLATE_LEVEL_DEF);
+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_LEVEL_MIN", HTTP_DEFLATE_LEVEL_MIN);
+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_LEVEL_MAX", HTTP_DEFLATE_LEVEL_MAX);
+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_TYPE_ZLIB", HTTP_DEFLATE_TYPE_ZLIB);
+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_TYPE_GZIP", HTTP_DEFLATE_TYPE_GZIP);
+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_TYPE_RAW", HTTP_DEFLATE_TYPE_RAW);
+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_DEF", HTTP_DEFLATE_STRATEGY_DEF);
+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_FILT", HTTP_DEFLATE_STRATEGY_FILT);
+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_HUFF", HTTP_DEFLATE_STRATEGY_HUFF);
+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_RLE", HTTP_DEFLATE_STRATEGY_RLE);
+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_FIXED", HTTP_DEFLATE_STRATEGY_FIXED);
+ return SUCCESS;
+}
+
+PHP_RINIT_FUNCTION(http_encoding)
+{
+ if (HTTP_G->send.inflate.start_auto) {
+ php_ob_set_internal_handler(_http_ob_inflatehandler, HTTP_INFLATE_BUFFER_SIZE, "http inflate", 0 TSRMLS_CC);
+ }
+ if (HTTP_G->send.deflate.start_auto) {
+ php_ob_set_internal_handler(_http_ob_deflatehandler, HTTP_DEFLATE_BUFFER_SIZE, "http deflate", 0 TSRMLS_CC);
+ }
+ return SUCCESS;
+}
+
+PHP_RSHUTDOWN_FUNCTION(http_encoding)
+{
+ if (HTTP_G->send.deflate.stream) {
+ http_encoding_deflate_stream_free((http_encoding_stream **) &HTTP_G->send.deflate.stream);
+ }
+ if (HTTP_G->send.inflate.stream) {
+ http_encoding_inflate_stream_free((http_encoding_stream **) &HTTP_G->send.inflate.stream);
+ }
+ return SUCCESS;
+}
+#endif
+/* }}} */
+/* {{{ eol_match(char **, int *) */
static inline int eol_match(char **line, int *eol_len)
{
char *ptr = *line;
- while (0x20 == *ptr) ++ptr;
+ while (' ' == *ptr) ++ptr;
if (ptr == http_locate_eol(*line, eol_len)) {
*line = ptr;
return 0;
}
}
+/* }}} */
/* {{{ char *http_encoding_dechunk(char *, size_t, char **, size_t *) */
PHP_HTTP_API const char *_http_encoding_dechunk(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC)
}
/* }}} */
-#ifdef HTTP_HAVE_ZLIB
-
-static const char http_encoding_gzip_header[] = {
- (const char) 0x1f, // fixed value
- (const char) 0x8b, // fixed value
- (const char) Z_DEFLATED, // compression algorithm
- (const char) 0, // none of the possible flags defined by the GZIP "RFC"
- (const char) 0, // MTIME
- (const char) 0, // =*=
- (const char) 0, // =*=
- (const char) 0, // =*=
- (const char) 0, // two possible flag values for 9 compression levels? o_O
-#ifdef PHP_WIN32
- (const char) 0x0b // OS_CODE
-#else
- (const char) 0x03 // OS_CODE
-#endif
-};
-
-PHP_HTTP_API STATUS _http_encoding_gzencode(int level, int mtime, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC)
+/* {{{ int http_encoding_response_start(size_t) */
+PHP_HTTP_API int _http_encoding_response_start(size_t content_length TSRMLS_DC)
{
- z_stream Z;
- STATUS status = Z_OK;
-
- if (!(data && data_len)) {
- return FAILURE;
- }
-
- Z.zalloc = Z_NULL;
- Z.zfree = Z_NULL;
- Z.opaque = Z_NULL;
- Z.next_in = (Bytef *) data;
- Z.avail_in = data_len;
- Z.avail_out = HTTP_ENCODING_BUFLEN(data_len) + HTTP_ENCODING_SAFPAD - 1;
-
- *encoded = emalloc(HTTP_ENCODING_BUFLEN(data_len) + sizeof(http_encoding_gzip_header) + HTTP_ENCODING_SAFPAD);
- memcpy(*encoded, http_encoding_gzip_header, sizeof(http_encoding_gzip_header));
-
- if (mtime) {
- (*encoded)[4] = (char) (mtime & 0xFF);
- (*encoded)[5] = (char) ((mtime >> 8) & 0xFF);
- (*encoded)[6] = (char) ((mtime >> 16) & 0xFF);
- (*encoded)[7] = (char) ((mtime >> 24) & 0xFF);
- }
-
- Z.next_out = (Bytef *) *encoded + sizeof(http_encoding_gzip_header);
-
- if (Z_OK == (status = deflateInit2(&Z, level, Z_DEFLATED, -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY))) {
- status = deflate(&Z, Z_FINISH);
- deflateEnd(&Z);
-
- if (Z_STREAM_END == status) {
- ulong crc;
- char *trailer;
+ if ( php_ob_handler_used("ob_gzhandler" TSRMLS_CC) ||
+ php_ob_handler_used("zlib output compression" TSRMLS_CC)) {
+ HTTP_G->send.deflate.encoding = 0;
+ } else {
+ if (!HTTP_G->send.deflate.encoding) {
+ /* emit a content-length header */
+ if (content_length) {
+ char cl_header_str[128];
+ size_t cl_header_len;
+ cl_header_len = snprintf(cl_header_str, lenof(cl_header_str), "Content-Length: %zu", content_length);
+ http_send_header_string_ex(cl_header_str, cl_header_len, 1);
+ }
+ } else {
+#ifndef HTTP_HAVE_ZLIB
+ HTTP_G->send.deflate.encoding = 0;
+ php_start_ob_buffer_named("ob_gzhandler", 0, 0 TSRMLS_CC);
+#else
+ HashTable *selected;
+ zval zsupported;
- crc = crc32(0L, Z_NULL, 0);
- crc = crc32(crc, (const Bytef *) data, data_len);
+ INIT_PZVAL(&zsupported);
+ array_init(&zsupported);
+ add_next_index_stringl(&zsupported, "gzip", lenof("gzip"), 1);
+ add_next_index_stringl(&zsupported, "x-gzip", lenof("x-gzip"), 1);
+ add_next_index_stringl(&zsupported, "deflate", lenof("deflate"), 1);
- trailer = *encoded + sizeof(http_encoding_gzip_header) + Z.total_out;
+ HTTP_G->send.deflate.encoding = 0;
- /* LSB */
- trailer[0] = (char) (crc & 0xFF);
- trailer[1] = (char) ((crc >> 8) & 0xFF);
- trailer[2] = (char) ((crc >> 16) & 0xFF);
- trailer[3] = (char) ((crc >> 24) & 0xFF);
- trailer[4] = (char) ((Z.total_in) & 0xFF);
- trailer[5] = (char) ((Z.total_in >> 8) & 0xFF);
- trailer[6] = (char) ((Z.total_in >> 16) & 0xFF);
- trailer[7] = (char) ((Z.total_in >> 24) & 0xFF);
+ if ((selected = http_negotiate_encoding(&zsupported))) {
+ STATUS hs = FAILURE;
+ char *encoding = NULL;
+ ulong idx;
+
+ if (HASH_KEY_IS_STRING == zend_hash_get_current_key(selected, &encoding, &idx, 0) && encoding) {
+ if (!strcmp(encoding, "gzip") || !strcmp(encoding, "x-gzip")) {
+ if (SUCCESS == (hs = http_send_header_string("Content-Encoding: gzip"))) {
+ HTTP_G->send.deflate.encoding = HTTP_ENCODING_GZIP;
+ }
+ } else if (!strcmp(encoding, "deflate")) {
+ if (SUCCESS == (hs = http_send_header_string("Content-Encoding: deflate"))) {
+ HTTP_G->send.deflate.encoding = HTTP_ENCODING_DEFLATE;
+ }
+ }
+ if (SUCCESS == hs) {
+ http_send_header_string("Vary: Accept-Encoding");
+ }
+ }
+
+ zend_hash_destroy(selected);
+ FREE_HASHTABLE(selected);
+ }
- *encoded_len = Z.total_out + sizeof(http_encoding_gzip_header) + 8;
- (*encoded)[*encoded_len] = '\0';
- return SUCCESS;
+ zval_dtor(&zsupported);
+ return HTTP_G->send.deflate.encoding;
+#endif
}
}
-
- efree(*encoded);
- http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not gzencode data: %s", zError(status));
- return FAILURE;
+ return 0;
}
+/* }}} */
-PHP_HTTP_API STATUS _http_encoding_gzdecode(const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC)
-{
- const char *encoded;
- size_t encoded_len;
-
- if ( (data && data_len) &&
- (SUCCESS == http_encoding_gzencode_verify(data, data_len, &encoded, &encoded_len)) &&
- (SUCCESS == http_encoding_inflate(encoded, encoded_len, decoded, decoded_len))) {
- http_encoding_gzdecode_verify(data, data_len, *decoded, *decoded_len);
- return SUCCESS;
+#ifdef HTTP_HAVE_ZLIB
+
+/* {{{ */
+#define HTTP_DEFLATE_LEVEL_SET(flags, level) \
+ switch (flags & 0xf) \
+ { \
+ default: \
+ if ((flags & 0xf) < 10) { \
+ level = flags & 0xf; \
+ break; \
+ } \
+ case HTTP_DEFLATE_LEVEL_DEF: \
+ level = Z_DEFAULT_COMPRESSION; \
+ break; \
}
- return FAILURE;
-}
+#define HTTP_DEFLATE_WBITS_SET(flags, wbits) \
+ switch (flags & 0xf0) \
+ { \
+ case HTTP_DEFLATE_TYPE_GZIP: \
+ wbits = HTTP_WINDOW_BITS_GZIP; \
+ break; \
+ case HTTP_DEFLATE_TYPE_RAW: \
+ wbits = HTTP_WINDOW_BITS_RAW; \
+ break; \
+ default: \
+ wbits = HTTP_WINDOW_BITS_ZLIB; \
+ break; \
+ }
+
+#define HTTP_INFLATE_WBITS_SET(flags, wbits) \
+ if (flags & HTTP_INFLATE_TYPE_RAW) { \
+ wbits = HTTP_WINDOW_BITS_RAW; \
+ } else { \
+ wbits = HTTP_WINDOW_BITS_ANY; \
+ }
+
+#define HTTP_DEFLATE_STRATEGY_SET(flags, strategy) \
+ switch (flags & 0xf00) \
+ { \
+ case HTTP_DEFLATE_STRATEGY_FILT: \
+ strategy = Z_FILTERED; \
+ break; \
+ case HTTP_DEFLATE_STRATEGY_HUFF: \
+ strategy = Z_HUFFMAN_ONLY; \
+ break; \
+ case HTTP_DEFLATE_STRATEGY_RLE: \
+ strategy = Z_RLE; \
+ break; \
+ case HTTP_DEFLATE_STRATEGY_FIXED: \
+ strategy = Z_FIXED; \
+ break; \
+ default: \
+ strategy = Z_DEFAULT_STRATEGY; \
+ break; \
+ }
+
+#define HTTP_WINDOW_BITS_ZLIB 0x0000000f
+#define HTTP_WINDOW_BITS_GZIP 0x0000001f
+#define HTTP_WINDOW_BITS_ANY 0x0000002f
+#define HTTP_WINDOW_BITS_RAW -0x000000f
+/* }}} */
-PHP_HTTP_API STATUS _http_encoding_deflate(int level, int zhdr, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC)
+/* {{{ STATUS http_encoding_deflate(int, char *, size_t, char **, size_t *) */
+PHP_HTTP_API STATUS _http_encoding_deflate(int flags, const char *data, size_t data_len, char **encoded, size_t *encoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
{
+ int status, level, wbits, strategy;
z_stream Z;
- STATUS status = Z_OK;
- Z.zalloc = Z_NULL;
- Z.zfree = Z_NULL;
- Z.opaque = Z_NULL;
- Z.data_type = Z_UNKNOWN;
- Z.next_in = (Bytef *) data;
- Z.avail_in = data_len;
- Z.avail_out = HTTP_ENCODING_BUFLEN(data_len) - 1;
- Z.next_out = emalloc(HTTP_ENCODING_BUFLEN(data_len));
+ HTTP_DEFLATE_LEVEL_SET(flags, level);
+ HTTP_DEFLATE_WBITS_SET(flags, wbits);
+ HTTP_DEFLATE_STRATEGY_SET(flags, strategy);
- *encoded = (char *) Z.next_out;
+ memset(&Z, 0, sizeof(z_stream));
+ *encoded = NULL;
+ *encoded_len = 0;
- if (Z_OK == (status = deflateInit2(&Z, level, Z_DEFLATED, zhdr ? MAX_WBITS : -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY))) {
+ status = deflateInit2(&Z, level, Z_DEFLATED, wbits, MAX_MEM_LEVEL, strategy);
+ if (Z_OK == status) {
+ *encoded_len = HTTP_DEFLATE_BUFFER_SIZE_GUESS(data_len);
+ *encoded = emalloc_rel(*encoded_len);
+
+ Z.next_in = (Bytef *) data;
+ Z.next_out = (Bytef *) *encoded;
+ Z.avail_in = data_len;
+ Z.avail_out = *encoded_len;
+
status = deflate(&Z, Z_FINISH);
deflateEnd(&Z);
if (Z_STREAM_END == status) {
+ /* size buffer down to actual length */
+ *encoded = erealloc_rel(*encoded, Z.total_out + 1);
(*encoded)[*encoded_len = Z.total_out] = '\0';
return SUCCESS;
+ } else {
+ STR_SET(*encoded, NULL);
+ *encoded_len = 0;
}
}
- efree(encoded);
http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not deflate data: %s", zError(status));
return FAILURE;
}
+/* }}} */
-PHP_HTTP_API STATUS _http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC)
+/* {{{ STATUS http_encoding_inflate(char *, size_t, char **, size_t) */
+PHP_HTTP_API STATUS _http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
{
- int max = 0, wbits = -MAX_WBITS;
- STATUS status;
+ int status, round = 0, wbits = HTTP_WINDOW_BITS_ANY;
z_stream Z;
+ phpstr buffer;
- do {
- Z.zalloc = Z_NULL;
- Z.zfree = Z_NULL;
+ memset(&Z, 0, sizeof(z_stream));
+ *decoded = NULL;
+ *decoded_len = 0;
+
+ phpstr_init_ex(&buffer, data_len << 2, PHPSTR_INIT_PREALLOC);
+ buffer.size = data_len;
+
+retry_inflate:
+ status = inflateInit2(&Z, wbits);
+ if (Z_OK == status) {
+ Z.next_in = (Bytef *) data;
+ Z.avail_in = data_len;
- if (!max) {
- *decoded_len = data_len * 2;
- *decoded = emalloc(*decoded_len + 1);
- } else {
- size_t new_len = *decoded_len << 2;
- char *new_ptr = erealloc_recoverable(*decoded, new_len + 1);
-
- if (new_ptr) {
- *decoded = new_ptr;
- *decoded_len = new_len;
- } else {
- max = INT_MAX-1; /* avoid integer overflow on increment op */
- }
+ do {
+ phpstr_resize(&buffer, data_len << 2);
+
+ do {
+ Z.avail_out = (buffer.free -= Z.total_out - buffer.used);
+ Z.next_out = (Bytef *) buffer.data + (buffer.used = Z.total_out);
+ status = inflate(&Z, Z_NO_FLUSH);
+ } while (Z_OK == status);
+ } while (Z_BUF_ERROR == status && ++round < HTTP_INFLATE_ROUNDS);
+
+ if (Z_DATA_ERROR == status && HTTP_WINDOW_BITS_ANY == wbits) {
+ /* raw deflated data? */
+ inflateEnd(&Z);
+ wbits = HTTP_WINDOW_BITS_RAW;
+ goto retry_inflate;
}
-retry_inflate:
- Z.next_in = (Bytef *) data;
- Z.avail_in = data_len;
- Z.next_out = (Bytef *) *decoded;
- Z.avail_out = *decoded_len;
+ inflateEnd(&Z);
- if (Z_OK == (status = inflateInit2(&Z, wbits))) {
- status = inflate(&Z, Z_FINISH);
- inflateEnd(&Z);
-
- /* retry if it looks like we've got a zlib header */
- if (wbits == -MAX_WBITS && status == Z_DATA_ERROR) {
- wbits = MAX_WBITS;
- goto retry_inflate;
- }
-
- if (Z_STREAM_END == status) {
- (*decoded)[*decoded_len = Z.total_out] = '\0';
- return SUCCESS;
- }
+ if (Z_STREAM_END == status) {
+ *decoded_len = Z.total_out;
+ *decoded = erealloc_rel(buffer.data, *decoded_len + 1);
+ (*decoded)[*decoded_len] = '\0';
+ return SUCCESS;
+ } else {
+ phpstr_dtor(&buffer);
}
- } while (status == Z_BUF_ERROR && ++max < HTTP_ENCODING_MAXTRY);
+ }
- efree(*decoded);
http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not inflate data: %s", zError(status));
return FAILURE;
}
+/* }}} */
-PHP_HTTP_API STATUS _http_encoding_gzencode_verify(const char *data, size_t data_len, const char **encoded, size_t *encoded_len, int error_level TSRMLS_DC)
+/* {{{ http_encoding_stream *_http_encoding_deflate_stream_init(http_encoding_stream *, int) */
+PHP_HTTP_API http_encoding_stream *_http_encoding_deflate_stream_init(http_encoding_stream *s, int flags ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
{
- size_t offset = sizeof(http_encoding_gzip_header);
+ int status, level, wbits, strategy, free_stream;
- if (data_len < offset) {
- goto really_bad_gzip_header;
+ if ((free_stream = !s)) {
+ s = pemalloc_rel(sizeof(http_encoding_stream), (flags & HTTP_ENCODING_STREAM_PERSISTENT));
}
+ memset(s, 0, sizeof(http_encoding_stream));
+ s->flags = flags;
+
+ HTTP_DEFLATE_LEVEL_SET(flags, level);
+ HTTP_DEFLATE_WBITS_SET(flags, wbits);
+ HTTP_DEFLATE_STRATEGY_SET(flags, strategy);
- if (data[0] != (const char) 0x1F || data[1] != (const char) 0x8B) {
- http_error_ex(error_level TSRMLS_CC, HTTP_E_ENCODING, "Unrecognized GZIP header start: 0x%02X 0x%02X", (int) data[0], (int) (data[1] & 0xFF));
- return FAILURE;
+ if (Z_OK == (status = deflateInit2(&s->stream, level, Z_DEFLATED, wbits, MAX_MEM_LEVEL, strategy))) {
+ int p = (flags & HTTP_ENCODING_STREAM_PERSISTENT) ? PHPSTR_INIT_PERSISTENT:0;
+
+ if ((s->stream.opaque = phpstr_init_ex(NULL, HTTP_DEFLATE_BUFFER_SIZE, p))) {
+ return s;
+ }
+ deflateEnd(&s->stream);
+ status = Z_MEM_ERROR;
}
- if (data[2] != (const char) Z_DEFLATED) {
- http_error_ex(error_level TSRMLS_CC, HTTP_E_ENCODING, "Unrecognized compression format (%d)", (int) (data[2] & 0xFF));
- /* still try to decode */
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to initialize deflate encoding stream: %s", zError(status));
+ if (free_stream) {
+ efree(s);
}
- if ((data[3] & 0x4) == 0x4) {
- if (data_len < offset + 2) {
- goto really_bad_gzip_header;
- }
- /* there are extra fields, the length follows the common header as 2 bytes LSB */
- offset += (unsigned) ((data[offset] & 0xFF));
- offset += 1;
- offset += (unsigned) ((data[offset] & 0xFF) << 8);
- offset += 1;
+ return NULL;
+}
+/* }}} */
+
+/* {{{ http_encoding_stream *http_encoding_inflate_stream_init(http_encoding_stream *, int) */
+PHP_HTTP_API http_encoding_stream *_http_encoding_inflate_stream_init(http_encoding_stream *s, int flags ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
+{
+ int status, wbits, free_stream;
+
+ if ((free_stream = !s)) {
+ s = pemalloc_rel(sizeof(http_encoding_stream), (flags & HTTP_ENCODING_STREAM_PERSISTENT));
}
- if ((data[3] & 0x8) == 0x8) {
- if (data_len <= offset) {
- goto really_bad_gzip_header;
+ memset(s, 0, sizeof(http_encoding_stream));
+ s->flags = flags;
+
+ HTTP_INFLATE_WBITS_SET(flags, wbits);
+
+ if (Z_OK == (status = inflateInit2(&s->stream, wbits))) {
+ int p = (flags & HTTP_ENCODING_STREAM_PERSISTENT) ? PHPSTR_INIT_PERSISTENT:0;
+
+ if ((s->stream.opaque = phpstr_init_ex(NULL, HTTP_DEFLATE_BUFFER_SIZE, p))) {
+ return s;
}
- /* there's a file name */
- offset += strlen(&data[offset]) + 1 /*NUL*/;
+ inflateEnd(&s->stream);
+ status = Z_MEM_ERROR;
}
- if ((data[3] & 0x10) == 0x10) {
- if (data_len <= offset) {
- goto really_bad_gzip_header;
- }
- /* there's a comment */
- offset += strlen(&data[offset]) + 1 /* NUL */;
+
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to initialize inflate stream: %s", zError(status));
+ if (free_stream) {
+ efree(s);
}
- if ((data[3] & 0x2) == 0x2) {
- /* there's a CRC16 of the header */
- offset += 2;
- if (data_len <= offset) {
- goto really_bad_gzip_header;
- } else {
- ulong crc, cmp;
-
- cmp = (unsigned) ((data[offset-2] & 0xFF));
- cmp += (unsigned) ((data[offset-1] & 0xFF) << 8);
-
- crc = crc32(0L, Z_NULL, 0);
- crc = crc32(crc, (const Bytef *) data, sizeof(http_encoding_gzip_header));
+ return NULL;
+}
+/* }}} */
+
+/* {{{ STATUS http_encoding_deflate_stream_update(http_encoding_stream *, char *, size_t, char **, size_t *) */
+PHP_HTTP_API STATUS _http_encoding_deflate_stream_update(http_encoding_stream *s, const char *data, size_t data_len, char **encoded, size_t *encoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
+{
+ int status;
+
+ /* append input to our buffer */
+ phpstr_append(PHPSTR(s->stream.opaque), data, data_len);
+
+ s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque);
+ s->stream.avail_in = PHPSTR_LEN(s->stream.opaque);
+
+ /* deflate */
+ *encoded_len = HTTP_DEFLATE_BUFFER_SIZE_GUESS(data_len);
+ *encoded = emalloc_rel(*encoded_len);
+ s->stream.avail_out = *encoded_len;
+ s->stream.next_out = (Bytef *) *encoded;
+
+ switch (status = deflate(&s->stream, Z_NO_FLUSH))
+ {
+ case Z_OK:
+ case Z_STREAM_END:
+ /* cut processed chunk off the buffer */
+ phpstr_cut(PHPSTR(s->stream.opaque), 0, PHPSTR_LEN(s->stream.opaque) - s->stream.avail_in);
- if (cmp != (crc & 0xFFFF)) {
- http_error_ex(error_level TSRMLS_CC, HTTP_E_ENCODING, "GZIP headers CRC checksums so not match (%lu, %lu)", cmp, crc & 0xFFFF);
- return FAILURE;
- }
- }
+ /* size buffer down to actual size */
+ *encoded_len -= s->stream.avail_out;
+ *encoded = erealloc_rel(*encoded, *encoded_len + 1);
+ (*encoded)[*encoded_len] = '\0';
+ return SUCCESS;
+ break;
}
- if (data_len < offset + 8) {
- http_error(error_level TSRMLS_CC, HTTP_E_ENCODING, "Missing or truncated GZIP footer");
- return FAILURE;
- }
+ STR_SET(*encoded, NULL);
+ *encoded_len = 0;
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to update deflate stream: %s", zError(status));
+ return FAILURE;
+}
+/* }}} */
+
+/* {{{ STATUS http_encoding_inflate_stream_update(http_encoding_stream *, char *, size_t, char **, size_t *) */
+PHP_HTTP_API STATUS _http_encoding_inflate_stream_update(http_encoding_stream *s, const char *data, size_t data_len, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
+{
+ int status, round = 0;
- if (encoded) {
- *encoded = data + offset;
- }
- if (encoded_len) {
- *encoded_len = data_len - offset - 8 /* size of the assumed GZIP footer */;
- }
+ /* append input to buffer */
+ phpstr_append(PHPSTR(s->stream.opaque), data, data_len);
- return SUCCESS;
+ /* for realloc() */
+ *decoded = NULL;
+ *decoded_len = data_len << 1;
+
+ /* inflate */
+ do {
+ *decoded_len <<= 1;
+ *decoded = erealloc_rel(*decoded, *decoded_len);
+
+retry_raw_inflate:
+ s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque);
+ s->stream.avail_in = PHPSTR_LEN(s->stream.opaque);
+
+ s->stream.next_out = (Bytef *) *decoded;
+ s->stream.avail_out = *decoded_len;
+
+ switch (status = inflate(&s->stream, Z_NO_FLUSH))
+ {
+ case Z_OK:
+ case Z_STREAM_END:
+ /* cut off */
+ phpstr_cut(PHPSTR(s->stream.opaque), 0, PHPSTR_LEN(s->stream.opaque) - s->stream.avail_in);
+
+ /* size down */
+ *decoded_len -= s->stream.avail_out;
+ *decoded = erealloc_rel(*decoded, *decoded_len + 1);
+ (*decoded)[*decoded_len] = '\0';
+ return SUCCESS;
+ break;
+
+ case Z_DATA_ERROR:
+ /* raw deflated data ? */
+ if (!(s->flags & HTTP_INFLATE_TYPE_RAW) && !s->stream.total_out) {
+ inflateEnd(&s->stream);
+ s->flags |= HTTP_INFLATE_TYPE_RAW;
+ inflateInit2(&s->stream, HTTP_WINDOW_BITS_RAW);
+ goto retry_raw_inflate;
+ }
+ break;
+ }
+ } while (Z_BUF_ERROR == status && ++round < HTTP_INFLATE_ROUNDS);
-really_bad_gzip_header:
- http_error(error_level TSRMLS_CC, HTTP_E_ENCODING, "Missing or truncated GZIP header");
+ STR_SET(*decoded, NULL);
+ *decoded_len = 0;
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to update inflate stream: %s", zError(status));
return FAILURE;
}
+/* }}} */
-PHP_HTTP_API STATUS _http_encoding_gzdecode_verify(const char *data, size_t data_len, const char *decoded, size_t decoded_len, int error_level TSRMLS_DC)
+/* {{{ STATUS http_encoding_deflate_stream_flush(http_encoding_stream *, char **, size_t *) */
+PHP_HTTP_API STATUS _http_encoding_deflate_stream_flush(http_encoding_stream *s, char **encoded, size_t *encoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
{
- STATUS status = SUCCESS;
- ulong len, cmp, crc;
-
- crc = crc32(0L, Z_NULL, 0);
- crc = crc32(crc, (const Bytef *) decoded, decoded_len);
-
- cmp = (unsigned) ((data[data_len-8] & 0xFF));
- cmp += (unsigned) ((data[data_len-7] & 0xFF) << 8);
- cmp += (unsigned) ((data[data_len-6] & 0xFF) << 16);
- cmp += (unsigned) ((data[data_len-5] & 0xFF) << 24);
- len = (unsigned) ((data[data_len-4] & 0xFF));
- len += (unsigned) ((data[data_len-3] & 0xFF) << 8);
- len += (unsigned) ((data[data_len-2] & 0xFF) << 16);
- len += (unsigned) ((data[data_len-1] & 0xFF) << 24);
-
- if (cmp != crc) {
- http_error_ex(error_level TSRMLS_CC, HTTP_E_ENCODING, "Could not verify data integrity: CRC checksums do not match (%lu, %lu)", cmp, crc);
- status = FAILURE;
- }
- if (len != decoded_len) {
- http_error_ex(error_level TSRMLS_CC, HTTP_E_ENCODING, "Could not verify data integrity: data sizes do not match (%lu, %lu)", len, decoded_len);
- status = FAILURE;
+ int status;
+
+ *encoded_len = HTTP_DEFLATE_BUFFER_SIZE;
+ *encoded = emalloc_rel(*encoded_len);
+
+ s->stream.avail_in = 0;
+ s->stream.next_in = NULL;
+ s->stream.avail_out = *encoded_len;
+ s->stream.next_out = (Bytef *) *encoded;
+
+ switch (status = deflate(&s->stream, Z_SYNC_FLUSH))
+ {
+ case Z_OK:
+ case Z_STREAM_END:
+ *encoded_len = HTTP_DEFLATE_BUFFER_SIZE - s->stream.avail_out;
+ *encoded = erealloc_rel(*encoded, *encoded_len + 1);
+ (*encoded)[*encoded_len] = '\0';
+ return SUCCESS;
+ break;
}
- return status;
+
+ STR_SET(*encoded, NULL);
+ *encoded_len = 0;
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to flush deflate stream: %s", zError(status));
+ return FAILURE;
}
+/* }}} */
-#define HTTP_ENCODING_STREAM_ERROR(status, tofree) \
- { \
- if (tofree) efree(tofree); \
- http_error_ex(HE_WARNING, HTTP_E_ENCODING, "GZIP stream error: %s", zError(status)); \
- return FAILURE; \
- }
-
-PHP_HTTP_API STATUS _http_encoding_stream_init(http_encoding_stream *s, int gzip, int level, char **encoded, size_t *encoded_len TSRMLS_DC)
+/* {{{ STATUS http_encoding_inflate_straem_flush(http_encoding_stream *, char **, size_t *) */
+PHP_HTTP_API STATUS _http_encoding_inflate_stream_flush(http_encoding_stream *s, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
{
- STATUS status;
-
- memset(s, 0, sizeof(http_encoding_stream));
- if (Z_OK != (status = deflateInit2(&s->Z, level, Z_DEFLATED, -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY))) {
- HTTP_ENCODING_STREAM_ERROR(status, NULL);
- }
-
- if ((s->gzip = gzip)) {
- s->crc = crc32(0L, Z_NULL, 0);
- *encoded_len = sizeof(http_encoding_gzip_header);
- *encoded = emalloc(*encoded_len);
- memcpy(*encoded, http_encoding_gzip_header, *encoded_len);
- } else {
- *encoded_len = 0;
- *encoded = NULL;
- }
-
+ /* noop */
+ *decoded = estrndup("", *decoded_len = 0);
return SUCCESS;
}
+/* }}} */
-PHP_HTTP_API STATUS _http_encoding_stream_update(http_encoding_stream *s, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC)
+/* {{{ STATUS http_encoding_deflate_stream_finish(http_encoding_stream *, char **, size_t *) */
+PHP_HTTP_API STATUS _http_encoding_deflate_stream_finish(http_encoding_stream *s, char **encoded, size_t *encoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
{
- STATUS status;
+ int status;
- *encoded_len = HTTP_ENCODING_BUFLEN(data_len);
- *encoded = emalloc(*encoded_len);
+ *encoded_len = HTTP_DEFLATE_BUFFER_SIZE;
+ *encoded = emalloc_rel(*encoded_len);
- s->Z.next_in = (Bytef *) data;
- s->Z.avail_in = data_len;
- s->Z.next_out = (Bytef *) *encoded;
- s->Z.avail_out = *encoded_len;
+ /* deflate remaining input */
+ s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque);
+ s->stream.avail_in = PHPSTR_LEN(s->stream.opaque);
- status = deflate(&s->Z, Z_SYNC_FLUSH);
+ s->stream.avail_out = *encoded_len;
+ s->stream.next_out = (Bytef *) *encoded;
- if (Z_OK != status && Z_STREAM_END != status) {
- HTTP_ENCODING_STREAM_ERROR(status, *encoded);
- }
- *encoded_len -= s->Z.avail_out;
+ do {
+ status = deflate(&s->stream, Z_FINISH);
+ } while (Z_OK == status);
- if (s->gzip) {
- s->crc = crc32(s->crc, (const Bytef *) data, data_len);
+ if (Z_STREAM_END == status) {
+ /* cut processed intp off */
+ phpstr_cut(PHPSTR(s->stream.opaque), 0, PHPSTR_LEN(s->stream.opaque) - s->stream.avail_in);
+
+ /* size down */
+ *encoded_len -= s->stream.avail_out;
+ *encoded = erealloc_rel(*encoded, *encoded_len + 1);
+ (*encoded)[*encoded_len] = '\0';
+ return SUCCESS;
}
- return SUCCESS;
+ STR_SET(*encoded, NULL);
+ *encoded_len = 0;
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to finish deflate stream: %s", zError(status));
+ return FAILURE;
}
+/* }}} */
-PHP_HTTP_API STATUS _http_encoding_stream_finish(http_encoding_stream *s, char **encoded, size_t *encoded_len TSRMLS_DC)
+/* {{{ STATUS http_encoding_inflate_stream_finish(http_encoding_stream *, char **, size_t *) */
+PHP_HTTP_API STATUS _http_encoding_inflate_stream_finish(http_encoding_stream *s, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
{
- STATUS status;
+ int status;
+
+ *decoded_len = (PHPSTR_LEN(s->stream.opaque) + 1) * HTTP_INFLATE_ROUNDS;
+ *decoded = emalloc_rel(*decoded_len);
- *encoded_len = 1024;
- *encoded = emalloc(*encoded_len);
+ /* inflate remaining input */
+ s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque);
+ s->stream.avail_in = PHPSTR_LEN(s->stream.opaque);
- s->Z.next_out = (Bytef *) *encoded;
- s->Z.avail_out = *encoded_len;
+ s->stream.avail_out = *decoded_len;
+ s->stream.next_out = (Bytef *) *decoded;
- if (Z_STREAM_END != (status = deflate(&s->Z, Z_FINISH)) || Z_OK != (status = deflateEnd(&s->Z))) {
- HTTP_ENCODING_STREAM_ERROR(status, *encoded);
+ if (Z_STREAM_END == (status = inflate(&s->stream, Z_FINISH))) {
+ /* cut processed input off */
+ phpstr_cut(PHPSTR(s->stream.opaque), 0, PHPSTR_LEN(s->stream.opaque) - s->stream.avail_in);
+
+ /* size down */
+ *decoded_len -= s->stream.avail_out;
+ *decoded = erealloc_rel(*decoded, *decoded_len + 1);
+ (*decoded)[*decoded_len] = '\0';
+ return SUCCESS;
}
- *encoded_len -= s->Z.avail_out;
- if (s->gzip) {
- if (s->Z.avail_out < 8) {
- *encoded = erealloc(*encoded, *encoded_len + 8);
+ STR_SET(*decoded, NULL);
+ *decoded_len = 0;
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to finish inflate stream: %s", zError(status));
+ return FAILURE;
+}
+/* }}} */
+
+/* {{{ void http_encoding_deflate_stream_dtor(http_encoding_stream *) */
+PHP_HTTP_API void _http_encoding_deflate_stream_dtor(http_encoding_stream *s TSRMLS_DC)
+{
+ if (s) {
+ if (s->stream.opaque) {
+ phpstr_free((phpstr **) &s->stream.opaque);
}
- (*encoded)[(*encoded_len)++] = (char) (s->crc & 0xFF);
- (*encoded)[(*encoded_len)++] = (char) ((s->crc >> 8) & 0xFF);
- (*encoded)[(*encoded_len)++] = (char) ((s->crc >> 16) & 0xFF);
- (*encoded)[(*encoded_len)++] = (char) ((s->crc >> 24) & 0xFF);
- (*encoded)[(*encoded_len)++] = (char) ((s->Z.total_in) & 0xFF);
- (*encoded)[(*encoded_len)++] = (char) ((s->Z.total_in >> 8) & 0xFF);
- (*encoded)[(*encoded_len)++] = (char) ((s->Z.total_in >> 16) & 0xFF);
- (*encoded)[(*encoded_len)++] = (char) ((s->Z.total_in >> 24) & 0xFF);
+ deflateEnd(&s->stream);
}
-
- return SUCCESS;
}
+/* }}} */
-#endif /* HTTP_HAVE_ZLIB */
+/* {{{ void http_encoding_inflate_stream_dtor(http_encoding_stream *) */
+PHP_HTTP_API void _http_encoding_inflate_stream_dtor(http_encoding_stream *s TSRMLS_DC)
+{
+ if (s) {
+ if (s->stream.opaque) {
+ phpstr_free((phpstr **) &s->stream.opaque);
+ }
+ inflateEnd(&s->stream);
+ }
+}
+/* }}} */
-PHP_HTTP_API zend_bool _http_encoding_response_start(size_t content_length TSRMLS_DC)
+/* {{{ void http_encoding_deflate_stream_free(http_encoding_stream **) */
+PHP_HTTP_API void _http_encoding_deflate_stream_free(http_encoding_stream **s TSRMLS_DC)
{
- if ( php_ob_handler_used("ob_gzhandler" TSRMLS_CC) ||
- php_ob_handler_used("zlib output compression" TSRMLS_CC)) {
- HTTP_G(send).gzip_encoding = 0;
- } else {
- if (!HTTP_G(send).gzip_encoding) {
- /* emit a content-length header */
- if (content_length) {
- char cl_header_str[128];
- size_t cl_header_len;
- cl_header_len = snprintf(cl_header_str, lenof(cl_header_str), "Content-Length: %zu", content_length);
- http_send_header_string_ex(cl_header_str, cl_header_len, 1);
- }
- } else {
-#ifndef HTTP_HAVE_ZLIB
- HTTP_G(send).gzip_encoding = 0;
- php_start_ob_buffer_named("ob_gzhandler", 0, 0 TSRMLS_CC);
-#else
- HashTable *selected;
- zval zsupported;
+ if (s) {
+ http_encoding_deflate_stream_dtor(*s);
+ if (*s) {
+ pefree(*s, (*s)->flags & HTTP_ENCODING_STREAM_PERSISTENT);
+ }
+ *s = NULL;
+ }
+}
+/* }}} */
+
+/* {{{ void http_encoding_inflate_stream_free(http_encoding_stream **) */
+PHP_HTTP_API void _http_encoding_inflate_stream_free(http_encoding_stream **s TSRMLS_DC)
+{
+ if (s) {
+ http_encoding_inflate_stream_dtor(*s);
+ if (*s) {
+ pefree(*s, (*s)->flags & HTTP_ENCODING_STREAM_PERSISTENT);
+ }
+ *s = NULL;
+ }
+}
+/* }}} */
+
+/* {{{ void http_ob_deflatehandler(char *, uint, char **, uint *, int) */
+void _http_ob_deflatehandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
+{
+ *handled_output = NULL;
+ *handled_output_len = 0;
+
+ if (mode & PHP_OUTPUT_HANDLER_START) {
+ int flags;
+
+ if (HTTP_G->send.deflate.stream) {
+ zend_error(E_ERROR, "ob_deflatehandler() can only be used once");
+ return;
+ }
+
+ HTTP_G->send.deflate.encoding = !0;
+
+ switch (http_encoding_response_start(0))
+ {
+ case HTTP_ENCODING_GZIP:
+ flags = HTTP_DEFLATE_TYPE_GZIP;
+ break;
- INIT_PZVAL(&zsupported);
- array_init(&zsupported);
- add_next_index_stringl(&zsupported, "gzip", lenof("gzip"), 1);
- add_next_index_stringl(&zsupported, "deflate", lenof("deflate"), 1);
+ case HTTP_ENCODING_DEFLATE:
+ flags = HTTP_DEFLATE_TYPE_ZLIB;
+ break;
- HTTP_G(send).gzip_encoding = 0;
+ default:
+ goto deflate_passthru_plain;
+ break;
+ }
+
+ flags |= (HTTP_G->send.deflate.start_flags &~ 0xf0);
+ HTTP_G->send.deflate.stream = http_encoding_deflate_stream_init(NULL, flags);
+ }
+
+ if (HTTP_G->send.deflate.stream) {
+ http_encoding_deflate_stream_update((http_encoding_stream *) HTTP_G->send.deflate.stream, output, output_len, handled_output, handled_output_len);
+
+ if (mode & PHP_OUTPUT_HANDLER_END) {
+ char *remaining = NULL;
+ size_t remaining_len = 0;
- if ((selected = http_negotiate_encoding(&zsupported))) {
- STATUS hs = FAILURE;
- char *encoding = NULL;
- ulong idx;
-
- if (HASH_KEY_IS_STRING == zend_hash_get_current_key(selected, &encoding, &idx, 0) && encoding) {
- if (!strcmp(encoding, "gzip")) {
- if (SUCCESS == (hs = http_send_header_string("Content-Encoding: gzip"))) {
- HTTP_G(send).gzip_encoding = HTTP_ENCODING_GZIP;
- }
- } else if (!strcmp(encoding, "deflate")) {
- if (SUCCESS == (hs = http_send_header_string("Content-Encoding: deflate"))) {
- HTTP_G(send).gzip_encoding = HTTP_ENCODING_DEFLATE;
- }
- }
- if (SUCCESS == hs) {
- http_send_header_string("Vary: Accept-Encoding");
- }
- }
-
- zend_hash_destroy(selected);
- FREE_HASHTABLE(selected);
+ http_encoding_deflate_stream_finish((http_encoding_stream *) HTTP_G->send.deflate.stream, &remaining, &remaining_len);
+ http_encoding_deflate_stream_free((http_encoding_stream **) &HTTP_G->send.deflate.stream);
+ if (remaining) {
+ *handled_output = erealloc(*handled_output, *handled_output_len + remaining_len + 1);
+ memcpy(*handled_output + *handled_output_len, remaining, remaining_len);
+ (*handled_output)[*handled_output_len += remaining_len] = '\0';
+ efree(remaining);
}
+ }
+ } else {
+deflate_passthru_plain:
+ *handled_output = estrndup(output, *handled_output_len = output_len);
+ }
+}
+/* }}} */
+
+/* {{{ void http_ob_inflatehandler(char *, uint, char **, uint *, int) */
+void _http_ob_inflatehandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
+{
+ *handled_output = NULL;
+ *handled_output_len = 0;
+
+ if (mode & PHP_OUTPUT_HANDLER_START) {
+ if (HTTP_G->send.inflate.stream) {
+ zend_error(E_ERROR, "ob_inflatehandler() can only be used once");
+ return;
+ }
+ HTTP_G->send.inflate.stream = http_encoding_inflate_stream_init(NULL, (HTTP_G->send.inflate.start_flags &~ 0xf0));
+ }
+
+ if (HTTP_G->send.inflate.stream) {
+ http_encoding_inflate_stream_update((http_encoding_stream *) HTTP_G->send.inflate.stream, output, output_len, handled_output, handled_output_len);
+
+ if (mode & PHP_OUTPUT_HANDLER_END) {
+ char *remaining = NULL;
+ size_t remaining_len = 0;
- zval_dtor(&zsupported);
- return HTTP_G(send).gzip_encoding;
-#endif
+ http_encoding_inflate_stream_finish((http_encoding_stream *) HTTP_G->send.inflate.stream, &remaining, &remaining_len);
+ http_encoding_inflate_stream_free((http_encoding_stream **) &HTTP_G->send.inflate.stream);
+ if (remaining) {
+ *handled_output = erealloc(*handled_output, *handled_output_len + remaining_len + 1);
+ memcpy(*handled_output + *handled_output_len, remaining, remaining_len);
+ (*handled_output)[*handled_output_len += remaining_len] = '\0';
+ efree(remaining);
+ }
}
+ } else {
+ *handled_output = estrndup(output, *handled_output_len = output_len);
}
- return 0;
}
+/* }}} */
+
+#endif /* HTTP_HAVE_ZLIB */
/*
* Local variables: