dmitry          Wed Oct  1 08:43:21 2008 UTC

  Modified files:              
    /php-src/ext/soap   php_encoding.c 
    /php-src/ext/soap/tests/bugs        bug43045.phpt 
  Log:
  Fixed bug #43045 (SOAP encoding violation on "INF" for type double/float)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.168&r2=1.169&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.168 
php-src/ext/soap/php_encoding.c:1.169
--- php-src/ext/soap/php_encoding.c:1.168       Wed Jan  9 13:50:17 2008
+++ php-src/ext/soap/php_encoding.c     Wed Oct  1 08:43:21 2008
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_encoding.c,v 1.168 2008/01/09 13:50:17 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.169 2008/10/01 08:43:21 dmitry Exp $ */
 
 #include <time.h>
 
@@ -944,7 +944,15 @@
                                        Z_DVAL_P(ret) = dval;
                                        break;
                                default:
-                                       soap_error0(E_ERROR, "Encoding: 
Violation of encoding rules");
+                                       if 
(strncasecmp((char*)data->children->content, "NaN", sizeof("NaN")-1) == 0) {
+                                               ZVAL_DOUBLE(ret, php_get_nan());
+                                       } else if 
(strncasecmp((char*)data->children->content, "INF", sizeof("INF")-1) == 0) {
+                                               ZVAL_DOUBLE(ret, php_get_inf());
+                                       } else if 
(strncasecmp((char*)data->children->content, "-INF", sizeof("-INF")-1) == 0) {
+                                               ZVAL_DOUBLE(ret, 
-php_get_inf());
+                                       } else {
+                                               soap_error0(E_ERROR, "Encoding: 
Violation of encoding rules");
+                                       }
                        }
                } else {
                        soap_error0(E_ERROR, "Encoding: Violation of encoding 
rules");
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug43045.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/soap/tests/bugs/bug43045.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug43045.phpt:1.2
--- /dev/null   Wed Oct  1 08:43:21 2008
+++ php-src/ext/soap/tests/bugs/bug43045.phpt   Wed Oct  1 08:43:21 2008
@@ -0,0 +1,52 @@
+--TEST--
+Bug #43045i (SOAP encoding violation on "INF" for type double/float)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+function test($x) {
+  return $x;
+}
+
+class TestSoapClient extends SoapClient {
+  function __construct($wsdl, $options) {
+    parent::__construct($wsdl, $options);
+    $this->server = new SoapServer($wsdl, $options);
+    $this->server->addFunction('test');
+  }
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
+    ob_start();
+    $this->server->handle($request);
+    $response = ob_get_contents();
+    ob_end_clean();
+    return $response;
+
+    echo $request;
+    return '<soap:Envelope 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/";
+xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
+xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/";>
+<soap:Body><testResponse xmlns="urn:TestSOAP">
+<s-gensym3>
+<doubleInfinity xsi:type="xsd:double">INF</doubleInfinity>
+</s-gensym3>
+</testResponse>
+</soap:Body></soap:Envelope>';
+  }
+}
+$client = new TestSoapClient(NULL, array(
+                       "location" => "test://",
+                       "uri"      => 'urn:TestSOAP',
+                       "style"    => SOAP_RPC,
+                       "use"      => SOAP_ENCODED                        
+                       ));
+var_dump($client->test(0.1));
+var_dump($client->test(NAN));
+var_dump($response = $client->test(INF));
+var_dump($response = $client->test(-INF));
+--EXPECT--
+float(0.1)
+float(NAN)
+float(INF)
+float(-INF)



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

Reply via email to