dmitry Thu May 25 08:15:57 2006 UTC
Modified files:
/php-src/ext/soap soap.c
/php-src/ext/soap/tests/bugs bug37278.phpt
Log:
Fixed bug #37278 (SOAP not respecting uri in __soapCall)
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.187&r2=1.188&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.187 php-src/ext/soap/soap.c:1.188
--- php-src/ext/soap/soap.c:1.187 Mon Apr 24 07:04:25 2006
+++ php-src/ext/soap/soap.c Thu May 25 08:15:57 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.187 2006/04/24 07:04:25 dmitry Exp $ */
+/* $Id: soap.c,v 1.188 2006/05/25 08:15:57 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2665,7 +2665,7 @@
if (zend_hash_find(ht, "uri", sizeof("uri"),
(void**)&tmp) == SUCCESS &&
Z_TYPE_PP(tmp) == IS_STRING) {
- soap_action = Z_STRVAL_PP(tmp);
+ uri = Z_STRVAL_PP(tmp);
}
} else if (Z_TYPE_P(options) != IS_NULL) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "first
parameter must be string or null");
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug37278.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/soap/tests/bugs/bug37278.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug37278.phpt:1.2
--- /dev/null Thu May 25 08:15:57 2006
+++ php-src/ext/soap/tests/bugs/bug37278.phpt Thu May 25 08:15:57 2006
@@ -0,0 +1,24 @@
+--TEST--
+Bug #37278 (SOAP not respecting uri in __soapCall)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$options = array(
+ "location" => "test://",
+ "uri" => "http://bricolage.sourceforge.net/Bric/SOAP/Auth";,
+ "trace" => 1);
+
+$client = new SoapClient(null, $options);
+
+$newNS = "http://bricolage.sourceforge.net/Bric/SOAP/Story";;
+
+try {
+ $client->__soapCall("list_ids", array(), array("uri" => $newNS));
+} catch (Exception $e) {
+ print $client->__getLastRequest();
+}
+?>
+--EXPECT--
+<?xml version="1.0" encoding="UTF-8"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:ns1="http://bricolage.sourceforge.net/Bric/SOAP/Story";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/";
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:list_ids/></SOAP-ENV:Body></SOAP-ENV:Envelope>
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
