cvs: Zend(PHP_4_4) / zend_ini.c

sniper          Fri Sep  2 17:09:03 2005 EDT

  Modified files:              (Branch: PHP_4_4)
    /Zend       zend_ini.c 
  Log:
  MFH
  
http://cvs.php.net/diff.php/Zend/zend_ini.c?r1=1.23.2.7&r2=1.23.2.7.2.1&ty=u
Index: Zend/zend_ini.c
diff -u Zend/zend_ini.c:1.23.2.7 Zend/zend_ini.c:1.23.2.7.2.1
--- Zend/zend_ini.c:1.23.2.7    Wed Apr 13 07:07:50 2005
+++ Zend/zend_ini.c     Fri Sep  2 17:09:03 2005
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_ini.c,v 1.23.2.7 2005/04/13 11:07:50 stas Exp $ */
+/* $Id: zend_ini.c,v 1.23.2.7.2.1 2005/09/02 21:09:03 sniper Exp $ */
 
 #include "zend.h"
 #include "zend_qsort.h"
@@ -154,6 +154,7 @@
        zend_ini_entry *hashed_ini_entry;
        zval default_value;
        HashTable *directives = registered_zend_ini_directives;
+       zend_bool config_directive_success = 0;
 
 #ifdef ZTS
        /* if we are called during the request, eg: from dl(),
@@ -171,6 +172,7 @@
 
        while (p->name) {
                p->module_number = module_number;
+               config_directive_success = 0;
                if (zend_hash_add(directives, p->name, p->name_length, p, 
sizeof(zend_ini_entry), (void **) &hashed_ini_entry)==FAILURE) {
                        zend_unregister_ini_entries(module_number TSRMLS_CC);
                        return FAILURE;
@@ -180,11 +182,12 @@
                                || 
hashed_ini_entry->on_modify(hashed_ini_entry, default_value.value.str.val, 
default_value.value.str.len, hashed_ini_entry->mh_arg1, 
hashed_ini_entry->mh_arg2, hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP 
TSRMLS_CC)==SUCCESS) {
                                hashed_ini_entry->value = 
default_value.value.str.val;
                                hashed_ini_entry->value_length = 
default_value.value.str.len;
+                               config_directive_success = 1;
                        }
-               } else {
-                       if (hashed_ini_entry->on_modify) {
-                               hashed_ini_entry->on_modify(hashed_ini_entry, 
hashed_ini_entry->value, hashed_ini_entry->value_length, 
hashed_ini_entry->mh_arg1, hashed_ini_entry->mh_arg2, 
hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP TSRMLS_CC);
-                       }
+               }
+
+               if (!config_directive_success && hashed_ini_entry->on_modify) {
+                       hashed_ini_entry->on_modify(hashed_ini_entry, 
hashed_ini_entry->value, hashed_ini_entry->value_length, 
hashed_ini_entry->mh_arg1, hashed_ini_entry->mh_arg2, 
hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP TSRMLS_CC);
                }
                p++;
        }

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