mike Thu Aug 31 13:51:35 2006 UTC
Modified files:
/php-src/main output.c php_output.h
/php-src/ext/zlib php_zlib.h zlib.c
Log:
- output handler alias ctor should know about chunk_size and flags
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.194&r2=1.195&diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.194 php-src/main/output.c:1.195
--- php-src/main/output.c:1.194 Wed Aug 30 14:42:01 2006
+++ php-src/main/output.c Thu Aug 31 13:51:35 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.194 2006/08/30 14:42:01 mike Exp $ */
+/* $Id: output.c,v 1.195 2006/08/31 13:51:35 mike Exp $ */
#ifndef PHP_OUTPUT_DEBUG
# define PHP_OUTPUT_DEBUG 0
@@ -495,7 +495,7 @@
case IS_STRING:
case IS_UNICODE:
if (Z_UNILEN_P(output_handler) && (alias =
php_output_handler_alias(output_handler TSRMLS_CC))) {
- handler = (*alias)(output_handler TSRMLS_CC);
+ handler = (*alias)(output_handler, chunk_size,
flags TSRMLS_CC);
break;
}
default:
http://cvs.php.net/viewvc.cgi/php-src/main/php_output.h?r1=1.64&r2=1.65&diff_format=u
Index: php-src/main/php_output.h
diff -u php-src/main/php_output.h:1.64 php-src/main/php_output.h:1.65
--- php-src/main/php_output.h:1.64 Wed Aug 30 22:34:32 2006
+++ php-src/main/php_output.h Thu Aug 31 13:51:35 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_output.h,v 1.64 2006/08/30 22:34:32 mike Exp $ */
+/* $Id: php_output.h,v 1.65 2006/08/31 13:51:35 mike Exp $ */
#ifndef PHP_OUTPUT_H
#define PHP_OUTPUT_H
@@ -109,7 +109,7 @@
/* conflict check callback */
typedef int (*php_output_handler_conflict_check_t)(zval *handler_name
TSRMLS_DC);
/* ctor for aliases */
-typedef struct _php_output_handler *(*php_output_handler_alias_ctor_t)(zval
*handler_name TSRMLS_DC);
+typedef struct _php_output_handler *(*php_output_handler_alias_ctor_t)(zval
*handler_name, size_t chunk_size, int flags TSRMLS_DC);
typedef struct _php_output_handler {
zval *name;
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/php_zlib.h?r1=1.49&r2=1.50&diff_format=u
Index: php-src/ext/zlib/php_zlib.h
diff -u php-src/ext/zlib/php_zlib.h:1.49 php-src/ext/zlib/php_zlib.h:1.50
--- php-src/ext/zlib/php_zlib.h:1.49 Wed Aug 30 22:35:57 2006
+++ php-src/ext/zlib/php_zlib.h Thu Aug 31 13:51:35 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_zlib.h,v 1.49 2006/08/30 22:35:57 mike Exp $ */
+/* $Id: php_zlib.h,v 1.50 2006/08/31 13:51:35 mike Exp $ */
#ifndef PHP_ZLIB_H
#define PHP_ZLIB_H
@@ -58,7 +58,7 @@
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 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);
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.208&r2=1.209&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.208 php-src/ext/zlib/zlib.c:1.209
--- php-src/ext/zlib/zlib.c:1.208 Wed Aug 30 22:35:57 2006
+++ php-src/ext/zlib/zlib.c Thu Aug 31 13:51:35 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.208 2006/08/30 22:35:57 mike Exp $ */
+/* $Id: zlib.c,v 1.209 2006/08/31 13:51:35 mike Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -85,7 +85,8 @@
default:
MAKE_STD_ZVAL(tmp);
ZVAL_ASCII_STRING(tmp, PHP_ZLIB_OUTPUT_HANDLER_NAME,
ZSTR_DUPLICATE);
- if ((h = php_zlib_output_handler_init(tmp TSRMLS_CC))
&& (SUCCESS == php_output_handler_start(h TSRMLS_CC))) {
+ 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);
@@ -100,12 +101,12 @@
/* }}} */
/* {{{ php_zlib_output_handler_init() */
-php_output_handler *php_zlib_output_handler_init(zval *handler_name TSRMLS_DC)
+php_output_handler *php_zlib_output_handler_init(zval *handler_name, size_t
chunk_size, int flags TSRMLS_DC)
{
php_output_handler *h = NULL;
if (php_zlib_output_encoding(TSRMLS_C)) {
- if ((h = php_output_handler_create_internal(handler_name,
php_zlib_output_handler, ZLIBG(output_compression), PHP_OUTPUT_HANDLER_STDFLAGS
TSRMLS_CC))) {
+ if ((h = php_output_handler_create_internal(handler_name,
php_zlib_output_handler, chunk_size, flags TSRMLS_CC))) {
php_output_handler_set_context(h, ecalloc(1,
sizeof(php_zlib_context)), php_zlib_output_handler_dtor TSRMLS_CC);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
