Merge branch 'PHP-7.3' into PHP-7.4

dstogov · dstogov · commit 6f0b2326482c · 2020-09-30T08:29:21.000+03:00
* PHP-7.3:
  Fixed incorrect logical condition
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -2338,8 +2338,8 @@ PHP_METHOD(SoapClient, SoapClient)
 		}
 
 		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
`@@ -2338,8 +2338,8 @@ PHP_METHOD(SoapClient, SoapClient)`
`2338`	`2338`	`}`
`2339`	`2339`
`2340`	`2340`	`if ((tmp = zend_hash_str_find(ht, "soap_version", sizeof("soap_version")-1)) != NULL) {`
`2341`		`- if (Z_TYPE_P(tmp) == IS_LONG \|\|`
`2342`		`- (Z_LVAL_P(tmp) == SOAP_1_1 && Z_LVAL_P(tmp) == SOAP_1_2)) {`
	`2341`	`+ if (Z_TYPE_P(tmp) == IS_LONG &&`
	`2342`	`+ (Z_LVAL_P(tmp) == SOAP_1_1 \|\| Z_LVAL_P(tmp) == SOAP_1_2)) {`
`2343`	`2343`	`soap_version = Z_LVAL_P(tmp);`
`2344`	`2344`	`}`
`2345`	`2345`	`}`