dmitry          Mon Sep  1 14:55:30 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/soap   soap.c 
  Log:
  Disabled warning messages in SoapClient constructor
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.18&r2=1.156.2.28.2.30.2.19&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.18 
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.18        Tue Jul 22 01:47:21 2008
+++ php-src/ext/soap/soap.c     Mon Sep  1 14:55:30 2008
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: soap.c,v 1.156.2.28.2.30.2.18 2008/07/22 01:47:21 felipe Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.30.2.19 2008/09/01 14:55:30 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2295,14 +2295,19 @@
            instanceof_function(Z_OBJCE_P(SOAP_GLOBAL(error_object)), 
soap_class_entry TSRMLS_CC)) {
 #ifdef ZEND_ENGINE_2
                zval **tmp;
+               int use_exceptions = 0;
+
+               if (zend_hash_find(Z_OBJPROP_P(SOAP_GLOBAL(error_object)), 
"_exceptions", sizeof("_exceptions"), (void **) &tmp) != SUCCESS ||
+                    Z_TYPE_PP(tmp) != IS_BOOL || Z_LVAL_PP(tmp) != 0) {
+                    use_exceptions = 1;
+               }
 
                if ((error_num == E_USER_ERROR || 
                     error_num == E_COMPILE_ERROR || 
                     error_num == E_CORE_ERROR ||
                     error_num == E_ERROR || 
                     error_num == E_PARSE) &&
-                   (zend_hash_find(Z_OBJPROP_P(SOAP_GLOBAL(error_object)), 
"_exceptions", sizeof("_exceptions"), (void **) &tmp) != SUCCESS ||
-                    Z_TYPE_PP(tmp) != IS_BOOL || Z_LVAL_PP(tmp) != 0)) {
+                   use_exceptions) {
                        zval *fault, *exception;
                        char* code = SOAP_GLOBAL(error_code);
                        char buffer[1024];
@@ -2357,7 +2362,10 @@
                        EG(objects_store).object_buckets = old_objects;
                        PG(display_errors) = old;
                        zend_bailout();
-               } else {
+               } else if (!use_exceptions ||
+                          !SOAP_GLOBAL(error_code) ||
+                          strcmp(SOAP_GLOBAL(error_code),"WSDL") != 0) {
+                       /* Ignore libxml warnings during WSDL parsing */
                        call_old_error_handler(error_num, error_filename, 
error_lineno, format, args);
                }
 #else



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

Reply via email to