diff options
author | Felipe Pena <felipe@php.net> | 2011-05-24 22:24:06 +0000 |
---|---|---|
committer | Felipe Pena <felipe@php.net> | 2011-05-24 22:24:06 +0000 |
commit | 04d0210c8e9b429138625ce0ed13f6e4a6068850 (patch) | |
tree | 524b6fe5e209115b4ae5bcca99a14e9d595bba18 /ext/filter | |
parent | 59c102bf51a3dfab11a3014b80d2a1de83533e16 (diff) | |
download | php-git-04d0210c8e9b429138625ce0ed13f6e4a6068850.tar.gz |
- Fixed bug #54912 (filter/logical_filters.c:685:32: warning: use of logical || with constant op)
Initial patch by: crrodriguez at opensuse dot org
Diffstat (limited to 'ext/filter')
-rw-r--r-- | ext/filter/logical_filters.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c index 59af952c12..8dc98fdd1a 100644 --- a/ext/filter/logical_filters.c +++ b/ext/filter/logical_filters.c @@ -682,7 +682,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */ RETURN_VALIDATION_FAILED } - if (flags & (FILTER_FLAG_IPV4 || FILTER_FLAG_IPV6)) { + if (flags & (FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)) { /* Both formats are cool */ } else if ((flags & FILTER_FLAG_IPV4) && mode == FORMAT_IPV6) { RETURN_VALIDATION_FAILED |