diff options
| author | Anatol Belski <ab@php.net> | 2014-11-27 15:59:43 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-27 15:59:43 +0100 |
| commit | 864cd82acef03b75b994f3fd98d9b4a51a99204a (patch) | |
| tree | 4edfbcc6ce5d2f6fa6da9908503119c70ad868b5 /ext/filter/php_filter.h | |
| parent | 81a24f054b934ccb1be77049dd9c244283efcba7 (diff) | |
| parent | 4dcc8a63715b1bb42518e9c217ea493007016932 (diff) | |
| download | php-git-864cd82acef03b75b994f3fd98d9b4a51a99204a.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
updated NEWS
refactored the mbstring config.w32
Update NEWS
Fixed compilation warnings
Fixed bug #68504 --with-libmbfl configure option not present on Windows
Changed "finally" handling. Removed EX(fast_ret) and EX(delayed_exception). Allocate and use additional IS_TMP_VAR slot on VM stack instead.
the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
#68446 is fixed
Reimplemented silence operator (@) handling on exceptions. Now each silence region is stored in op_array->brk_cont_array. On exception ZEND_HANDLE_EXCEPTION handler traverse this array and restore original EG(error_reporting) if exception occured inside a "silence" region.
remove the NEWS entries for the reverted stuff
typo fix
go back with phpdbg to the state of 5.6.3, reverting the controversial commits(remote debugging/xml protocol)
5.5.21 now
New label length test
Fix ext/filter/tests/033.phpt
Fix filter_list test
FILTER_VALIDATE_DOMAIN and RFC conformance for FILTER_VALIDATE_URL
Conflicts:
ext/mbstring/config.w32
Diffstat (limited to 'ext/filter/php_filter.h')
| -rw-r--r-- | ext/filter/php_filter.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h index a1e7e6602c..7ddb009b87 100644 --- a/ext/filter/php_filter.h +++ b/ext/filter/php_filter.h @@ -76,6 +76,7 @@ void php_filter_int(PHP_INPUT_FILTER_PARAM_DECL); void php_filter_boolean(PHP_INPUT_FILTER_PARAM_DECL); void php_filter_float(PHP_INPUT_FILTER_PARAM_DECL); void php_filter_validate_regexp(PHP_INPUT_FILTER_PARAM_DECL); +void php_filter_validate_domain(PHP_INPUT_FILTER_PARAM_DECL); void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL); void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL); void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL); |