- Fixed bug #54312 (soap_version logic bug)

Patch by: tom at samplonius dot org
smarr · Mar 19, 2011 · 179b9d0 · 179b9d0
1 parent a286fa3
commit 179b9d0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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");
 			}
 		}