#define HTTP_WINDOW_BITS_ANY 0x0000002f
#define HTTP_WINDOW_BITS_RAW -0x000000f
-STATUS _http_encoding_deflate(int flags, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC)
+PHP_HTTP_API STATUS _http_encoding_deflate(int flags, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC)
{
int status, level, wbits, strategy;
z_stream Z;
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(*encoded, Z.total_out + 1);
(*encoded)[*encoded_len = Z.total_out] = '\0';
- deflateEnd(&Z);
return SUCCESS;
} else {
STR_SET(*encoded, NULL);
}
}
- http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not deflate data: %s (%s)", zError(status), Z.msg);
- deflateEnd(&Z);
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not deflate data: %s (%s)", zError(status));
return FAILURE;
}
-STATUS _http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC)
+PHP_HTTP_API STATUS _http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC)
{
int status, max = 0, wbits = HTTP_WINDOW_BITS_ANY;
z_stream Z;
Z.avail_in = data_len;
do {
- phpstr_resize(&buffer, data_len);
+ phpstr_resize(&buffer, data_len << 2);
do {
- Z.next_out = buffer.data + (buffer.used += Z.total_out);
- Z.avail_out = (buffer.free -= Z.total_out);
+ 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 && ++max < HTTP_ENCODING_MAXTRY);
if (Z_DATA_ERROR == status && HTTP_WINDOW_BITS_ANY == wbits) {
goto retry_inflate;
}
+ inflateEnd(&Z);
+
if (Z_STREAM_END == status) {
- *decoded = erealloc(buffer.data, (buffer.used += Z.total_out) + 1);
- (*decoded)[*decoded_len = buffer.used] = '\0';
- inflateEnd(&Z);
+ *decoded_len = Z.total_out;
+ *decoded = erealloc(buffer.data, *decoded_len + 1);
+ (*decoded)[*decoded_len] = '\0';
return SUCCESS;
} else {
phpstr_dtor(&buffer);
}
}
- http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not inflate data: %s (%s)", zError(status), Z.msg);
- inflateEnd(&Z);
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not inflate data: %s", zError(status));
return FAILURE;
}
-http_encoding_stream *_http_encoding_deflate_stream_init(http_encoding_stream *s, int flags TSRMLS_DC)
+PHP_HTTP_API http_encoding_stream *_http_encoding_deflate_stream_init(http_encoding_stream *s, int flags TSRMLS_DC)
{
int status, level, wbits, strategy, free_stream;
return NULL;
}
-http_encoding_stream *_http_encoding_inflate_stream_init(http_encoding_stream *s, int flags TSRMLS_DC)
+PHP_HTTP_API http_encoding_stream *_http_encoding_inflate_stream_init(http_encoding_stream *s, int flags TSRMLS_DC)
{
int status, wbits, free_stream;
return NULL;
}
-STATUS _http_encoding_deflate_stream_update(http_encoding_stream *s, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC)
+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 TSRMLS_DC)
{
int status;
/* append input to our buffer */
phpstr_append(PHPSTR(s->stream.opaque), data, data_len);
- s->stream.next_in = PHPSTR_VAL(s->stream.opaque);
+ s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque);
s->stream.avail_in = PHPSTR_LEN(s->stream.opaque);
/* deflate */
- s->stream.avail_out = *encoded_len = HTTP_ENCODING_BUFLEN(data_len);
- s->stream.next_out = *encoded = emalloc(*encoded_len);
+ *encoded_len = HTTP_ENCODING_BUFLEN(data_len);
+ *encoded = emalloc(*encoded_len);
+ s->stream.avail_out = *encoded_len;
+ s->stream.next_out = (Bytef *) *encoded;
switch (status = deflate(&s->stream, Z_NO_FLUSH))
{
return FAILURE;
}
-STATUS _http_encoding_inflate_stream_update(http_encoding_stream *s, const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC)
+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 TSRMLS_DC)
{
int status, max = 0;
*decoded = erealloc(*decoded, *decoded_len);
retry_raw_inflate:
- s->stream.next_in = PHPSTR_VAL(s->stream.opaque);
+ s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque);
s->stream.avail_in = PHPSTR_LEN(s->stream.opaque);
- s->stream.next_out = *decoded;
+ s->stream.next_out = (Bytef *) *decoded;
s->stream.avail_out = *decoded_len;
switch (status = inflate(&s->stream, Z_NO_FLUSH))
}
break;
}
- if (Z_BUF_ERROR == status) DebugBreak();
} while (Z_BUF_ERROR == status && ++max < HTTP_ENCODING_MAXTRY);
STR_SET(*decoded, NULL);
*decoded_len = 0;
- http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not update inflate stream: %s", zError(status));
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to update inflate stream: %s", zError(status));
+ return FAILURE;
+}
+
+PHP_HTTP_API STATUS _http_encoding_deflate_stream_flush(http_encoding_stream *s, char **encoded, size_t *encoded_len TSRMLS_DC)
+{
+ int status;
+
+ *encoded_len = 0x800;
+ *encoded = emalloc(*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 = 0x800 - s->stream.avail_out;
+ *encoded = erealloc(*encoded, *encoded_len + 1);
+ (*encoded)[*encoded_len] = '\0';
+ return SUCCESS;
+ break;
+ }
+
+ 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;
+}
+
+PHP_HTTP_API STATUS _http_encoding_inflate_stream_flush(http_encoding_stream *s, char **decoded, size_t *decoded_len TSRMLS_DC)
+{
+ int status;
+
+ *decoded_len = 0x800;
+ *decoded = emalloc(*decoded_len);
+
+ s->stream.avail_in = 0;
+ s->stream.next_in = NULL;
+ s->stream.avail_out = *decoded_len;
+ s->stream.next_out = (Bytef *) *decoded;
+
+ switch (status = inflate(&s->stream, Z_SYNC_FLUSH))
+ {
+ case Z_OK:
+ case Z_STREAM_END:
+ *decoded_len = 0x800 - s->stream.avail_out;
+ *decoded = erealloc(*decoded, *decoded_len + 1);
+ (*decoded)[*decoded_len] = '\0';
+ return SUCCESS;
+ break;
+ }
+
+ STR_SET(*decoded, NULL);
+ *decoded_len = 0;
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to flush inflate stream: %s", zError(status));
return FAILURE;
}
-STATUS _http_encoding_deflate_stream_finish(http_encoding_stream *s, char **encoded, size_t *encoded_len TSRMLS_DC)
+PHP_HTTP_API STATUS _http_encoding_deflate_stream_finish(http_encoding_stream *s, char **encoded, size_t *encoded_len TSRMLS_DC)
{
int status;
+ *encoded_len = 0x800;
+ *encoded = emalloc(*encoded_len);
+
/* deflate remaining input */
- s->stream.next_in = PHPSTR_VAL(s->stream.opaque);
+ s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque);
s->stream.avail_in = PHPSTR_LEN(s->stream.opaque);
- s->stream.avail_out = *encoded_len = 0x800;
- s->stream.next_out = *encoded = emalloc(*encoded_len);
+ s->stream.avail_out = *encoded_len;
+ s->stream.next_out = (Bytef *) *encoded;
do {
status = deflate(&s->stream, Z_FINISH);
return FAILURE;
}
-STATUS _http_encoding_inflate_stream_finish(http_encoding_stream *s, char **decoded, size_t *decoded_len TSRMLS_DC)
+PHP_HTTP_API STATUS _http_encoding_inflate_stream_finish(http_encoding_stream *s, char **decoded, size_t *decoded_len TSRMLS_DC)
{
int status;
+ *decoded_len = s->stream.avail_in << 2;
+ *decoded = emalloc(*decoded_len);
+
/* inflate remaining input */
- s->stream.next_in = PHPSTR_VAL(s->stream.opaque);
+ s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque);
s->stream.avail_in = PHPSTR_LEN(s->stream.opaque);
- s->stream.avail_out = *decoded_len = s->stream.avail_in << 2;
- s->stream.next_out = *decoded = emalloc(*decoded_len);
+ s->stream.avail_out = *decoded_len;
+ s->stream.next_out = (Bytef *) *decoded;
if (Z_STREAM_END == (status = inflate(&s->stream, Z_FINISH))) {
/* cut processed input off */
return FAILURE;
}
-void _http_encoding_deflate_stream_dtor(http_encoding_stream *s TSRMLS_DC)
+PHP_HTTP_API void _http_encoding_deflate_stream_dtor(http_encoding_stream *s TSRMLS_DC)
{
if (s) {
if (s->stream.opaque) {
}
}
-void _http_encoding_inflate_stream_dtor(http_encoding_stream *s TSRMLS_DC)
+PHP_HTTP_API void _http_encoding_inflate_stream_dtor(http_encoding_stream *s TSRMLS_DC)
{
if (s) {
if (s->stream.opaque) {
}
}
-void _http_encoding_deflate_stream_free(http_encoding_stream **s TSRMLS_DC)
+PHP_HTTP_API void _http_encoding_deflate_stream_free(http_encoding_stream **s TSRMLS_DC)
{
if (s) {
http_encoding_deflate_stream_dtor(*s);
}
}
-void _http_encoding_inflate_stream_free(http_encoding_stream **s TSRMLS_DC)
+PHP_HTTP_API void _http_encoding_inflate_stream_free(http_encoding_stream **s TSRMLS_DC)
{
if (s) {
http_encoding_inflate_stream_dtor(*s);