Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap soap.c /ext/soap/tests/bugs bug31755.phpt

2008-09-09 Thread Jani Taskinen

Felipe Pena wrote:

felipe  Mon Sep  8 19:41:42 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/soap	soap.c 
/php-src/ext/soap/tests/bugs	bug31755.phpt 
  Log:

  - MFH: Changed error level E_ERROR into E_WARNING in parameter validation


Okay, so now there are no E_ERROR errors in ext/soap? (not time to check 
 now :) If so, can you chagne that NEWS entry you added to something 
more understandable..?


--Jani


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap soap.c /ext/soap/tests/bugs bug31755.phpt

2008-09-09 Thread Felipe Pena
Em Ter, 2008-09-09 às 10:11 +0300, Jani Taskinen escreveu:
 Felipe Pena wrote:
  felipe  Mon Sep  8 19:41:42 2008 UTC
  
Modified files:  (Branch: PHP_5_3)
  /php-src/ext/soap   soap.c 
  /php-src/ext/soap/tests/bugsbug31755.phpt 
Log:
- MFH: Changed error level E_ERROR into E_WARNING in parameter validation
 
 Okay, so now there are no E_ERROR errors in ext/soap? (not time to check 
   now :) If so, can you chagne that NEWS entry you added to something 
 more understandable..?

There are E_ERROR yet, I just removed them from the parameter validation.


-- 
Regards,
Felipe Pena.


-- 
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 soap.c /ext/soap/tests/bugs bug31755.phpt

2008-09-08 Thread Felipe Pena
felipe  Mon Sep  8 19:41:42 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/soap   soap.c 
/php-src/ext/soap/tests/bugsbug31755.phpt 
  Log:
  - MFH: Changed error level E_ERROR into E_WARNING in parameter validation
  http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.20r2=1.156.2.28.2.30.2.21diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.20 
php-src/ext/soap/soap.c:1.156.2.28.2.30.2.21
--- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.20Sun Sep  7 02:58:50 2008
+++ php-src/ext/soap/soap.c Mon Sep  8 19:41:42 2008
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.30.2.20 2008/09/07 02:58:50 felipe Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.30.2.21 2008/09/08 19:41:42 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -890,7 +890,8 @@
return;
}
if (name_length == 0) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid parameter 
name);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid parameter 
name);
+   return;
}
 
 #ifndef ZEND_ENGINE_2
@@ -915,10 +916,12 @@
return;
}
if (ns_len == 0) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid namespace);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
namespace);
+   return;
}
if (name_len == 0) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid header 
name);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid header 
name);
+   return;
}
 
add_property_stringl(this_ptr, namespace, ns, ns_len, 1);
@@ -939,7 +942,7 @@
} 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 actor);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid actor);
}
 }
 
@@ -975,13 +978,16 @@
  fault_code = Z_STRVAL_PP(t_code);
  fault_code_len = Z_STRLEN_PP(t_code);
} else {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid 
fault code);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
fault code);
+   return;
}
} else  {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid fault code);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid fault 
code);
+   return;
}
if (fault_code != NULL  fault_code_len == 0) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid fault code);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid fault 
code);
+   return;
}
if (name != NULL  name_len == 0) {
name = NULL;
@@ -1058,7 +1064,8 @@
if (zend_hash_index_exists(SOAP_GLOBAL(defEncIndex), 
Z_LVAL_P(type))) {
add_property_long(this_ptr, enc_type, Z_LVAL_P(type));
} else {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid type 
ID);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
type ID);
+   return;
}
}
 
@@ -1101,7 +1108,8 @@
encodePtr enc, new_enc;
 
if (Z_TYPE_PP(tmp) != IS_ARRAY) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Wrong 
'typemap' option);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Wrong 
'typemap' option);
+   return;
}
ht2 = Z_ARRVAL_PP(tmp);
 
@@ -1239,7 +1247,7 @@
Z_TYPE_PP(tmp) == IS_STRING) {
service-uri = estrndup(Z_STRVAL_PP(tmp), 
Z_STRLEN_PP(tmp));
} else if (wsdl == NULL) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, 'uri' option 
is required in nonWSDL mode);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, 'uri' 
option is required in nonWSDL mode);
return;
}
 
@@ -1253,11 +1261,12 @@
xmlCharEncodingHandlerPtr encoding;

encoding = xmlFindCharEncodingHandler(Z_STRVAL_PP(tmp));
-   if (encoding == NULL) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, 
Invalid 'encoding' option - '%s', Z_STRVAL_PP(tmp));
-   } else {
- service-encoding = encoding;
-   }
+   if (encoding == NULL) {
+  

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap soap.c /ext/soap/tests/bugs bug31755.phpt

2008-09-06 Thread Felipe Pena
felipe  Sun Sep  7 02:58:50 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/soap   soap.c 
/php-src/ext/soap/tests/bugsbug31755.phpt 
  Log:
  - MFH: Removed the doubled error message (the error level is no longer 
E_ERROR)
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.19r2=1.156.2.28.2.30.2.20diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.19 
php-src/ext/soap/soap.c:1.156.2.28.2.30.2.20
--- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.19Mon Sep  1 14:55:30 2008
+++ php-src/ext/soap/soap.c Sun Sep  7 02:58:50 2008
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.30.2.19 2008/09/01 14:55:30 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.30.2.20 2008/09/07 02:58:50 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -887,10 +887,10 @@
int name_length;
 
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);
+   return;
}
if (name_length == 0) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid parameters. 
Invalid parameter name.);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid parameter 
name);
}
 
 #ifndef ZEND_ENGINE_2
@@ -912,13 +912,13 @@
zend_bool must_understand = 0;
 
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);
+   return;
}
if (ns_len == 0) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid parameters. 
Invalid namespace.);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid namespace);
}
if (name_len == 0) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid parameters. 
Invalid header name.);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid header 
name);
}
 
add_property_stringl(this_ptr, namespace, ns, ns_len, 1);
@@ -939,7 +939,7 @@
} 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. 
Invalid actor.);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid actor);
}
 }
 
@@ -956,8 +956,9 @@
fault_string, fault_string_len,
fault_actor, fault_actor_len,
details, name, name_len, headerfault) == FAILURE) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid parameters);
+   return;
}
+
if (Z_TYPE_P(code) == IS_NULL) {
} else if (Z_TYPE_P(code) == IS_STRING) {
fault_code = Z_STRVAL_P(code);
@@ -974,13 +975,13 @@
  fault_code = Z_STRVAL_PP(t_code);
  fault_code_len = Z_STRLEN_PP(t_code);
} else {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid 
parameters. Invalid fault code.);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid 
fault code);
}
} else  {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid parameters. 
Invalid fault code.);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid fault code);
}
if (fault_code != NULL  fault_code_len == 0) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid parameters. 
Invalid fault code.);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid fault code);
}
if (name != NULL  name_len == 0) {
name = NULL;
@@ -1048,7 +1049,7 @@
int stype_len, ns_len, name_len, namens_len;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z!z|, data, 
type, stype, stype_len, ns, ns_len, name, name_len, namens, 
namens_len) == FAILURE) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid parameters);
+   return;
}
 
if (Z_TYPE_P(type) == IS_NULL) {
@@ -1205,7 +1206,7 @@
 PHP_METHOD(SoapServer, SoapServer)
 {
soapServicePtr service;
-   zval *wsdl, *options = NULL;
+   zval *wsdl = NULL, *options = NULL;
int ret;
int version = SOAP_1_1;
long cache_wsdl;
@@ -1213,15 +1214,8 @@
 
SOAP_SERVER_BEGIN_CODE();
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z|a, wsdl, 
options) == FAILURE) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid parameters);
-   }
-
-   if