X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_encoding_api.c;h=28ea4232d2627dcf2d5d5e61e51f6ec1ac0eafe1;hb=a8eb47f443e1ead6b1b2d79000f0b89374a92629;hp=a8d3ec0e048c6a6e96f97d5c3bdc3e1186734c03;hpb=ac76ec181d08202752bce22300fd8005efb1947c;p=m6w6%2Fext-http

diff --git a/http_encoding_api.c b/http_encoding_api.c
index a8d3ec0..28ea423 100644
--- a/http_encoding_api.c
+++ b/http_encoding_api.c
@@ -261,6 +261,11 @@ inline STATUS http_verify_gzencode_buffer(const char *data, size_t data_len, con
 		}
 	}
 	
+	if (data_len < offset + 8) {
+		http_error(error_level TSRMLS_CC, HTTP_E_ENCODING, "Missing or truncated GZIP footer");
+		return FAILURE;
+	}
+	
 	if (encoded) {
 		*encoded = data + offset;
 	}
@@ -303,6 +308,71 @@ 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;