diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-09-30 08:29:21 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-09-30 08:29:21 +0300 |
| commit | 6f0b2326482c2c3cc937bbc8c061fd1d3783bd31 (patch) | |
| tree | 7622cf7cd49b18481c8d87e18724f75be437383e /ext | |
| parent | a1cee97de17fb124485da65bacdf8fa8d4db5b09 (diff) | |
| parent | 3f5c47af3bab388b9a8b70bf765ee8f3153649dc (diff) | |
| download | php-git-6f0b2326482c2c3cc937bbc8c061fd1d3783bd31.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed incorrect logical condition
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/soap/soap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 4dc463fef0..7429aebbf7 100644 --- 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); } } |