From 179b9d0f63ace9a8eb29a73892302508ad80cbd5 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sat, 19 Mar 2011 17:36:01 +0000 Subject: [PATCH] - Fixed bug #54312 (soap_version logic bug) Patch by: tom at samplonius dot org --- ext/soap/soap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/soap/soap.c b/ext/soap/soap.c index c875f5a0ac..0001e3c349 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -1095,9 +1095,11 @@ PHP_METHOD(SoapServer, SoapServer) zval **tmp; if (zend_hash_find(ht, "soap_version", sizeof("soap_version"), (void**)&tmp) == SUCCESS) { - if (Z_TYPE_PP(tmp) == IS_LONG || - (Z_LVAL_PP(tmp) == SOAP_1_1 && Z_LVAL_PP(tmp) == SOAP_1_2)) { + if (Z_TYPE_PP(tmp) == IS_LONG && + (Z_LVAL_PP(tmp) == SOAP_1_1 || Z_LVAL_PP(tmp) == SOAP_1_2)) { version = Z_LVAL_PP(tmp); + } else { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "'soap_version' option must be SOAP_1_1 or SOAP_1_2"); } } -- 2.40.0