From: Felipe Pena <felipe@php.net>
Date: Sat, 19 Mar 2011 17:36:01 +0000 (+0000)
Subject: - Fixed bug #54312 (soap_version logic bug)
X-Git-Tag: php-5.4.0alpha1~191^2~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=179b9d0f63ace9a8eb29a73892302508ad80cbd5;p=php

- Fixed bug #54312 (soap_version logic bug)
  Patch by: tom at samplonius dot org
---

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");
 			}
 		}