dmitry Thu Aug 26 08:20:13 2004 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/soap/tests/bugs bug29830.phpt bug29844.phpt
bug29844.wsdl
Modified files:
/php-src NEWS
/php-src/ext/soap php_packet_soap.c soap.c
Log:
Fixed bug #29844 (SOAP doesn't return the result of a valid SOAP request).
Fixed bug #29830 (SoapServer::setClass() should not export non-public methods).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.58&r2=1.1760.2.59&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.58 php-src/NEWS:1.1760.2.59
--- php-src/NEWS:1.1760.2.58 Wed Aug 25 20:26:21 2004
+++ php-src/NEWS Thu Aug 26 08:20:12 2004
@@ -9,6 +9,10 @@
(Paul Hudson, Derick)
- Fixed bug with raw_post_data not getting set (Brian)
- Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
+- Fixed bug #29844 (SOAP doesn't return the result of a valid SOAP request).
+ (Dmitry)
+- Fixed bug #29830 (SoapServer::setClass() should not export non-public
+ methods). (Dmitry)
- Fixed bug #29821 (Fixed possible crashes in convert_uudecode() on invalid
data). (Ilia)
- Fixed bug #29808 (array_count_values() breaks with numeric strings). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/soap/php_packet_soap.c?r1=1.36&r2=1.36.2.1&ty=u
Index: php-src/ext/soap/php_packet_soap.c
diff -u php-src/ext/soap/php_packet_soap.c:1.36
php-src/ext/soap/php_packet_soap.c:1.36.2.1
--- php-src/ext/soap/php_packet_soap.c:1.36 Fri May 21 10:50:19 2004
+++ php-src/ext/soap/php_packet_soap.c Thu Aug 26 08:20:13 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_packet_soap.c,v 1.36 2004/05/21 14:50:19 dmitry Exp $ */
+/* $Id: php_packet_soap.c,v 1.36.2.1 2004/08/26 12:20:13 dmitry Exp $ */
#include "php_soap.h"
@@ -250,8 +250,12 @@
while
(zend_hash_get_current_data(fn->responseParameters, (void **)&h_param) == SUCCESS) {
param = (*h_param);
if (fnb->style == SOAP_DOCUMENT) {
- name = param->encode->details.type_str;
- ns = param->encode->details.ns;
+ if (param->element) {
+ name =
param->encode->details.type_str;
+ ns = param->encode->details.ns;
+ } else {
+ name = param->paramName;
+ }
} else {
name = fn->responseName;
/* ns = ? */
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.2&r2=1.110.2.3&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.110.2.2 php-src/ext/soap/soap.c:1.110.2.3
--- php-src/ext/soap/soap.c:1.110.2.2 Tue Aug 10 12:30:30 2004
+++ php-src/ext/soap/soap.c Thu Aug 26 08:20:13 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.110.2.2 2004/08/10 16:30:30 dmitry Exp $ */
+/* $Id: soap.c,v 1.110.2.3 2004/08/26 12:20:13 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1126,7 +1126,9 @@
HashPosition pos;
zend_hash_internal_pointer_reset_ex(ft, &pos);
while (zend_hash_get_current_data_ex(ft, (void **)&f, &pos) !=
FAILURE) {
- add_next_index_string(return_value, f->common.function_name,
1);
+ if ((service->type != SOAP_CLASS) || (f->common.fn_flags &
ZEND_ACC_PUBLIC)) {
+ add_next_index_string(return_value,
f->common.function_name, 1);
+ }
zend_hash_move_forward_ex(ft, &pos);
}
}
http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug29830.phpt?r=1.1&p=1
Index: php-src/ext/soap/tests/bugs/bug29830.phpt
+++ php-src/ext/soap/tests/bugs/bug29830.phpt
http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug29844.phpt?r=1.1&p=1
Index: php-src/ext/soap/tests/bugs/bug29844.phpt
+++ php-src/ext/soap/tests/bugs/bug29844.phpt
http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug29844.wsdl?r=1.1&p=1
Index: php-src/ext/soap/tests/bugs/bug29844.wsdl
+++ php-src/ext/soap/tests/bugs/bug29844.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
