Merge branch 'PHP-7.4'

dstogov · dstogov · commit b94fd3a3b68d · 2020-09-30T08:29:37.000+03:00
* PHP-7.4:
  Fixed incorrect logical condition
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -2023,8 +2023,8 @@ PHP_METHOD(SoapClient, __construct)
 		}
 
 		if ((tmp = zend_hash_str_find(ht, "soap_version", sizeof("soap_version")-1)) != NULL) {
-			if (Z_TYPE_P(tmp) == IS_LONG ||
-			    (Z_LVAL_P(tmp) == SOAP_1_1 && Z_LVAL_P(tmp) == SOAP_1_2)) {
+			if (Z_TYPE_P(tmp) == IS_LONG &&
+			    (Z_LVAL_P(tmp) == SOAP_1_1 || Z_LVAL_P(tmp) == SOAP_1_2)) {
 				soap_version = Z_LVAL_P(tmp);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -2023,8 +2023,8 @@ PHP_METHOD(SoapClient, __construct)`
`2023`	`2023`	`}`
`2024`	`2024`
`2025`	`2025`	`if ((tmp = zend_hash_str_find(ht, "soap_version", sizeof("soap_version")-1)) != NULL) {`
`2026`		`- if (Z_TYPE_P(tmp) == IS_LONG \|\|`
`2027`		`- (Z_LVAL_P(tmp) == SOAP_1_1 && Z_LVAL_P(tmp) == SOAP_1_2)) {`
	`2026`	`+ if (Z_TYPE_P(tmp) == IS_LONG &&`
	`2027`	`+ (Z_LVAL_P(tmp) == SOAP_1_1 \|\| Z_LVAL_P(tmp) == SOAP_1_2)) {`
`2028`	`2028`	`soap_version = Z_LVAL_P(tmp);`
`2029`	`2029`	`}`
`2030`	`2030`	`}`