dmitry Wed Feb 2 04:11:46 2005 EDT
Modified files:
/php-src/ext/soap php_http.c soap.c
/php-src/ext/soap/tests/bugs bug31755.phpt
Log:
Fixed bug #31755 (Cannot create SOAP header in no namespace)
http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.64&r2=1.65&ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.64 php-src/ext/soap/php_http.c:1.65
--- php-src/ext/soap/php_http.c:1.64 Tue Jan 25 06:03:20 2005
+++ php-src/ext/soap/php_http.c Wed Feb 2 04:11:45 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_http.c,v 1.64 2005/01/25 11:03:20 dmitry Exp $ */
+/* $Id: php_http.c,v 1.65 2005/02/02 09:11:45 dmitry Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -655,6 +655,7 @@
}
if (!get_http_headers(stream, &http_headers, &http_header_size
TSRMLS_CC)) {
+ efree(http_headers);
if (request != buf) {efree(request);}
php_stream_close(stream);
zend_hash_del(Z_OBJPROP_P(this_ptr), "httpsocket",
sizeof("httpsocket"));
@@ -690,6 +691,7 @@
if (http_status == 100) {
efree(http_headers);
if (!get_http_headers(stream, &http_headers,
&http_header_size TSRMLS_CC)) {
+ efree(http_headers);
if (request != buf) {efree(request);}
php_stream_close(stream);
zend_hash_del(Z_OBJPROP_P(this_ptr),
"httpsocket", sizeof("httpsocket"));
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.134&r2=1.135&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.134 php-src/ext/soap/soap.c:1.135
--- php-src/ext/soap/soap.c:1.134 Mon Jan 31 09:26:06 2005
+++ php-src/ext/soap/soap.c Wed Feb 2 04:11:45 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.134 2005/01/31 14:26:06 dmitry Exp $ */
+/* $Id: soap.c,v 1.135 2005/02/02 09:11:45 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -656,6 +656,9 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs", &data,
&name, &name_length) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
}
+ if (name_length == 0) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters.
Invalid parameter name.");
+ }
#ifndef ZEND_ENGINE_2
zval_add_ref(&data);
@@ -678,6 +681,12 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|zbz", &ns,
&ns_len, &name, &name_len, &data, &must_understand, &actor) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
}
+ if (ns_len == 0) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters.
Invalid namespace.");
+ }
+ if (name_len == 0) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters.
Invalid header name.");
+ }
add_property_stringl(this_ptr, "namespace", ns, ns_len, 1);
add_property_stringl(this_ptr, "name", name, name_len, 1);
@@ -689,12 +698,15 @@
}
add_property_bool(this_ptr, "mustUnderstand", must_understand);
if (actor == NULL) {
- } else if (Z_TYPE_P(actor) == IS_LONG) {
+ } else if (Z_TYPE_P(actor) == IS_LONG &&
+ (Z_LVAL_P(actor) == SOAP_ACTOR_NEXT ||
+ Z_LVAL_P(actor) == SOAP_ACTOR_NONE ||
+ Z_LVAL_P(actor) == SOAP_ACTOR_UNLIMATERECEIVER)) {
add_property_long(this_ptr, "actor", Z_LVAL_P(actor));
- } else if (Z_TYPE_P(actor) == IS_STRING) {
+ } else if (Z_TYPE_P(actor) == IS_STRING && Z_STRLEN_P(actor) > 0) {
add_property_stringl(this_ptr, "actor", Z_STRVAL_P(actor),
Z_STRLEN_P(actor), 1);
} else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters.
Invalid actor.");
}
}
@@ -713,6 +725,12 @@
&details, &name, &name_len, &headerfault) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
}
+ if (fault_code != NULL && fault_code_len == 0) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters.
Invalid fault code.");
+ }
+ if (name != NULL && name_len == 0) {
+ name = NULL;
+ }
set_soap_fault(this_ptr, fault_code, fault_string, fault_actor,
details, name TSRMLS_CC);
if (headerfault != NULL) {
@@ -792,16 +810,16 @@
add_property_zval(this_ptr, "enc_value", data);
}
- if (stype && strlen(stype) > 0) {
+ if (stype && stype_len > 0) {
add_property_stringl(this_ptr, "enc_stype", stype, stype_len,
1);
}
- if (ns && strlen(ns) > 0) {
+ if (ns && ns_len > 0) {
add_property_stringl(this_ptr, "enc_ns", ns, ns_len, 1);
}
- if (name && strlen(name) > 0) {
+ if (name && name_len > 0) {
add_property_stringl(this_ptr, "enc_name", name, name_len, 1);
}
- if (namens && strlen(namens) > 0) {
+ if (namens && namens_len > 0) {
add_property_stringl(this_ptr, "enc_namens", namens,
namens_len, 1);
}
}
http://cvs.php.net/diff.php/php-src/ext/soap/tests/bugs/bug31755.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/soap/tests/bugs/bug31755.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug31755.phpt:1.2
--- /dev/null Wed Feb 2 04:11:46 2005
+++ php-src/ext/soap/tests/bugs/bug31755.phpt Wed Feb 2 04:11:46 2005
@@ -0,0 +1,17 @@
+--TEST--
+Bug #31422 No Error-Logging on SoapServer-Side
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$client=new SOAPClient(null, array('location' => 'http://localhost',
+'uri' => 'myNS', 'exceptions' => false, 'trace' => true));
+
+$header = new SOAPHeader(null, 'foo', 'bar');
+
+$response= $client->__call('function', array(), null, $header);
+
+print $client->__getLastRequest();
+?>
+--EXPECTF--
+Fatal error: SoapHeader::__construct(): Invalid parameters. Invalid namespace.
in %sbug31755.php on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
