Fixed bug #33520 (crash if safe_mode is on and session.save_path is changed)

diff --git a/NEWS b/NEWS
index 11806fd223b4d9665957f8b9d7ffc52f9e7376dc..472b64e2fd751d2adde96970799a9203be0e02f3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ PHP                                                                        NEWS
   (Derick)
 - Fixed bug #33532 (Different output for strftime() and date()). (Derick)
 - Fixed bug #33523 (Memory leak in xmlrpc_encode_request()). (Ilia)
+- Fixed bug #33520 (crash if safe_mode is on and session.save_path is changed).
+  (Dmitry)
 - Fixed bug #33491 (crash after extending MySQLi internal class). (Tony)
 - Fixed bug #33475 (cURL handle is not closed on curl_close(). (Ilia)
 - Fixed bug #33469 (Compile error undefined reference to ifx_checkAPI). (Jani)

diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 1aa460358b613f252e1f2358109ababec056d69f..fa6a20b8fa6110d3adbc7b7c2dc3c89fc3bdc8eb 100644 (file)
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -552,7 +552,7 @@ php_ns_config(php_ns_context *ctx, char global)
 
                                Ns_Log(Debug, "PHP configuration option '%s=%s'", new_key, val);
                                zend_alter_ini_entry(new_key, strlen(new_key) + 1, val, 
-                                               strlen(val) + 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+                                               strlen(val) + 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
                                
                                efree(new_key);
                        }

diff --git a/sapi/apache2filter/apache_config.c b/sapi/apache2filter/apache_config.c
index 61d565a230319c929ca89f8d5636c70865869943..ea62539b96d0d15618740657714266986728e117 100644 (file)
--- a/sapi/apache2filter/apache_config.c
+++ b/sapi/apache2filter/apache_config.c
@@ -178,7 +178,7 @@ void apply_config(void *dummy)
                zend_hash_get_current_data(&d->config, (void **) &data);
                phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value));
                if (zend_alter_ini_entry(str, str_len, data->value, data->value_len, 
-                                       data->status, PHP_INI_STAGE_RUNTIME) == FAILURE) {
+                                       data->status, PHP_INI_STAGE_ACTIVATE) == FAILURE) {
                        phpapdebug((stderr, "..FAILED\n"));
                }       
        }

diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c
index bf0b2e0cc3d785a40c85b25f1b4fe1e28ff43221..62feef00d968713d73ca184beae752ae58966fcb 100644 (file)
--- a/sapi/apache2handler/apache_config.c
+++ b/sapi/apache2handler/apache_config.c
@@ -166,7 +166,7 @@ void apply_config(void *dummy)
                        zend_hash_move_forward(&d->config)) {
                zend_hash_get_current_data(&d->config, (void **) &data);
                phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value));
-               if (zend_alter_ini_entry(str, str_len, data->value, data->value_len, data->status, PHP_INI_STAGE_RUNTIME) == FAILURE) {
+               if (zend_alter_ini_entry(str, str_len, data->value, data->value_len, data->status, PHP_INI_STAGE_ACTIVATE) == FAILURE) {
                        phpapdebug((stderr, "..FAILED\n"));
                }       
        }

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 7b1e3015558a0dae7ed78514f5d3f7787076c15d..b701560b3d70f289024f7eb81b092a3645036deb 100644 (file)
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -774,7 +774,7 @@ static void nsapi_php_ini_entries(NSLS_D TSRMLS_DC)
                                /* change the ini entry */
                                if (zend_alter_ini_entry(entry->param->name, strlen(entry->param->name)+1,
                                 entry->param->value, strlen(entry->param->value),
-                                PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME)==FAILURE) {
+                                PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE)==FAILURE) {
                                        log_error(LOG_WARN, pblock_findval("fn", NSG(pb)), NSG(sn), NSG(rq), "Cannot change php.ini key \"%s\" to \"%s\"", entry->param->name, entry->param->value);
                                }
                        }