[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap php_sdl.c /ext/soap/tests/bugs bug29109.phpt multiport.phpt multiport.wsdl
dmitry Wed Jun 18 07:23:58 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/soap/tests/bugsmultiport.phpt multiport.wsdl
Modified files:
/php-src/ext/soap php_sdl.c
/php-src/ext/soap/tests/bugsbug29109.phpt
Log:
Fixed SOAP binding selection
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.9.2.3r2=1.88.2.12.2.9.2.4diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.3
php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.4
--- php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.3Wed May 7 15:23:10 2008
+++ php-src/ext/soap/php_sdl.c Wed Jun 18 07:23:58 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.12.2.9.2.3 2008/05/07 15:23:10 davidc Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.12.2.9.2.4 2008/06/18 07:23:58 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -722,12 +722,12 @@
}
trav2 = trav2-next;
}
- if (!address) {
+ if (!address || tmpbinding-bindingType ==
BINDING_HTTP) {
if (has_soap_port || trav-next || i
n-1) {
efree(tmpbinding);
trav = trav-next;
continue;
- } else {
+ } else if (!address) {
soap_error0(E_ERROR, Parsing
WSDL: No address associated with port);
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug29109.phpt?r1=1.1.8.2r2=1.1.8.3diff_format=u
Index: php-src/ext/soap/tests/bugs/bug29109.phpt
diff -u php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.8.2
php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.8.3
--- php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.8.2 Sat May 24 15:22:18 2008
+++ php-src/ext/soap/tests/bugs/bug29109.phpt Wed Jun 18 07:23:58 2008
@@ -10,11 +10,7 @@
var_dump($client-__getFunctions());
?
--EXPECT--
-array(3) {
+array(1) {
[0]=
string(53) HelloWorldResponse HelloWorld(HelloWorld $parameters)
- [1]=
- string(19) string HelloWorld()
- [2]=
- string(19) string HelloWorld()
}
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/multiport.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/multiport.phpt
+++ php-src/ext/soap/tests/bugs/multiport.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/multiport.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/multiport.wsdl
+++ php-src/ext/soap/tests/bugs/multiport.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap php_sdl.c
davidc Wed May 7 15:23:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/soap php_sdl.c
Log:
- Fixed bug #44811 (Improve error message when creating a new SoapClient that
contains invalid data)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.9.2.2r2=1.88.2.12.2.9.2.3diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.2
php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.3
--- php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.2Mon Dec 31 07:17:13 2007
+++ php-src/ext/soap/php_sdl.c Wed May 7 15:23:10 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.12.2.9.2.2 2007/12/31 07:17:13 sebastian Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.12.2.9.2.3 2008/05/07 15:23:10 davidc Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -240,7 +240,13 @@
wsdl = soap_xmlParseFile(struri TSRMLS_CC);
if (!wsdl) {
- soap_error1(E_ERROR, Parsing WSDL: Couldn't load from '%s',
struri);
+ xmlErrorPtr xmlErrorPtr = xmlGetLastError();
+
+ if (xmlErrorPtr) {
+ soap_error2(E_ERROR, Parsing WSDL: Couldn't load from
'%s' : %s, struri, xmlErrorPtr-message);
+ } else {
+ soap_error1(E_ERROR, Parsing WSDL: Couldn't load from
'%s', struri);
+ }
}
zend_hash_add(ctx-docs, struri, strlen(struri)+1, (void**)wsdl,
sizeof(xmlDocPtr), NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap php_sdl.c
dmitry Fri Nov 23 10:02:24 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #42952 (soap cache file is created with insecure permissions)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.9r2=1.88.2.12.2.9.2.1diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.9
php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.1
--- php-src/ext/soap/php_sdl.c:1.88.2.12.2.9Mon May 21 13:13:50 2007
+++ php-src/ext/soap/php_sdl.c Fri Nov 23 10:02:24 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.12.2.9 2007/05/21 13:13:50 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.12.2.9.2.1 2007/11/23 10:02:24 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -2015,7 +2015,7 @@
#ifdef ZEND_WIN32
f = open(fn,O_CREAT|O_WRONLY|O_EXCL|O_BINARY,S_IREAD|S_IWRITE);
#else
- f =
open(fn,O_CREAT|O_WRONLY|O_EXCL|O_BINARY,S_IREAD|S_IWRITE|S_IROTH|S_IWOTH|S_IRGRP|S_IWGRP);
+ f = open(fn,O_CREAT|O_WRONLY|O_EXCL|O_BINARY,S_IREAD|S_IWRITE);
#endif
if (f 0) {return;}
@@ -3117,16 +3117,24 @@
unsigned char digest[16];
int len = strlen(SOAP_GLOBAL(cache_dir));
time_t cached;
+ char *user = php_get_current_user();
+ int user_len = user ? strlen(user) + 1 : 0;
md5str[0] = '\0';
PHP_MD5Init(context);
PHP_MD5Update(context, (unsigned char*)uri, uri_len);
PHP_MD5Final(digest, context);
make_digest(md5str, digest);
- key = emalloc(len+sizeof(/wsdl-)-1+sizeof(md5str));
+ key = emalloc(len+sizeof(/wsdl-)-1+user_len+sizeof(md5str));
memcpy(key,SOAP_GLOBAL(cache_dir),len);
memcpy(key+len,/wsdl-,sizeof(/wsdl-)-1);
- memcpy(key+len+sizeof(/wsdl-)-1,md5str,sizeof(md5str));
+ len += sizeof(/wsdl-)-1;
+ if (user_len) {
+ memcpy(key+len, user, user_len-1);
+ len += user_len-1;
+ key[len++] = '-';
+ }
+ memcpy(key+len,md5str,sizeof(md5str));
if ((sdl = get_sdl_from_cache(key, uri,
t-SOAP_GLOBAL(cache_ttl), cached TSRMLS_CC)) != NULL) {
t = cached;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
