#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+
+#define HTTP_WANT_ZLIB
#include "php_http.h"
#include "php_http_api.h"
return FAILURE;
}
- Z.zalloc = Z_NULL;
- Z.zfree = Z_NULL;
- Z.opaque = Z_NULL;
+ *encoded = NULL;
+ *encoded_len = 0;
+ memset(&Z, 0, sizeof(z_stream));
+
Z.next_in = (Bytef *) data;
Z.avail_in = data_len;
Z.avail_out = HTTP_ENCODING_BUFLEN(data_len) + HTTP_ENCODING_SAFPAD - 1;
}
}
- efree(*encoded);
+ STR_SET(*encoded, NULL);
http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not gzencode data: %s", zError(status));
return FAILURE;
}
z_stream Z;
STATUS status = Z_OK;
- Z.zalloc = Z_NULL;
- Z.zfree = Z_NULL;
- Z.opaque = Z_NULL;
+ *encoded = NULL;
+ *encoded_len = 0;
+ memset(&Z, 0, sizeof(z_stream));
+
Z.data_type = Z_UNKNOWN;
Z.next_in = (Bytef *) data;
Z.avail_in = data_len;
}
}
- efree(encoded);
+ STR_SET(*encoded, NULL);
http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not deflate data: %s", zError(status));
return FAILURE;
}
STATUS status;
z_stream Z;
+ *decoded = NULL;
+ *decoded_len = 0;
+ memset(&Z, 0, sizeof(z_stream));
+
do {
- Z.zalloc = Z_NULL;
- Z.zfree = Z_NULL;
-
if (!max) {
*decoded_len = data_len * 2;
*decoded = emalloc(*decoded_len + 1);
}
} while (status == Z_BUF_ERROR && ++max < HTTP_ENCODING_MAXTRY);
- efree(*decoded);
+ STR_SET(*decoded, NULL);
http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not inflate data: %s", zError(status));
return FAILURE;
}
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)
+PHP_HTTP_API STATUS _http_encoding_stream_init(http_encoding_stream *s, int flags, int level, char **encoded, size_t *encoded_len TSRMLS_DC)
{
STATUS status;
+ int wbits = (flags & HTTP_ENCODING_STREAM_ZLIB_HEADER) ? MAX_WBITS : -MAX_WBITS;
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))) {
+ if (Z_OK != (status = deflateInit2(&s->Z, level, Z_DEFLATED, wbits, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY))) {
HTTP_ENCODING_STREAM_ERROR(status, NULL);
}
- if ((s->gzip = gzip)) {
+ s->persistent = (flags & HTTP_ENCODING_STREAM_PERSISTENT);
+ if ((s->gzip = (flags & HTTP_ENCODING_STREAM_GZIP_HEADER))) {
s->crc = crc32(0L, Z_NULL, 0);
*encoded_len = sizeof(http_encoding_gzip_header);
- *encoded = emalloc(*encoded_len);
+ *encoded = pemalloc(*encoded_len, s->persistent);
memcpy(*encoded, http_encoding_gzip_header, *encoded_len);
} else {
*encoded_len = 0;
STATUS status;
*encoded_len = HTTP_ENCODING_BUFLEN(data_len);
- *encoded = emalloc(*encoded_len);
+ *encoded = pemalloc(*encoded_len, s->persistent);
s->Z.next_in = (Bytef *) data;
s->Z.avail_in = data_len;
STATUS status;
*encoded_len = 1024;
- *encoded = emalloc(*encoded_len);
+ *encoded = pemalloc(*encoded_len, s->persistent);
s->Z.next_out = (Bytef *) *encoded;
s->Z.avail_out = *encoded_len;
*encoded_len -= s->Z.avail_out;
if (s->gzip) {
if (s->Z.avail_out < 8) {
- *encoded = erealloc(*encoded, *encoded_len + 8);
+ *encoded = perealloc(*encoded, *encoded_len + 8, s->persistent);
}
(*encoded)[(*encoded_len)++] = (char) (s->crc & 0xFF);
(*encoded)[(*encoded_len)++] = (char) ((s->crc >> 8) & 0xFF);
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);
HTTP_G(send).gzip_encoding = 0;
ulong idx;
if (HASH_KEY_IS_STRING == zend_hash_get_current_key(selected, &encoding, &idx, 0) && encoding) {
- if (!strcmp(encoding, "gzip")) {
+ if (!strcmp(encoding, "gzip") || !strcmp(encoding, "x-gzip")) {
if (SUCCESS == (hs = http_send_header_string("Content-Encoding: gzip"))) {
HTTP_G(send).gzip_encoding = HTTP_ENCODING_GZIP;
}