From: Pierre Joye <pajoye@php.net>
Date: Mon, 8 May 2006 16:24:12 +0000 (+0000)
Subject: - #6136, ini_set should not be able to change the filter.default
X-Git-Tag: BEFORE_NEW_OUTPUT_API~280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1fd3c9baf27584f88c61b6d42c7a97b441e253ee;p=php

- #6136, ini_set should not be able to change the filter.default
---

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index a9fb1c6f8d..9357f29675 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -144,8 +144,8 @@ static PHP_INI_MH(OnUpdateFlags)
 }
 
 PHP_INI_BEGIN()
-	STD_PHP_INI_ENTRY("filter.default",   "string", PHP_INI_ALL, UpdateDefaultFilter, default_filter, zend_filter_globals, filter_globals)
-	PHP_INI_ENTRY("filter.default_flags", NULL,     PHP_INI_ALL, OnUpdateFlags)
+	STD_PHP_INI_ENTRY("filter.default",   "string", PHP_INI_SYSTEM|PHP_INI_PERDIR, UpdateDefaultFilter, default_filter, zend_filter_globals, filter_globals)
+	PHP_INI_ENTRY("filter.default_flags", NULL,     PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateFlags)
 PHP_INI_END()
 /* }}} */
 
@@ -236,6 +236,7 @@ PHP_MINIT_FUNCTION(filter)
 	REGISTER_LONG_CONSTANT("FILTER_FLAG_NO_PRIV_RANGE", FILTER_FLAG_NO_PRIV_RANGE, CONST_CS | CONST_PERSISTENT);
 
 	sapi_register_input_filter(php_sapi_filter);
+
 	return SUCCESS;
 }
 /* }}} */
@@ -428,6 +429,7 @@ static void php_zval_filter_recursive(zval *value, long filter, long flags, zval
 static zval * php_filter_get_storage(long arg TSRMLS_DC)
 {
 	zval * array_ptr = NULL;
+
 	switch (arg) {
 		case PARSE_GET:
 			array_ptr = IF_G(get_array);
diff --git a/ext/filter/package.xml b/ext/filter/package.xml
index 5f87d6cf08..c83514df07 100644
--- a/ext/filter/package.xml
+++ b/ext/filter/package.xml
@@ -33,6 +33,7 @@ of filters and mechanisms that users can use to safely access their input data.
 - Fixed Possible leak in internal sapi_filter (Pierre)
 - Added input_get_args, fetches all input in one call (Pierre)
 - Added FILTER_FLAG_SCALAR and FILTER_FLAG_ARRAY , allows or not array values (Pierre)
+- Fixed PECL bug #6136, ini_set should not be able to change the filter.default (Pierre)
   </notes>
   <filelist>
    <file role="src" name="config.m4"/>
diff --git a/ext/filter/package2.xml b/ext/filter/package2.xml
index 8222bd3c1c..97d58aea2a 100644
--- a/ext/filter/package2.xml
+++ b/ext/filter/package2.xml
@@ -39,6 +39,7 @@ of filters and mechanisms that users can use to safely access their input data.
 - Fixed Possible leak in internal sapi_filter (Pierre)
 - Added input_get_args, fetches all input in one call (Pierre)
 - Added FILTER_FLAG_SCALAR and FILTER_FLAG_ARRAY , allows or not array values (Pierre)
+- Fixed PECL bug #6136, ini_set should not be able to change the filter.default (Pierre)
  </notes>
  <contents>
   <dir name="/">