mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-03 06:44:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

- implement FILTER_FLAG_ARRAY/SCALAR in input_get

Browse Source 
- update changelog
- update tests
This commit is contained in:
Pierre Joye 2006-08-31 22:32:54 +00:00
parent e166a67ebd
commit e0297b480f
6 changed files with 115 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/filter/CREDITS
View File

@ -1,2 +1,2 @@
Input Filter
Rasmus Lerdorf, Derick Rethans
Rasmus Lerdorf, Derick Rethans, Pierre-Alain Joye

22
ext/filter/filter.c
View File

@ -634,7 +634,29 @@ PHP_FUNCTION(input_get)
}
if (found) {
zval **option;
if (options && filter_flags==0 &&
zend_hash_find(HASH_OF(options), "flags", sizeof("flags"), (void **)&option) == SUCCESS) {
switch (Z_TYPE_PP(option)) {
case IS_ARRAY:
break;
default:
convert_to_long(*option);
filter_flags = Z_LVAL_PP(option);
break;
}
} else {
filter_flags = FILTER_FLAG_SCALAR;
}
zval_copy_ctor(return_value); /* Watch out for empty strings */
if (Z_TYPE_P(return_value) == IS_ARRAY && !(filter_flags & FILTER_FLAG_ARRAY)) {
zval_dtor(return_value);
ZVAL_BOOL(return_value, 0);
}
php_zval_filter_recursive(&return_value, filter, filter_flags, options, charset TSRMLS_CC);
} else {
RETURN_NULL();

4
ext/filter/filter_private.h
View File

@ -23,8 +23,8 @@
#define FILTER_FLAG_NONE 0x0000
#define FILTER_FLAG_ARRAY 0x1000000
#define FILTER_FLAG_SCALAR 0x2000000
#define FILTER_FLAG_ARRAY 0x1000000
#define FILTER_FLAG_SCALAR 0x2000000
#define FILTER_FLAG_ALLOW_OCTAL 0x0001
#define FILTER_FLAG_ALLOW_HEX 0x0002

139
ext/filter/package.xml
View File

@ -1,58 +1,71 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE package SYSTEM "../pear/package.dtd">
<package>
<?xml version="1.0" encoding="UTF-8"?>
<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.4.6" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
<name>filter</name>
<channel>pecl.php.net</channel>
<summary>Extension for safely dealing with input parameters</summary>
<maintainers>
<maintainer>
<user>derick</user>
<name>Derick Rethans</name>
<email>derick@php.net</email>
<role>lead</role>
</maintainer>
<maintainer>
<user>rasmus</user>
<name>Rasmus Lerdorf</name>
<email>rasmus@php.net</email>
<role>lead</role>
</maintainer>
</maintainers>
<description>
The Input Filter extension is meant to address this issue by implementing a set
<description>The Input Filter extension is meant to address this issue by implementing a set
of filters and mechanisms that users can use to safely access their input data.
</description>
<license>PHP</license>
<release>
<state>beta</state>
<version>0.10.0</version>
<date>2006-05-14</date>
<notes>- Fixed PECL bug #8315, NULL character stops the validation (Pierre)
<lead>
<name>Pierre-Alain Joye</name>
<user>pajoye</user>
<email>pierre@php.net</email>
<active>yes</active>
</lead>
<lead>
<name>Derick Rethans</name>
<user>derick</user>
<email>derick@php.net</email>
<active>yes</active>
</lead>
<lead>
<name>Rasmus Lerdorf</name>
<user>rasmus</user>
<email>rasmus@php.net</email>
<active>yes</active>
</lead>
<date>2006-01-09</date>
<version>
<release>0.10.0</release>
<api>0.10.0</api>
</version>
<stability>
<release>beta</release>
<api>alpha</api>
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>- Fixed PECL bug #6136, ini_set should not be able to change the filter.default (Pierre)
- Fixed PECL bug #6639: uppercase hexadecimal digits are not supported
- Fixed PECL bug #7733, Float exponential weird result (Pierre)
- Fixed PECL bug #7715, Input_get float error (Pierre)
- Fixed PECL bug #6639: uppercase hexadecimal digits are not supported
- Fixed PECL bug #6136, ini_set should not be able to change the filter.default (Pierre)
- Implemented PECL req #6641: negative values for hexadecimal and octal numbers are not supported.
- Added support for php pcre expressions (Pierre)
- Fixed PECL bug #8316, empty string with FILTER_VALIDATE_INT returns 0
- Fixed Possible leak in internal sapi_filter (Pierre)
- Fixed an issue with multiple calls using the same input type (Tony)
- Fixed leak in sapi filter (Tony, Ilia)
- Fixed magic_quotes_gpc from being applied when RAW filter is used (Ilia)
- Implemented PECL req #6641: negative values for hexadecimal and octal numbers are not supported.
- Added support for custom decimal separator (Pierre)
- Added support for php pcre expressions (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)
- Added FILTER_FLAG_SCALAR and FILTER_FLAG_ARRAY, allows or not array values (Pierre)
- Basic IPv6 (no option yet, only the syntax is verified) (Pierre)
- Add support for custom decimal separator (Pierre)
- INT and Float filters trim the values before the validations (spaces only) (Pierre)
- INT, Float and boolean filters trim the values before the validations (default trim()) (Pierre)
- input_get and input_get_args returns now FALSE when the validation failed
and NULL when the variable has not been found (Pierre)
- Added JIT support
</notes>
<filelist>
<file role="src" name="config.m4"/>
<file role="src" name="config.w32"/>
<file role="src" name="filter.c"/>
<file role="src" name="filter_private.h"/>
<file role="src" name="callback_filter.c"/>
<file role="src" name="logical_filters.c"/>
<file role="src" name="sanitizing_filters.c"/>
<file role="src" name="php_filter.h"/>
<file role="doc" name="CREDITS"/>
</notes>
<contents>
<dir name="/">
<file name="callback_filter.c" role="src"/>
<file name="config.m4" role="src"/>
<file name="config.w32" role="src"/>
<file name="CREDITS" role="doc"/>
<file name="filter.c" role="src"/>
<file name="filter_private.h" role="src"/>
<file name="logical_filters.c" role="src"/>
<file name="php_filter.h" role="src"/>
<file name="sanitizing_filters.c" role="src"/>
<dir name="tests">
<file role="test" name="001.phpt"/>
<file role="test" name="002.phpt"/>
@ -88,12 +101,36 @@ of filters and mechanisms that users can use to safely access their input data.
<file role="test" name="032.phpt"/>
<file role="test" name="bug7586.phpt"/>
</dir>
</filelist>
<deps>
<dep type="php" rel="ge" version="5.0.0"/>
</deps>
</release>
</dir>
<!-- / -->
</contents>
<dependencies>
<required>
<php>
<min>5.0.0</min>
</php>
<pearinstaller>
<min>1.4.0b1</min>
</pearinstaller>
</required>
</dependencies>
<providesextension>filter</providesextension>
<extsrcrelease/>
<changelog>
<release>
<date>2006-01-23</date>
<time>10:04:15</time>
<version>
<release>0.9.4</release>
<api>0.9.4</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<notes>- Reimplement php_filter_callback() as exception-safe and without memleaks
- Renamed all constants.
- Fixed PECL bug #6124: Crash on HTML tags when using FS_STRING</notes>
</release>
</changelog>
</package>
<!--
vim:et:ts=1:sw=1
-->

127
ext/filter/package2.xml
View File

@ -1,127 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.4.6" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
<name>filter</name>
<channel>pecl.php.net</channel>
<summary>Extension for safely dealing with input parameters</summary>
<description>The Input Filter extension is meant to address this issue by implementing a set
of filters and mechanisms that users can use to safely access their input data.
</description>
<lead>
<name>Derick Rethans</name>
<user>derick</user>
<email>derick@php.net</email>
<active>yes</active>
</lead>
<lead>
<name>Rasmus Lerdorf</name>
<user>rasmus</user>
<email>rasmus@php.net</email>
<active>yes</active>
</lead>
<date>2006-05-14</date>
<time>10:04:15</time>
<version>
<release>0.10.0</release>
<api>0.10.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>- Fixed PECL bug #6136, ini_set should not be able to change the filter.default (Pierre)
- Fixed PECL bug #6639: uppercase hexadecimal digits are not supported
- Fixed PECL bug #7733, Float exponential weird result (Pierre)
- Fixed PECL bug #7715, Input_get float error (Pierre)
- Implemented PECL req #6641: negative values for hexadecimal and octal numbers are not supported.
- Added support for php pcre expressions (Pierre)
- 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)
- Basic IPv6 (no option yet, only the syntax is verified) (Pierre)
- Add support for custom decimal separator (Pierre)
- INT and Float filters trim the values before the validations (spaces only) (Pierre)
- input_get and input_get_args returns now FALSE when the validation failed
and NULL when the variable has not been found (Pierre)
- Added JIT support
</notes>
<contents>
<dir name="/">
<file name="callback_filter.c" role="src"/>
<file name="config.m4" role="src"/>
<file name="config.w32" role="src"/>
<file name="CREDITS" role="doc"/>
<file name="filter.c" role="src"/>
<file name="filter_private.h" role="src"/>
<file name="logical_filters.c" role="src"/>
<file name="php_filter.h" role="src"/>
<file name="sanitizing_filters.c" role="src"/>
<dir name="tests">
<file role="test" name="001.phpt"/>
<file role="test" name="002.phpt"/>
<file role="test" name="003.phpt"/>
<file role="test" name="004.phpt"/>
<file role="test" name="005.phpt"/>
<file role="test" name="006.phpt"/>
<file role="test" name="007.phpt"/>
<file role="test" name="008.phpt"/>
<file role="test" name="009.phpt"/>
<file role="test" name="010.phpt"/>
<file role="test" name="011.phpt"/>
<file role="test" name="012.phpt"/>
<file role="test" name="013.phpt"/>
<file role="test" name="014.phpt"/>
<file role="test" name="015.phpt"/>
<file role="test" name="016.phpt"/>
<file role="test" name="017.phpt"/>
<file role="test" name="018.phpt"/>
<file role="test" name="019.phpt"/>
<file role="test" name="020.phpt"/>
<file role="test" name="021.phpt"/>
<file role="test" name="022.phpt"/>
<file role="test" name="023.phpt"/>
<file role="test" name="024.phpt"/>
<file role="test" name="025.phpt"/>
<file role="test" name="026.phpt"/>
<file role="test" name="027.phpt"/>
<file role="test" name="028.phpt"/>
<file role="test" name="029.phpt"/>
<file role="test" name="030.phpt"/>
<file role="test" name="031.phpt"/>
<file role="test" name="032.phpt"/>
<file role="test" name="bug7586.phpt"/>
</dir>
</dir>
<!-- / -->
</contents>
<dependencies>
<required>
<php>
<min>5.0.0</min>
</php>
<pearinstaller>
<min>1.4.0b1</min>
</pearinstaller>
</required>
</dependencies>
<providesextension>filter</providesextension>
<extsrcrelease/>
<changelog>
<release>
<date>2006-01-23</date>
<time>10:04:15</time>
<version>
<release>0.9.4</release>
<api>0.9.4</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<notes>- Reimplement php_filter_callback() as exception-safe and without memleaks
- Renamed all constants.
- Fixed PECL bug #6124: Crash on HTML tags when using FS_STRING</notes>
</release>
</changelog>
</package>

4
ext/filter/tests/035.phpt
View File

@ -12,10 +12,10 @@ var_dump($ret);
$ret = input_get(INPUT_GET, 'a', FILTER_VALIDATE_INT, array('flags'=>FILTER_FLAG_ALLOW_OCTAL));
var_dump($ret);
$ret = input_get(INPUT_GET, 'ar', FILTER_VALIDATE_INT);
$ret = input_get(INPUT_GET, 'ar', FILTER_VALIDATE_INT, array('flags'=>FILTER_FLAG_ARRAY));
var_dump($ret);
$ret = input_get(INPUT_GET, 'ar', FILTER_VALIDATE_INT, array('flags'=>FILTER_FLAG_ALLOW_OCTAL));
$ret = input_get(INPUT_GET, 'ar', FILTER_VALIDATE_INT, array('flags'=>FILTER_FLAG_ALLOW_OCTAL|FILTER_FLAG_ARRAY));
var_dump($ret);
?>
--EXPECT--