[PHP-CVS] cvs: php4 /ext/zlib zlib.c

[Moriyoshi Koizumi]

moriyoshi               Sun Nov  3 15:31:01 2002 EDT

  Modified files:              
    /php4/ext/zlib      zlib.c 
  Log:
  Fixed OnUpdate_zlib_output_compression() behaviour
  
  
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.152 php4/ext/zlib/zlib.c:1.153
--- php4/ext/zlib/zlib.c:1.152  Wed Oct  2 23:58:12 2002
+++ php4/ext/zlib/zlib.c        Sun Nov  3 15:31:00 2002
@@ -18,7 +18,7 @@
    |          Jade Nicoletti <[EMAIL PROTECTED]>                           |
    +----------------------------------------------------------------------+
  */
-/* $Id: zlib.c,v 1.152 2002/10/03 03:58:12 yohgaki Exp $ */
+/* $Id: zlib.c,v 1.153 2002/11/03 20:31:00 moriyoshi Exp $ */
 #define IS_EXT_MODULE
 
 #ifdef HAVE_CONFIG_H
@@ -135,13 +135,6 @@
 {
        char *ini_value;
 
-       ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 0); 
-       if (ini_value != NULL && strlen(ini_value) != 0 && 
-               new_value != NULL && strlen(new_value) != 0 ) {
-               php_error_docref("ref.outcontrol" TSRMLS_CC, E_CORE_ERROR, "Cannot use 
both zlib.output_compression and output_handler together!!");
-               return FAILURE;
-       }
-
        if(new_value == NULL)
                return FAILURE;
 
@@ -151,6 +144,13 @@
        } else if(!strncasecmp(new_value, "on", sizeof("on"))) {
                new_value = "1";
                new_value_length = sizeof("1");
+       }
+
+       ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 0); 
+       if (ini_value != NULL && strlen(ini_value) != 0 && 
+               zend_atoi(new_value, new_value_length) != 0) {
+               php_error_docref("ref.outcontrol" TSRMLS_CC, E_CORE_ERROR, "Cannot use 
+both zlib.output_compression and output_handler together!!");
+               return FAILURE;
        }
 
        if (stage == PHP_INI_STAGE_RUNTIME && SG(headers_sent) && 
!SG(request_info).no_headers) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php