iliaa           Thu Mar 13 15:56:21 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    NEWS 
    /ZendEngine2        zend_ini.c 
    /php-src/ext/reflection     php_reflection.c 
  Log:
  
  Fixed bug #43677 (Inconsistent behaviour of include_path set with
  php_value).
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1116&r2=1.2027.2.547.2.1117&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1116 php-src/NEWS:1.2027.2.547.2.1117
--- php-src/NEWS:1.2027.2.547.2.1116    Wed Mar 12 19:13:00 2008
+++ php-src/NEWS        Thu Mar 13 15:56:21 2008
@@ -4,6 +4,8 @@
 - Fixed bug #44394 (Last two bytes missing from output). (Felipe)
 - Fixed bug #44388 (Crash inside exif_read_data() on invalid images) (Ilia)
 - Fixed bug #44373 (PDO_OCI extension compile failed). (Felipe)
+- Fixed bug #43677 (Inconsistent behaviour of include_path set with
+  php_value). (manuel at mausz dot at)
 - Fixed bug #42177 (Warning "array_merge_recursive(): recursion detected" 
comes 
   again...). (Felipe)
 
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini.c?r1=1.39.2.2.2.26&r2=1.39.2.2.2.27&diff_format=u
Index: ZendEngine2/zend_ini.c
diff -u ZendEngine2/zend_ini.c:1.39.2.2.2.26 
ZendEngine2/zend_ini.c:1.39.2.2.2.27
--- ZendEngine2/zend_ini.c:1.39.2.2.2.26        Mon Dec 31 07:20:03 2007
+++ ZendEngine2/zend_ini.c      Thu Mar 13 15:56:21 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_ini.c,v 1.39.2.2.2.26 2007/12/31 07:20:03 sebastian Exp $ */
+/* $Id: zend_ini.c,v 1.39.2.2.2.27 2008/03/13 15:56:21 iliaa Exp $ */
 
 #include "zend.h"
 #include "zend_qsort.h"
@@ -63,6 +63,9 @@
                ini_entry->modified = 0;
                ini_entry->orig_value = NULL;
                ini_entry->orig_value_length = 0;
+               if (ini_entry->modifiable >= (1 << 3)) {
+                       ini_entry->modifiable >>= 3;
+               }
        }
        return 0;
 }
@@ -244,6 +247,7 @@
 {
        zend_ini_entry *ini_entry;
        char *duplicate;
+       zend_bool modifiable;
        zend_bool modified;
        TSRMLS_FETCH();
 
@@ -251,8 +255,12 @@
                return FAILURE;
        }
 
+       modifiable = ini_entry->modifiable;
+       modified = ini_entry->modified;
+
        if (stage == ZEND_INI_STAGE_ACTIVATE && modify_type == ZEND_INI_SYSTEM) 
{
-               ini_entry->modifiable = ZEND_INI_SYSTEM;
+               /* only touch lower bits */
+               ini_entry->modifiable = (ini_entry->modifiable & (ZEND_INI_ALL 
<< 3)) | ZEND_INI_SYSTEM;
        }
 
        if (!force_change) {
@@ -261,8 +269,6 @@
                }
        }
 
-       modified = ini_entry->modified;
-
        if (!EG(modified_ini_directives)) {
                ALLOC_HASHTABLE(EG(modified_ini_directives));
                zend_hash_init(EG(modified_ini_directives), 8, NULL, NULL, 0);
@@ -270,6 +276,8 @@
        if (!modified) {
                ini_entry->orig_value = ini_entry->value;
                ini_entry->orig_value_length = ini_entry->value_length;
+               /* store orginial value in the upper bits */
+               ini_entry->modifiable = (modifiable << 3) | 
ini_entry->modifiable;
                ini_entry->modified = 1;
                zend_hash_add(EG(modified_ini_directives), name, name_length, 
&ini_entry, sizeof(zend_ini_entry*), NULL);
        }
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.49&r2=1.164.2.33.2.50&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.49 
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.50
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.49     Mon Feb 18 
14:30:25 2008
+++ php-src/ext/reflection/php_reflection.c     Thu Mar 13 15:56:21 2008
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.33.2.49 2008/02/18 14:30:25 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.50 2008/03/13 15:56:21 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -836,7 +836,7 @@
 
        if (number == ini_entry->module_number) {
                string_printf(str, "    %sEntry [ %s <", indent, 
ini_entry->name);
-               if (ini_entry->modifiable == ZEND_INI_ALL) {
+               if (ini_entry->modifiable & ZEND_INI_ALL) {
                        string_printf(str, "ALL");
                } else {
                        if (ini_entry->modifiable & ZEND_INI_USER) {
@@ -4908,7 +4908,7 @@
        php_info_print_table_start();
        php_info_print_table_header(2, "Reflection", "enabled");
 
-       php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 
1.164.2.33.2.49 2008/02/18 14:30:25 dmitry Exp $");
+       php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 
1.164.2.33.2.50 2008/03/13 15:56:21 iliaa Exp $");
 
        php_info_print_table_end();
 } /* }}} */



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

Reply via email to