[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

[Ilia Alshanetsky]

iliaa           Tue Dec 12 18:05:38 2006 UTC

  Modified files:              
    /php-src/sapi/apache2handler        sapi_apache2.c 
  Log:
  MFB: Fixed bug #39797 (virtual() does not reset changed INI settings).
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.77&r2=1.78&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.77 
php-src/sapi/apache2handler/sapi_apache2.c:1.78
--- php-src/sapi/apache2handler/sapi_apache2.c:1.77     Thu Nov  9 19:10:27 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c  Tue Dec 12 18:05:38 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.77 2006/11/09 19:10:27 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.78 2006/12/12 18:05:38 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -462,6 +462,20 @@
 {
        if (strcmp(r->protocol, "INCLUDED")) {
                zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try();
+       } else {
+typedef struct {
+       HashTable config;
+} php_conf_rec;
+               char *str;
+               uint str_len;
+               php_conf_rec *c = ap_get_module_config(r->per_dir_config, 
&php5_module);
+
+               for (zend_hash_internal_pointer_reset(&c->config); 
+                               zend_hash_get_current_key_ex(&c->config, &str, 
&str_len, NULL, 0,  NULL) == HASH_KEY_IS_STRING;
+                               zend_hash_move_forward(&c->config)
+               ) {
+                       zend_restore_ini_entry(str, str_len, 
ZEND_INI_STAGE_SHUTDOWN);
+               }       
        }
        if (p) {
                ((php_struct *)SG(server_context))->r = p;

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