- Fixed bug #54312 (soap_version logic bug)

felipe · felipe · commit b6f6d4b448e7 · 2011-03-19T17:36:01.000Z
Patch by: tom at samplonius dot org git-svn-id: http://svn.php.net/repository/php/php-src/php/php-src/trunk@309433 c90b9560-bf6c-de11-be94-00142212c4b1
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");
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1095,9 +1095,11 @@ PHP_METHOD(SoapServer, SoapServer)`
`1095`	`1095`	`zval **tmp;`
`1096`	`1096`
`1097`	`1097`	`if (zend_hash_find(ht, "soap_version", sizeof("soap_version"), (void**)&tmp) == SUCCESS) {`
`1098`		`- if (Z_TYPE_PP(tmp) == IS_LONG \|\|`
`1099`		`- (Z_LVAL_PP(tmp) == SOAP_1_1 && Z_LVAL_PP(tmp) == SOAP_1_2)) {`
	`1098`	`+ if (Z_TYPE_PP(tmp) == IS_LONG &&`
	`1099`	`+ (Z_LVAL_PP(tmp) == SOAP_1_1 \|\| Z_LVAL_PP(tmp) == SOAP_1_2)) {`
`1100`	`1100`	`version = Z_LVAL_PP(tmp);`
	`1101`	`+ } else {`
	`1102`	`+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "'soap_version' option must be SOAP_1_1 or SOAP_1_2");`
`1101`	`1103`	`}`
`1102`	`1104`	`}`
`1103`	`1105`