[PHP-CVS] svn: /php/php-src/trunk/ext/zlib/ php_zlib.h zlib.c
jani Tue, 08 Dec 2009 10:56:41 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=291872
Log:
ws
Changed paths:
U php/php-src/trunk/ext/zlib/php_zlib.h
U php/php-src/trunk/ext/zlib/zlib.c
Modified: php/php-src/trunk/ext/zlib/php_zlib.h
===
--- php/php-src/trunk/ext/zlib/php_zlib.h 2009-12-08 10:16:38 UTC (rev 291871)
+++ php/php-src/trunk/ext/zlib/php_zlib.h 2009-12-08 10:56:41 UTC (rev 291872)
@@ -64,9 +64,9 @@
#define phpext_zlib_ptr zlib_module_ptr
#ifdef ZTS
-# define ZLIBG(v) TSRMG(zlib_globals_id, zend_zlib_globals *, v)
+# define ZLIBG(v) TSRMG(zlib_globals_id, zend_zlib_globals *, v)
#else
-# define ZLIBG(v) (zlib_globals.v)
+# define ZLIBG(v) (zlib_globals.v)
#endif
#endif /* PHP_ZLIB_H */
Modified: php/php-src/trunk/ext/zlib/zlib.c
===
--- php/php-src/trunk/ext/zlib/zlib.c 2009-12-08 10:16:38 UTC (rev 291871)
+++ php/php-src/trunk/ext/zlib/zlib.c 2009-12-08 10:56:41 UTC (rev 291872)
@@ -23,7 +23,7 @@
/* $Id$ */
#ifdef HAVE_CONFIG_H
-# include config.h
+# include config.h
#endif
#include php.h
@@ -66,10 +66,10 @@
static int php_zlib_output_encoding(TSRMLS_D)
{
zval **enc;
-
+
if (!ZLIBG(compression_coding)) {
zend_is_auto_global(ZEND_STRL(_SERVER) TSRMLS_CC);
-
+
if (PG(http_globals)[TRACK_VARS_SERVER] SUCCESS == zend_hash_find(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), HTTP_ACCEPT_ENCODING, sizeof(HTTP_ACCEPT_ENCODING), (void *) enc)) {
convert_to_string(*enc);
if (strstr(Z_STRVAL_PP(enc), gzip)) {
@@ -79,7 +79,6 @@
}
}
}
-
return ZLIBG(compression_coding);
}
/* }}} */
@@ -90,12 +89,12 @@
php_zlib_context *ctx = *(php_zlib_context **) handler_context;
int flags = Z_SYNC_FLUSH;
PHP_OUTPUT_TSRMLS(output_context);
-
+
if (!php_zlib_output_encoding(TSRMLS_C)) {
/* Vary: Accept-Encoding header sent along uncompressed content breaks caching in MSIE,
so let's just send it with successfully compressed content or unless the complete
buffer gets discarded, see http://bugs.php.net/40325;
-
+
Test as follows:
+Vary: $ HTTP_ACCEPT_ENCODING=gzip ./sapi/cgi/php '?php ob_start(ob_gzhandler); echo foo\n;'
+Vary: $ HTTP_ACCEPT_ENCODING= ./sapi/cgi/php '?php ob_start(ob_gzhandler); echo foo\n;'
@@ -107,18 +106,18 @@
}
return FAILURE;
}
-
+
if (output_context-op PHP_OUTPUT_HANDLER_START) {
/* start up */
if (Z_OK != deflateInit2(ctx-Z, ZLIBG(output_compression_level), Z_DEFLATED, ZLIBG(compression_coding), MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY)) {
return FAILURE;
}
}
-
+
if (output_context-op PHP_OUTPUT_HANDLER_CLEAN) {
/* free buffers */
deflateEnd(ctx-Z);
-
+
if (output_context-op PHP_OUTPUT_HANDLER_FINAL) {
/* discard */
return SUCCESS;
@@ -130,7 +129,6 @@
ctx-buffer.used = 0;
}
} else {
-
if (output_context-in.used) {
/* append input */
if (ctx-buffer.free output_context-in.used) {
@@ -145,23 +143,22 @@
ctx-buffer.free -= output_context-in.used;
ctx-buffer.used += output_context-in.used;
}
-
output_context-out.size = PHP_ZLIB_BUFFER_SIZE_GUESS(output_context-in.used);
output_context-out.data = emalloc(output_context-out.size);
output_context-out.free = 1;
output_context-out.used = 0;
-
+
ctx-Z.avail_in = ctx-buffer.used;
ctx-Z.next_in = (Bytef *) ctx-buffer.data;
ctx-Z.avail_out = output_context-out.size;
ctx-Z.next_out = (Bytef *) output_context-out.data;
-
+
if (output_context-op PHP_OUTPUT_HANDLER_FINAL) {
flags = Z_FINISH;
} else if (output_context-op PHP_OUTPUT_HANDLER_FLUSH) {
flags = Z_FULL_FLUSH;
}
-
+
switch (deflate(ctx-Z, flags)) {
case Z_OK:
if (flags == Z_FINISH) {
@@ -180,9 +177,9 @@
deflateEnd(ctx-Z);
return FAILURE;
}
-
+
php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS, flags TSRMLS_CC);
-
+
if (!(flags PHP_OUTPUT_HANDLER_STARTED)) {
if (SG(headers_sent) || !ZLIBG(output_compression)) {
deflateEnd(ctx-Z);
@@ -202,7 +199,7 @@
sapi_add_header_ex(ZEND_STRL(Vary: Accept-Encoding), 1, 1 TSRMLS_CC);
php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC);
}
-
+
if (output_context-op PHP_OUTPUT_HANDLER_FINAL) {
deflateEnd(ctx-Z);
}
@@ -215,7 +212,7 @@
static void php_zlib_output_handler_dtor(void *opaq TSRMLS_DC)
{
php_zlib_context *ctx = (php_zlib_context *) opaq;
-
+
if (ctx) {
if (ctx-buffer.data) {
efree(ctx-buffer.data);
@@ -230,7 +227,7 @@
{
php_output_handler *h = NULL;
php_zlib_context *ctx;
-
+
if (!ZLIBG(output_compression)) {
ZLIBG(output_compression) = chunk_size ? chunk_size : PHP_OUTPUT_HANDLER_DEFAULT_SIZE;
}
@@ -240,7 +237,7 @@
ctx-Z.zfree = php_zlib_free;
php_output_handler_set_context(h, ctx, php_zlib_output_handler_dtor TSRMLS_CC);
}
-
+
return h;
}
/* }}} */
@@
[PHP-CVS] svn: /php/php-src/trunk/ext/zlib/ php_zlib.h zlib.c
jani Mon, 03 Aug 2009 18:09:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286750
Log:
- Cleanup
Changed paths:
U php/php-src/trunk/ext/zlib/php_zlib.h
U php/php-src/trunk/ext/zlib/zlib.c
Modified: php/php-src/trunk/ext/zlib/php_zlib.h
===
--- php/php-src/trunk/ext/zlib/php_zlib.h 2009-08-03 18:08:46 UTC (rev 286749)
+++ php/php-src/trunk/ext/zlib/php_zlib.h 2009-08-03 18:09:19 UTC (rev 286750)
@@ -55,14 +55,6 @@
php_zlib_buffer buffer;
} php_zlib_context;
-int php_zlib_output_encoding(TSRMLS_D);
-int php_zlib_encode(const char *in_buf, size_t in_len, char **out_buf, size_t *out_len, int encoding, int level TSRMLS_DC);
-int php_zlib_decode(const char *in_buf, size_t in_len, char **out_buf, size_t *out_len, int encoding, size_t max_len TSRMLS_DC);
-php_output_handler *php_zlib_output_handler_init(zval *handler_name, size_t chunk_size, int flags TSRMLS_DC);
-int php_zlib_output_handler(void **handler_context, php_output_context *output_context);
-void php_zlib_output_handler_dtor(void *opaq TSRMLS_DC);
-int php_zlib_output_conflict_check(zval *handler_name TSRMLS_DC);
-
php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC);
extern php_stream_ops php_stream_gzio_ops;
extern php_stream_wrapper php_stream_gzip_wrapper;
@@ -71,28 +63,6 @@
#define zlib_module_ptr php_zlib_module_entry
#define phpext_zlib_ptr zlib_module_ptr
-PHP_MINIT_FUNCTION(zlib);
-PHP_MSHUTDOWN_FUNCTION(zlib);
-PHP_RINIT_FUNCTION(zlib);
-PHP_MINFO_FUNCTION(zlib);
-
-PHP_FUNCTION(gzfile);
-PHP_FUNCTION(gzopen);
-PHP_FUNCTION(readgzfile);
-
-PHP_FUNCTION(gzcompress);
-PHP_FUNCTION(gzuncompress);
-PHP_FUNCTION(gzdeflate);
-PHP_FUNCTION(gzinflate);
-PHP_FUNCTION(gzencode);
-PHP_FUNCTION(gzdecode);
-
-PHP_FUNCTION(zlib_encode);
-PHP_FUNCTION(zlib_decode);
-
-PHP_FUNCTION(zlib_get_coding_type);
-
-
#ifdef ZTS
# define ZLIBG(v) TSRMG(zlib_globals_id, zend_zlib_globals *, v)
#else
Modified: php/php-src/trunk/ext/zlib/zlib.c
===
--- php/php-src/trunk/ext/zlib/zlib.c 2009-08-03 18:08:46 UTC (rev 286749)
+++ php/php-src/trunk/ext/zlib/zlib.c 2009-08-03 18:09:19 UTC (rev 286750)
@@ -50,7 +50,7 @@
/* }}} */
/* {{{ php_zlib_output_conflict_check() */
-int php_zlib_output_conflict_check(zval *handler_name TSRMLS_DC)
+static int php_zlib_output_conflict_check(zval *handler_name TSRMLS_DC)
{
if (php_output_get_level(TSRMLS_C) 0) {
PHP_OUTPUT_CONFLICT(PHP_ZLIB_OUTPUT_HANDLER_NAME, return FAILURE);
@@ -63,7 +63,7 @@
/* }}} */
/* {{{ php_zlib_output_encoding() */
-int php_zlib_output_encoding(TSRMLS_D)
+static int php_zlib_output_encoding(TSRMLS_D)
{
zval **enc;
@@ -84,58 +84,8 @@
}
/* }}} */
-/* {{{ php_zlib_output_compression_start() */
-void php_zlib_output_compression_start(TSRMLS_D)
-{
- zval *zoh, *tmp;
- php_output_handler *h;
-
- switch (ZLIBG(output_compression)) {
- case 0:
- break;
- case 1:
- ZLIBG(output_compression) = PHP_OUTPUT_HANDLER_DEFAULT_SIZE;
- /* break omitted intentionally */
- default:
- MAKE_STD_ZVAL(tmp);
- ZVAL_ASCII_STRING(tmp, PHP_ZLIB_OUTPUT_HANDLER_NAME, ZSTR_DUPLICATE);
- if ( (h = php_zlib_output_handler_init(tmp, ZLIBG(output_compression), PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC))
- (SUCCESS == php_output_handler_start(h TSRMLS_CC))) {
-if (ZLIBG(output_handler) *ZLIBG(output_handler)) {
- MAKE_STD_ZVAL(zoh);
- ZVAL_ASCII_STRING(zoh, ZLIBG(output_handler), ZSTR_DUPLICATE);
- php_output_start_user(zoh, ZLIBG(output_compression), PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC);
- zval_ptr_dtor(zoh);
-}
- }
- zval_ptr_dtor(tmp);
- break;
- }
-}
-/* }}} */
-
-/* {{{ php_zlib_output_handler_init() */
-php_output_handler *php_zlib_output_handler_init(zval *handler_name, size_t chunk_size, int flags TSRMLS_DC)
-{
- php_output_handler *h = NULL;
- php_zlib_context *ctx;
-
- if (!ZLIBG(output_compression)) {
- ZLIBG(output_compression) = chunk_size ? chunk_size : PHP_OUTPUT_HANDLER_DEFAULT_SIZE;
- }
- if ((h = php_output_handler_create_internal(handler_name, php_zlib_output_handler, chunk_size, flags TSRMLS_CC))) {
- ctx = (php_zlib_context *) ecalloc(1, sizeof(php_zlib_context));
- ctx-Z.zalloc = php_zlib_alloc;
- ctx-Z.zfree = php_zlib_free;
- php_output_handler_set_context(h, ctx, php_zlib_output_handler_dtor TSRMLS_CC);
- }
-
- return h;
-}
-/* }}} */
-
/* {{{ php_zlib_output_handler() */
-int php_zlib_output_handler(void **handler_context, php_output_context *output_context)
+static int php_zlib_output_handler(void **handler_context, php_output_context *output_context)
{
php_zlib_context *ctx = *(php_zlib_context **) handler_context;
int flags = Z_SYNC_FLUSH;
@@ -262,7 +212,7 @@
/* }}} */
/* {{{ php_zlib_output_handler_dtor() */
-void
