Re: cvs: php-src(PHP_5_0) / NEWS /sapi/aolserver aolserver.c /sapi/apache2filter apache_config.c /sapi/apache2handler apache_config.c /sapi/nsapi
nsapi.c

On Mon, 4 Jul 2005, Dmitry Stogov wrote: > dmitry Mon Jul 4 08:47:27 2005 EDT > > Modified files: (Branch: PHP_5_0) > /php-src NEWS > /php-src/sapi/aolserver aolserver.c > /php-src/sapi/apache2filter apache_config.c > /php-src/sapi/apache2handler apache_config.c > /php-src/sapi/nsapi nsapi.c > Log: > Fixed bug #33520 (crash if safe_mode is on and session.save_path is changed) Shouldn't this fix also be merged to the 4_4 branch? regards, Derick > > http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.447&r2=1.1760.2.448&ty=u > Index: php-src/NEWS > diff -u php-src/NEWS:1.1760.2.447 php-src/NEWS:1.1760.2.448 > --- php-src/NEWS:1.1760.2.447 Mon Jul 4 06:08:19 2005 > +++ php-src/NEWS Mon Jul 4 08:47:26 2005 > @@ -14,6 +14,8 @@ > - Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey) > - Fixed memory corruption in stristr(). (Derick) > - Fixed segfaults when CURL callback functions throw exception. (Tony) > +- 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 #33340 (CLI Crash when calling php:function from XSLT). (Rob) > - Fixed bug #33277 (private method accessed by child class). (Dmitry) > > http://cvs.php.net/diff.php/php-src/sapi/aolserver/aolserver.c?r1=1.77&r2=1.77.2.1&ty=u > Index: php-src/sapi/aolserver/aolserver.c > diff -u php-src/sapi/aolserver/aolserver.c:1.77 php-src/sapi/aolserver/aolserver.c:1.77.2.1 > --- php-src/sapi/aolserver/aolserver.c:1.77 Thu Jan 8 03:18:02 2004 > +++ php-src/sapi/aolserver/aolserver.c Mon Jul 4 08:47:26 2005 > @@ -22,7 +22,7 @@ > * - CGI/1.1 conformance > */ > > -/* $Id: aolserver.c,v 1.77 2004/01/08 08:18:02 andi Exp $ */ > +/* $Id: aolserver.c,v 1.77.2.1 2005/07/04 12:47:26 dmitry Exp $ */ > > /* conflict between PHP and AOLserver headers */ > #define Debug php_Debug > @@ -205,7 +205,7 @@ > int i; > > php_info_print_table_start(); > - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.77 > 2004/01/08 08:18:02 andi Exp $"); > + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v > 1.77.2.1 2005/07/04 12:47:26 dmitry Exp $"); > php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); > php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); > php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); > @@ -549,7 +549,7 @@ > > 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); > } > > http://cvs.php.net/diff.php/php-src/sapi/apache2filter/apache_config.c?r1=1.32&r2=1.32.2.1&ty=u > Index: php-src/sapi/apache2filter/apache_config.c > diff -u php-src/sapi/apache2filter/apache_config.c:1.32 > php-src/sapi/apache2filter/apache_config.c:1.32.2.1 > --- php-src/sapi/apache2filter/apache_config.c:1.32 Thu Jan 8 03:18:04 2004 > +++ php-src/sapi/apache2filter/apache_config.c Mon Jul 4 08:47:26 2005 > @@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: apache_config.c,v 1.32 2004/01/08 08:18:04 andi Exp $ */ > +/* $Id: apache_config.c,v 1.32.2.1 2005/07/04 12:47:26 dmitry Exp $ */ > > #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS > > @@ -178,7 +178,7 @@ > 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")); > } > } > > http://cvs.php.net/diff.php/php-src/sapi/apache2handler/apache_config.c?r1=1.5&r2=1.5.2.1&ty=u > Index: php-src/sapi/apache2handler/apache_config.c > diff -u php-src/sapi/apache2handler/apache_config.c:1.5 > php-src/sapi/apache2handler/apache_config.c:1.5.2.1 > --- php-src/sapi/apache2handler/apache_config.c:1.5 Thu Jan 8 03:18:05 2004 > +++ php-src/sapi/apache2handler/apache_config.c Mon Jul 4 08:47:26 2005 > @@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: apache_config.c,v 1.5 2004/01/08 08:18:05 andi Exp $ */ > +/* $Id: apache_config.c,v 1.5.2.1 2005/07/04 12:47:26 dmitry Exp $ */ > > #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS > > @@ -166,7 +166,7 @@ > 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")); > } > } > > http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.63.2.2&r2=1.63.2.3&ty=u > Index: php-src/sapi/nsapi/nsapi.c > diff -u php-src/sapi/nsapi/nsapi.c:1.63.2.2 php-src/sapi/nsapi/nsapi.c:1.63.2.3 > --- php-src/sapi/nsapi/nsapi.c:1.63.2.2 Mon Sep 20 09:29:44 2004 > +++ php-src/sapi/nsapi/nsapi.c Mon Jul 4 08:47:26 2005 > @@ -17,7 +17,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: nsapi.c,v 1.63.2.2 2004/09/20 13:29:44 thetaphi Exp $ */ > +/* $Id: nsapi.c,v 1.63.2.3 2005/07/04 12:47:26 dmitry Exp $ */ > > /* > * PHP includes > @@ -310,7 +310,7 @@ > PHP_MINFO_FUNCTION(nsapi) > { > php_info_print_table_start(); > - php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.63.2.2 > $"); > + php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.63.2.3 > $"); > php_info_print_table_row(2, "Server Software", system_version()); > php_info_print_table_row(2, "Sub-requests with nsapi_virtual()", > (nsapi_servact_service)?((zend_ini_long("zlib.output_compression", > sizeof("zlib.output_compression"), 0))?"not supported with > zlib.output_compression":"enabled"):"not supported on this platform" ); > @@ -768,7 +768,7 @@ > /* 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); > } > } > > -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org