felipe Sat, 19 Mar 2011 17:36:01 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=309433
Log: - Fixed bug #54312 (soap_version logic bug) Patch by: tom at samplonius dot org Bug: http://bugs.php.net/54312 (Open) soap_version logic bug Changed paths: U php/php-src/branches/PHP_5_3/ext/soap/soap.c U php/php-src/trunk/ext/soap/soap.c Modified: php/php-src/branches/PHP_5_3/ext/soap/soap.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/soap/soap.c 2011-03-19 17:14:28 UTC (rev 309432) +++ php/php-src/branches/PHP_5_3/ext/soap/soap.c 2011-03-19 17:36:01 UTC (rev 309433) @@ -1213,9 +1213,11 @@ 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"); } } Modified: php/php-src/trunk/ext/soap/soap.c =================================================================== --- php/php-src/trunk/ext/soap/soap.c 2011-03-19 17:14:28 UTC (rev 309432) +++ php/php-src/trunk/ext/soap/soap.c 2011-03-19 17:36:01 UTC (rev 309433) @@ -1095,9 +1095,11 @@ 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"); } }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
