cvs: php4 /ext/zlib zlib.c
| From: | Derick Rethans | Date: | Sat, 27 Oct 2001 18:22:56 +0000 |
| Subject: | cvs: php4 /ext/zlib zlib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8001@lists.php.net to get a copy of this message | ||
derick Sat Oct 27 14:22:56 2001 EDT
Modified files:
/php4/ext/zlib zlib.c
Log:
- fix crash bug
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.101 php4/ext/zlib/zlib.c:1.102
--- php4/ext/zlib/zlib.c:1.101 Sat Oct 27 06:14:14 2001
+++ php4/ext/zlib/zlib.c Sat Oct 27 14:22:56 2001
@@ -18,7 +18,7 @@
| Jade Nicoletti <nicoletti@nns.ch> |
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.101 2001/10/27 10:14:14 sniper Exp $ */
+/* $Id: zlib.c,v 1.102 2001/10/27 18:22:56 derick Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -137,8 +137,7 @@
char *ini_value;
ini_value = php_ini_string("output_handler", sizeof("output_handler"), 0);
-
- if (new_value != NULL && strlen(ini_value) != 0) {
+ if (ini_value != NULL && new_value != NULL && strlen(ini_value) != 0) {
php_error(E_CORE_ERROR,"Cannot use both zlib.output_compression and output_handler
together!!");
return FAILURE;
}