| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
PHP_RINIT_FUNCTION(http_encoding)
{
if (HTTP_G->send.inflate.start_auto) {
+#ifdef PHP_OUTPUT_NEWAPI
+ php_output_start_internal(ZEND_STRL("http inflate"), _http_ob_inflatehandler, HTTP_INFLATE_BUFFER_SIZE, 0 TSRMLS_CC);
+#else
php_ob_set_internal_handler(_http_ob_inflatehandler, HTTP_INFLATE_BUFFER_SIZE, "http inflate", 0 TSRMLS_CC);
+#endif
}
if (HTTP_G->send.deflate.start_auto) {
+#ifdef PHP_OUTPUT_NEWAPI
+ php_output_start_internal(ZEND_STRL("http deflate"), _http_ob_deflatehandler, HTTP_DEFLATE_BUFFER_SIZE, 0 TSRMLS_CC);
+#else
php_ob_set_internal_handler(_http_ob_deflatehandler, HTTP_DEFLATE_BUFFER_SIZE, "http deflate", 0 TSRMLS_CC);
+#endif
}
return SUCCESS;
}
/* }}} */
/* {{{ int http_encoding_response_start(size_t) */
-PHP_HTTP_API int _http_encoding_response_start(size_t content_length TSRMLS_DC)
+PHP_HTTP_API int _http_encoding_response_start(size_t content_length, zend_bool ignore_http_ohandler TSRMLS_DC)
{
- 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);
+ int response = HTTP_G->send.deflate.response;
+#ifdef PHP_OUTPUT_NEWAPI
+ int ohandler = php_output_handler_started(ZEND_STRL("ob_gzhandler") TSRMLS_CC) || php_output_handler_started(ZEND_STRL("zlib output compression") TSRMLS_CC);
#else
- HashTable *selected;
- zval zsupported;
-
- 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.deflate.encoding = 0;
+ int ohandler = php_ob_handler_used("ob_gzhandler" TSRMLS_CC) || php_ob_handler_used("zlib output compression" TSRMLS_CC);
+#endif
+
+ if (!ohandler && !ignore_http_ohandler) {
+#ifdef PHP_OUTPUT_NEWAPI
+ ohandler = php_output_handler_started(ZEND_STRL("ob_defaltehandler") TSRMLS_CC) || php_output_handler_started(ZEND_STRL("http deflate") TSRMLS_CC);
+#else
+ ohandler = php_ob_handler_used("ob_deflatehandler" TSRMLS_CC) || php_ob_handler_used("http deflate" TSRMLS_CC);
+#endif
+ }
+
+ if (response && !ohandler) {
+#ifdef HTTP_HAVE_ZLIB
+ HashTable *selected;
+ zval zsupported;
+
+ HTTP_G->send.deflate.encoding = 0;
+
+ 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);
+
+ if ((selected = http_negotiate_encoding(&zsupported))) {
+ STATUS hs = FAILURE;
+ char *encoding = NULL;
+ ulong idx;
- 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 (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;
}
- if (SUCCESS == hs) {
- http_send_header_string("Vary: Accept-Encoding");
+ } else if (!strcmp(encoding, "deflate")) {
+ if (SUCCESS == (hs = http_send_header_string("Content-Encoding: deflate"))) {
+ HTTP_G->send.deflate.encoding = HTTP_ENCODING_DEFLATE;
}
}
-
- zend_hash_destroy(selected);
- FREE_HASHTABLE(selected);
+ if (SUCCESS == hs) {
+ http_send_header_string("Vary: Accept-Encoding");
+ }
}
- zval_dtor(&zsupported);
- return HTTP_G->send.deflate.encoding;
-#endif
+ zend_hash_destroy(selected);
+ FREE_HASHTABLE(selected);
}
+
+ zval_dtor(&zsupported);
+#else
+ HTTP_G->send.deflate.encoding = 0;
+ php_start_ob_buffer_named("ob_gzhandler", 0, 0 TSRMLS_CC);
+#endif /* HTTP_HAVE_ZLIB */
+ } else if (content_length && !ohandler) {
+ /* emit a content-length header */
+ phpstr header;
+
+ phpstr_init(&header);
+ phpstr_appendf(&header, "Content-Length: %zu", content_length);
+ phpstr_fix(&header);
+ http_send_header_string_ex(PHPSTR_VAL(&header), PHPSTR_LEN(&header), 1);
+ phpstr_dtor(&header);
+ } else {
+ HTTP_G->send.deflate.encoding = 0;
}
- return 0;
+
+ return HTTP_G->send.deflate.encoding;
}
/* }}} */
if (PHPSTR_NOMEM == phpstr_resize_ex(&buffer, buffer.size, 0, 1)) {
status = Z_MEM_ERROR;
} else {
- do {
- Z->avail_out = buffer.free;
- Z->next_out = (Bytef *) buffer.data + buffer.used;
+ Z->avail_out = buffer.free;
+ Z->next_out = (Bytef *) buffer.data + buffer.used;
#if 0
- fprintf(stderr, "PRIOR: size=%lu, avail=%lu, used=%lu, (%d/%d)\n", buffer.size, Z->avail_out, buffer.used, status, round);
+ fprintf(stderr, "\n%3d: %3d PRIOR: size=%7lu,\tfree=%7lu,\tused=%7lu,\tavail_in=%7lu,\tavail_out=%7lu\n", round, status, buffer.size, buffer.free, buffer.used, Z->avail_in, Z->avail_out);
#endif
- status = inflate(Z, flush);
+ status = inflate(Z, flush);
- buffer.used += buffer.free - Z->avail_out;
- buffer.free = Z->avail_out;
+ buffer.used += buffer.free - Z->avail_out;
+ buffer.free = Z->avail_out;
#if 0
- fprintf(stderr, "AFTER: size=%lu, avail=%lu, used=%lu, (%d/%d)\n", buffer.size, Z->avail_out, buffer.used, status, round);
+ fprintf(stderr, "%3d: %3d AFTER: size=%7lu,\tfree=%7lu,\tused=%7lu,\tavail_in=%7lu,\tavail_out=%7lu\n", round, status, buffer.size, buffer.free, buffer.used, Z->avail_in, Z->avail_out);
#endif
- } while (Z_OK == status && Z->avail_in);
-
HTTP_INFLATE_BUFFER_SIZE_ALIGN(buffer.size);
}
- } while (Z_BUF_ERROR == status && ++round < HTTP_INFLATE_ROUNDS);
+ } while ((Z_BUF_ERROR == status || (Z_OK == status && Z->avail_in)) && ++round < HTTP_INFLATE_ROUNDS);
if (status == Z_OK || status == Z_STREAM_END) {
phpstr_shrink(&buffer);
Z.avail_in = data_len;
switch (status = http_inflate_rounds(&Z, Z_NO_FLUSH, decoded, decoded_len)) {
- case Z_OK:
case Z_STREAM_END:
+ inflateEnd(&Z);
return SUCCESS;
+
+ case Z_OK:
+ status = Z_DATA_ERROR;
+ break;
case Z_DATA_ERROR:
/* raw deflated data? */
{
int status;
+ if (!PHPSTR_LEN(s->stream.opaque)) {
+ *decoded = NULL;
+ *decoded_len = 0;
+ return SUCCESS;
+ }
+
*decoded_len = (PHPSTR_LEN(s->stream.opaque) + 1) * HTTP_INFLATE_ROUNDS;
*decoded = emalloc_rel(*decoded_len);
/* {{{ 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)
{
+ int encoding;
+
*handled_output = NULL;
*handled_output_len = 0;
return;
}
- HTTP_G->send.deflate.encoding = !0;
+ HTTP_G->send.deflate.response = 1;
+ encoding = http_encoding_response_start(0, 1);
+ HTTP_G->send.deflate.response = 0;
- switch (http_encoding_response_start(0)) {
+ switch (encoding) {
case HTTP_ENCODING_GZIP:
flags = HTTP_DEFLATE_TYPE_GZIP;
break;
}
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 (output_len) {
+ size_t tmp_len;
+
+ http_encoding_deflate_stream_update((http_encoding_stream *) HTTP_G->send.deflate.stream, output, output_len, handled_output, &tmp_len);
+ *handled_output_len = tmp_len;
+ }
if (mode & PHP_OUTPUT_HANDLER_END) {
char *remaining = NULL;
}
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 (output_len) {
+ size_t tmp_len;
+
+ http_encoding_inflate_stream_update((http_encoding_stream *) HTTP_G->send.inflate.stream, output, output_len, handled_output, &tmp_len);
+ *handled_output_len = tmp_len;
+ }
if (mode & PHP_OUTPUT_HANDLER_END) {
char *remaining = NULL;
projects / m6w6 / ext-http / blobdiff