From: Felipe Pena <felipe@php.net>
Date: Tue, 24 May 2011 22:24:06 +0000 (+0000)
Subject: - Fixed bug #54912 (filter/logical_filters.c:685:32: warning: use of logical || with... 
X-Git-Tag: php-5.5.0alpha1~2047
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b28294acc24256d123c65dd3a358145e52260e62;p=php

- Fixed bug #54912 (filter/logical_filters.c:685:32: warning: use of logical || with constant op)
  Initial patch by: crrodriguez at opensuse dot org
---

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