diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-09-30 08:29:37 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-09-30 08:29:37 +0300 |
| commit | b94fd3a3b68d0fcc9dbd9275656925c8cf722d0d (patch) | |
| tree | 8f6db5c39a9bddccaa9d996c2bb91061b37a6a3d /ext/soap | |
| parent | 41ae63cf875d662ee1513af840cdf2eae29e4ac9 (diff) | |
| parent | 6f0b2326482c2c3cc937bbc8c061fd1d3783bd31 (diff) | |
| download | php-git-b94fd3a3b68d0fcc9dbd9275656925c8cf722d0d.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed incorrect logical condition
Diffstat (limited to 'ext/soap')
| -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 b79a6f531c..60a4ca5cc9 100644 --- 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); } } |