X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_encoding_api.c;h=5d1a908b5bfae52bab857d5b3c67e33695cfae5d;hp=d1ce3da984441d1a839590c642aa6ed68c9433ed;hb=c986ec1a6abc7c4295d2fd9b666c106db17320ea;hpb=2b1bdfab2a6402e4daec69f6b7c395b0662e18d7

diff --git a/http_encoding_api.c b/http_encoding_api.c
index d1ce3da..5d1a908 100644
--- a/http_encoding_api.c
+++ b/http_encoding_api.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -18,80 +15,97 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
-
-#include "php_http_encoding_api.h"
 #include "php_http.h"
-#include "php_http_api.h"
 
-#ifdef HTTP_HAVE_ZLIB
-#	include "php_http_send_api.h"
-#	include "php_http_headers_api.h"
-#	include <zlib.h>
-#endif
+#include "php_http_api.h"
+#include "php_http_encoding_api.h"
+#include "php_http_send_api.h"
+#include "php_http_headers_api.h"
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
+static inline int eol_match(char **line, int *eol_len)
+{
+	char *ptr = *line;
+	
+	while (0x20 == *ptr) ++ptr;
+
+	if (ptr == http_locate_eol(*line, eol_len)) {
+		*line = ptr;
+		return 1;
+	} else {
+		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)
 {
-	const char *e_ptr;
-	char *d_ptr;
-	long rest;
+	int eol_len = 0;
+	char *n_ptr = NULL;
+	const char *e_ptr = encoded;
 	
 	*decoded_len = 0;
 	*decoded = ecalloc(1, encoded_len);
-	d_ptr = *decoded;
-	e_ptr = encoded;
 
-	while ((rest = encoded + encoded_len - e_ptr) > 0) {
-		long chunk_len = 0;
-		int EOL_len = 0, eol_mismatch = 0;
-		char *n_ptr;
+	while ((encoded + encoded_len - e_ptr) > 0) {
+		ulong chunk_len = 0, rest;
 
-		chunk_len = strtol(e_ptr, &n_ptr, 16);
+		chunk_len = strtoul(e_ptr, &n_ptr, 16);
 
-		/* check if:
-		 * - we could not read in chunk size
-		 * - we got a negative chunk size
-		 * - chunk size is greater then remaining size
-		 * - chunk size is not followed by (CR)LF|NUL
-		 */
-		if (	(n_ptr == e_ptr) ||	(chunk_len < 0) || (chunk_len > rest) || 
-				(*n_ptr && (eol_mismatch = (n_ptr != http_locate_eol(e_ptr, &EOL_len))))) {
-			/* don't fail on apperently not encoded data */
+		/* we could not read in chunk size */
+		if (n_ptr == e_ptr) {
+			/*
+			 * if this is the first turn and there doesn't seem to be a chunk
+			 * size at the begining of the body, do not fail on apparently
+			 * not encoded data and return a copy
+			 */
 			if (e_ptr == encoded) {
+				http_error(HE_NOTICE, HTTP_E_ENCODING, "Data does not seem to be chunked encoded");
 				memcpy(*decoded, encoded, encoded_len);
 				*decoded_len = encoded_len;
 				return encoded + encoded_len;
 			} else {
 				efree(*decoded);
-				if (eol_mismatch) {
-					if (EOL_len == 2) {
-						http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0D 0x0A; got: 0x%X 0x%X)", *n_ptr, *(n_ptr + 1));
-					} else {
-						http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0A; got: 0x%X)", *n_ptr);
-					}
-				} else {
-					char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n "));
-					http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
-					efree(error);
-				}
+				http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Expected chunk size at pos %tu of %zu but got trash", n_ptr - encoded, encoded_len);
 				return NULL;
 			}
-		} else {
-			e_ptr = n_ptr;
 		}
-
+		
 		/* reached the end */
 		if (!chunk_len) {
+			/* move over '0' chunked encoding terminator */
+			while (*e_ptr == '0') ++e_ptr;
 			break;
 		}
 
-		memcpy(d_ptr, e_ptr += EOL_len, chunk_len);
-		d_ptr += chunk_len;
-		e_ptr += chunk_len + EOL_len;
+		/* there should be CRLF after the chunk size, but we'll ignore SP+ too */
+		if (*n_ptr && !eol_match(&n_ptr, &eol_len)) {
+			if (eol_len == 2) {
+				http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Expected CRLF at pos %tu of %zu but got 0x%02X 0x%02X", n_ptr - encoded, encoded_len, *n_ptr, *(n_ptr + 1));
+			} else {
+				http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Expected LF at pos %tu of %zu but got 0x%02X", n_ptr - encoded, encoded_len, *n_ptr);
+			}
+		}
+		n_ptr += eol_len;
+		
+		/* chunk size pretends more data than we actually got, so it's probably a truncated message */
+		if (chunk_len > (rest = encoded + encoded_len - n_ptr)) {
+			http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Truncated message: chunk size %lu exceeds remaining data size %lu at pos %tu of %zu", chunk_len, rest, n_ptr - encoded, encoded_len);
+			chunk_len = rest;
+		}
+
+		/* copy the chunk */
+		memcpy(*decoded + *decoded_len, n_ptr, chunk_len);
 		*decoded_len += chunk_len;
+		
+		if (chunk_len == rest) {
+			e_ptr = n_ptr + chunk_len;
+			break;
+		} else {
+			/* advance to next chunk */
+			e_ptr = n_ptr + chunk_len + eol_len;
+		}
 	}
 
 	return e_ptr;
@@ -105,106 +119,183 @@ static const char http_encoding_gzip_header[] = {
 	(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,				// no MTIME available (4 bytes)
+	(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
-	(const char) 0x03			// assume *nix OS
+#ifdef PHP_WIN32
+	(const char) 0x0b			// OS_CODE
+#else
+	(const char) 0x03			// OS_CODE
+#endif
 };
 
-inline void http_init_gzencode_buffer(z_stream *Z, const char *data, size_t data_len, char **buf_ptr)
+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)
 {
-	Z->zalloc = Z_NULL;
-	Z->zfree  = Z_NULL;
-	Z->opaque = Z_NULL;
+	z_stream Z;
+	STATUS status = Z_OK;
 	
-	Z->next_in   = (Bytef *) data;
-	Z->avail_in  = data_len;
-	Z->avail_out = HTTP_ENCODING_BUFLEN(data_len) + HTTP_ENCODING_SAFPAD - 1;
+	if (!(data && data_len)) {
+		return FAILURE;
+	}
 	
-	*buf_ptr = emalloc(HTTP_ENCODING_BUFLEN(data_len) + sizeof(http_encoding_gzip_header) + HTTP_ENCODING_SAFPAD);
-	memcpy(*buf_ptr, http_encoding_gzip_header, sizeof(http_encoding_gzip_header));
+	*encoded = NULL;
+	*encoded_len = 0;
+	memset(&Z, 0, sizeof(z_stream));
 	
-	Z->next_out = *buf_ptr + sizeof(http_encoding_gzip_header);
-}
-
-inline void http_init_deflate_buffer(z_stream *Z, const char *data, size_t data_len, char **buf_ptr)
-{
-	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));
+	Z.next_in   = (Bytef *) data;
+	Z.avail_in  = data_len;
+	Z.avail_out = HTTP_ENCODING_BUFLEN(data_len) + HTTP_ENCODING_SAFPAD - 1;
 	
-	*buf_ptr = Z->next_out;
-}
-
-inline void http_init_uncompress_buffer(size_t data_len, char **buf_ptr, size_t *buf_len, int *iteration)
-{
-	if (!*iteration) {
-		*buf_len = data_len * 2;
-		*buf_ptr = emalloc(*buf_len + 1);
-	} else {
-		size_t new_len = *buf_len << 2;
-		char *new_ptr = erealloc_recoverable(*buf_ptr, new_len + 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 (new_ptr) {
-			*buf_ptr = new_ptr;
-			*buf_len = new_len;
-		} else {
-			*iteration = INT_MAX-1; /* avoid integer overflow on increment op */
+		if (Z_STREAM_END == status) {
+			ulong crc;
+			char *trailer;
+			
+			crc = crc32(0L, Z_NULL, 0);
+			crc = crc32(crc, (const Bytef *) data, data_len);
+			
+			trailer = *encoded + sizeof(http_encoding_gzip_header) + Z.total_out;
+			
+			/* 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);
+			
+			*encoded_len = Z.total_out + sizeof(http_encoding_gzip_header) + 8;
+			(*encoded)[*encoded_len] = '\0';
+			return SUCCESS;
 		}
 	}
+	
+	STR_SET(*encoded, NULL);
+	http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not gzencode data: %s", zError(status));
+	return FAILURE;
 }
 
-inline void http_init_inflate_buffer(z_stream *Z, const char *data, size_t data_len, char **buf_ptr, size_t *buf_len, int *iteration)
+PHP_HTTP_API STATUS _http_encoding_gzdecode(const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC)
 {
-	Z->zalloc = Z_NULL;
-	Z->zfree  = Z_NULL;
+	const char *encoded;
+	size_t encoded_len;
 	
-	http_init_uncompress_buffer(data_len, buf_ptr, buf_len, iteration);
+	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;
+	}
 	
-	Z->next_in   = (Bytef *) data;
-	Z->avail_in  = data_len;
-	Z->avail_out = *buf_len;
-	Z->next_out  = *buf_ptr;
+	return FAILURE;
 }
 
-inline size_t http_finish_buffer(size_t buf_len, char **buf_ptr)
+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)
 {
-	(*buf_ptr)[buf_len] = '\0';
-	return buf_len;
+	z_stream Z;
+	STATUS status = Z_OK;
+	
+	*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;
+	Z.avail_out = HTTP_ENCODING_BUFLEN(data_len) - 1;
+	Z.next_out  = emalloc(HTTP_ENCODING_BUFLEN(data_len));
+	
+	*encoded = (char *) Z.next_out;
+	
+	if (Z_OK == (status = deflateInit2(&Z, level, Z_DEFLATED, zhdr ? MAX_WBITS : -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY))) {
+		status = deflate(&Z, Z_FINISH);
+		deflateEnd(&Z);
+		
+		if (Z_STREAM_END == status) {
+			(*encoded)[*encoded_len = Z.total_out] = '\0';
+			return SUCCESS;
+		}
+	}
+	
+	STR_SET(*encoded, NULL);
+	http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not deflate data: %s", zError(status));
+	return FAILURE;
 }
 
-inline size_t http_finish_gzencode_buffer(z_stream *Z, const char *data, size_t data_len, char **buf_ptr)
+PHP_HTTP_API STATUS _http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC)
 {
-	unsigned long crc;
-	char *trailer;
-	
-	crc = crc32(0L, Z_NULL, 0);
-	crc = crc32(crc, (const Bytef *) data, data_len);
+	int max = 0, wbits = -MAX_WBITS;
+	STATUS status;
+	z_stream Z;
 	
-	trailer = *buf_ptr + sizeof(http_encoding_gzip_header) + Z->total_out;
+	*decoded = NULL;
+	*decoded_len = 0;
+	memset(&Z, 0, sizeof(z_stream));
 	
-	/* 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);
+	do {
+		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 */
+			}
+		}
+		
+retry_inflate:
+		Z.next_in   = (Bytef *) data;
+		Z.avail_in  = data_len;
+		Z.next_out  = (Bytef *) *decoded;
+		Z.avail_out = *decoded_len;
+		
+		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;
+			}
+		}
+	} while (status == Z_BUF_ERROR && ++max < HTTP_ENCODING_MAXTRY);
 	
-	return http_finish_buffer(Z->total_out + sizeof(http_encoding_gzip_header) + 8, buf_ptr);
+	STR_SET(*decoded, NULL);
+	http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not inflate data: %s", zError(status));
+	return FAILURE;
 }
 
-inline STATUS http_verify_gzencode_buffer(const char *data, size_t data_len, const char **encoded, size_t *encoded_len, int error_level TSRMLS_DC)
+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)
 {
 	size_t offset = sizeof(http_encoding_gzip_header);
 	
@@ -251,13 +342,13 @@ inline STATUS http_verify_gzencode_buffer(const char *data, size_t data_len, con
 		if (data_len <= offset) {
 			goto really_bad_gzip_header;
 		} else {
-			unsigned long crc, cmp;
+			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, data, sizeof(http_encoding_gzip_header));
+			crc = crc32(crc, (const Bytef *) data, sizeof(http_encoding_gzip_header));
 			
 			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);
@@ -285,10 +376,10 @@ really_bad_gzip_header:
 	return FAILURE;
 }
 
-inline STATUS http_verify_gzdecode_buffer(const char *data, size_t data_len, const char *decoded, size_t decoded_len, int error_level TSRMLS_DC)
+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 status = SUCCESS;
-	unsigned long len, cmp, crc;
+	ulong len, cmp, crc;
 	
 	crc = crc32(0L, Z_NULL, 0);
 	crc = crc32(crc, (const Bytef *) decoded, decoded_len);
@@ -313,180 +404,6 @@ inline STATUS http_verify_gzdecode_buffer(const char *data, size_t data_len, con
 	return status;
 }
 
-PHP_HTTP_API STATUS _http_encode(http_encoding_type type, int level, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC)
-{
-	STATUS status = SUCCESS;
-	
-	switch (type)
-	{
-		case HTTP_ENCODING_ANY:
-		case HTTP_ENCODING_GZIP:
-			status = http_encoding_gzencode(level, data, data_len, encoded, encoded_len);
-		break;
-		
-		case HTTP_ENCODING_DEFLATE:
-			status = http_encoding_deflate(level, data, data_len, encoded, encoded_len);
-		break;
-		
-		case HTTP_ENCODING_COMPRESS:
-			status = http_encoding_compress(level, data, data_len, encoded, encoded_len);
-		break;
-		
-		case HTTP_ENCODING_NONE:
-		default:
-			*encoded = estrndup(data, data_len);
-			*encoded_len = data_len;
-		break;
-	}
-	
-	return status;
-}
-
-PHP_HTTP_API STATUS _http_decode(http_encoding_type type, const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC)
-{
-	STATUS status = SUCCESS;
-	
-	switch (type)
-	{
-		case HTTP_ENCODING_ANY:
-			if (	SUCCESS != http_encoding_gzdecode(data, data_len, decoded, decoded_len) &&
-					SUCCESS != http_encoding_inflate(data, data_len, decoded, decoded_len) &&
-					SUCCESS != http_encoding_uncompress(data, data_len, decoded, decoded_len)) {
-				status = FAILURE;
-			}
-		break;
-		
-		case HTTP_ENCODING_GZIP:
-			status = http_encoding_gzdecode(data, data_len, decoded, decoded_len);
-		break;
-		
-		case HTTP_ENCODING_DEFLATE:
-			status = http_encoding_inflate(data, data_len, decoded, decoded_len);
-		break;
-		
-		case HTTP_ENCODING_COMPRESS:
-			status = http_encoding_uncompress(data, data_len, decoded, decoded_len);
-		break;
-		
-		case HTTP_ENCODING_NONE:
-		default:
-			*decoded = estrndup(data, data_len);
-			*decoded_len = data_len;
-		break;
-	}
-	
-	return status;
-}
-
-PHP_HTTP_API STATUS _http_encoding_gzencode(int level, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC)
-{
-	z_stream Z;
-	STATUS status = Z_OK;
-	
-	http_init_gzencode_buffer(&Z, data, data_len, encoded);
-	
-	if (	(Z_OK == (status = deflateInit2(&Z, level, Z_DEFLATED, -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY))) &&
-			(Z_STREAM_END == (status = deflate(&Z, Z_FINISH))) &&
-			(Z_OK == (status = deflateEnd(&Z)))) {
-		*encoded_len = http_finish_gzencode_buffer(&Z, data, data_len, encoded);
-		return SUCCESS;
-	}
-	
-	efree(*encoded);
-	http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not gzencode data: %s", zError(status));
-	return FAILURE;
-}
-
-PHP_HTTP_API STATUS _http_encoding_deflate(int level, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC)
-{
-	z_stream Z;
-	STATUS status = Z_OK;
-	
-	http_init_deflate_buffer(&Z, data, data_len, encoded);
-	
-	if (	(Z_OK == (status = deflateInit2(&Z, level, Z_DEFLATED, -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY))) &&
-			(Z_STREAM_END == (status = deflate(&Z, Z_FINISH))) &&
-			(Z_OK == (status = deflateEnd(&Z)))) {
-		*encoded_len = http_finish_buffer(Z.total_out, encoded);
-		return SUCCESS;
-	}
-	
-	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_compress(int level, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC)
-{
-	STATUS status;
-	
-	*encoded = emalloc(*encoded_len = HTTP_ENCODING_BUFLEN(data_len));
-	
-	if (Z_OK == (status = compress2(*encoded, encoded_len, data, data_len, level))) {
-		http_finish_buffer(*encoded_len, encoded);
-		return SUCCESS;
-	}
-	
-	efree(encoded);
-	http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not compress data: %s", zError(status));
-	return FAILURE;
-}
-
-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 (	(SUCCESS == http_verify_gzencode_buffer(data, data_len, &encoded, &encoded_len, HE_NOTICE)) &&
-			(SUCCESS == http_encoding_inflate(encoded, encoded_len, decoded, decoded_len))) {
-		http_verify_gzdecode_buffer(data, data_len, *decoded, *decoded_len, HE_NOTICE);
-		return SUCCESS;
-	}
-	
-	return FAILURE;
-}
-
-PHP_HTTP_API STATUS _http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC)
-{
-	int max = 0;
-	STATUS status;
-	z_stream Z;
-	
-	do {
-		http_init_inflate_buffer(&Z, data, data_len, decoded, decoded_len, &max);
-		if (Z_OK == (status = inflateInit2(&Z, -MAX_WBITS))) {
-			if (Z_STREAM_END == (status = inflate(&Z, Z_FINISH))) {
-				if (Z_OK == (status = inflateEnd(&Z))) {
-					*decoded_len = http_finish_buffer(Z.total_out, decoded);
-					return SUCCESS;
-				}
-			}
-		}
-	} while (++max < HTTP_ENCODING_MAXTRY && status == Z_BUF_ERROR);
-	
-	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_uncompress(const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC)
-{
-	int max = 0;
-	STATUS status;
-	
-	do {
-		http_init_uncompress_buffer(data_len, decoded, decoded_len, &max);
-		if (Z_OK == (status = uncompress(*decoded, decoded_len, data, data_len))) {
-			http_finish_buffer(*decoded_len, decoded);
-			return SUCCESS;
-		}
-	} while (++max < HTTP_ENCODING_MAXTRY && status == Z_BUF_ERROR);
-	
-	efree(*decoded);
-	http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not uncompress data: %s", zError(status));
-	return FAILURE;
-}
-
 #define HTTP_ENCODING_STREAM_ERROR(status, tofree) \
 	{ \
 		if (tofree) efree(tofree); \
@@ -503,7 +420,7 @@ PHP_HTTP_API STATUS _http_encoding_stream_init(http_encoding_stream *s, int gzip
 		HTTP_ENCODING_STREAM_ERROR(status, NULL);
 	}
 	
-	if (s->gzip = gzip) {
+	if ((s->gzip = gzip)) {
 		s->crc = crc32(0L, Z_NULL, 0);
 		*encoded_len = sizeof(http_encoding_gzip_header);
 		*encoded = emalloc(*encoded_len);
@@ -525,7 +442,7 @@ PHP_HTTP_API STATUS _http_encoding_stream_update(http_encoding_stream *s, const
 	
 	s->Z.next_in = (Bytef *) data;
 	s->Z.avail_in = data_len;
-	s->Z.next_out = *encoded;
+	s->Z.next_out = (Bytef *) *encoded;
 	s->Z.avail_out = *encoded_len;
 	
 	status = deflate(&s->Z, Z_SYNC_FLUSH);
@@ -549,7 +466,7 @@ PHP_HTTP_API STATUS _http_encoding_stream_finish(http_encoding_stream *s, char *
 	*encoded_len = 1024;
 	*encoded = emalloc(*encoded_len);
 	
-	s->Z.next_out = *encoded;
+	s->Z.next_out = (Bytef *) *encoded;
 	s->Z.avail_out = *encoded_len;
 	
 	if (Z_STREAM_END != (status = deflate(&s->Z, Z_FINISH)) || Z_OK != (status = deflateEnd(&s->Z))) {
@@ -587,7 +504,7 @@ PHP_HTTP_API zend_bool _http_encoding_response_start(size_t content_length TSRML
 			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: %lu", (unsigned long) content_length);
+				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 {
@@ -601,17 +518,18 @@ PHP_HTTP_API zend_bool _http_encoding_response_start(size_t content_length TSRML
 			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;
 			
-			if (selected = http_negotiate_encoding(&zsupported)) {
+			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 (!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;
 						}