mike Wed Aug 30 22:35:57 2006 UTC
Modified files:
/php-src/ext/zlib CREDITS php_zlib.h zlib.c
Log:
- good bye ob_gzhandler
- ego promo
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/CREDITS?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/zlib/CREDITS
diff -u php-src/ext/zlib/CREDITS:1.2 php-src/ext/zlib/CREDITS:1.3
--- php-src/ext/zlib/CREDITS:1.2 Thu Aug 16 23:34:25 2001
+++ php-src/ext/zlib/CREDITS Wed Aug 30 22:35:57 2006
@@ -1,2 +1,2 @@
Zlib
-Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti
+Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti, Michael Wallner
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/php_zlib.h?r1=1.48&r2=1.49&diff_format=u
Index: php-src/ext/zlib/php_zlib.h
diff -u php-src/ext/zlib/php_zlib.h:1.48 php-src/ext/zlib/php_zlib.h:1.49
--- php-src/ext/zlib/php_zlib.h:1.48 Wed Aug 30 12:26:38 2006
+++ php-src/ext/zlib/php_zlib.h Wed Aug 30 22:35:57 2006
@@ -14,10 +14,11 @@
+----------------------------------------------------------------------+
| Authors: Rasmus Lerdorf <[EMAIL PROTECTED]> |
| Stefan Röhrich <[EMAIL PROTECTED]>
|
+ | Michael Wallner <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: php_zlib.h,v 1.48 2006/08/30 12:26:38 mike Exp $ */
+/* $Id: php_zlib.h,v 1.49 2006/08/30 22:35:57 mike Exp $ */
#ifndef PHP_ZLIB_H
#define PHP_ZLIB_H
@@ -79,8 +80,6 @@
PHP_FUNCTION(gzopen);
PHP_FUNCTION(readgzfile);
-PHP_FUNCTION(ob_gzhandler);
-
PHP_FUNCTION(gzcompress);
PHP_FUNCTION(gzuncompress);
PHP_FUNCTION(gzdeflate);
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.207&r2=1.208&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.207 php-src/ext/zlib/zlib.c:1.208
--- php-src/ext/zlib/zlib.c:1.207 Wed Aug 30 14:42:26 2006
+++ php-src/ext/zlib/zlib.c Wed Aug 30 22:35:57 2006
@@ -16,10 +16,11 @@
| Stefan Röhrich <[EMAIL PROTECTED]>
|
| Zeev Suraski <[EMAIL PROTECTED]> |
| Jade Nicoletti <[EMAIL PROTECTED]> |
+ | Michael Wallner <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.207 2006/08/30 14:42:26 mike Exp $ */
+/* $Id: zlib.c,v 1.208 2006/08/30 22:35:57 mike Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -587,11 +588,6 @@
PHP_ZLIB_DECODE_FUNC(gzuncompress, PHP_ZLIB_ENCODING_DEFLATE);
/* }}} */
-PHP_FUNCTION(ob_gzhandler)
-{
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_gzhandler is intended
to be used with ob_start()");
-}
-
#ifdef COMPILE_DL_ZLIB
ZEND_GET_MODULE(php_zlib)
#endif
@@ -619,7 +615,6 @@
PHP_FE(gzinflate, NULL)
PHP_FE(gzencode, NULL)
PHP_FE(gzdecode, NULL)
- PHP_FE(ob_gzhandler, NULL)
PHP_FE(zlib_encode, NULL)
PHP_FE(zlib_decode, NULL)
PHP_FE(zlib_get_coding_type, NULL)
@@ -654,8 +649,8 @@
return FAILURE;
}
- status = php_output_get_status(TSRMLS_C);
if (stage == PHP_INI_STAGE_RUNTIME) {
+ status = php_output_get_status(TSRMLS_C);
if (status & PHP_OUTPUT_SENT) {
php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING,
"Cannot change zlib.output_compression - headers already sent");
return FAILURE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
