Fixed bug #43045 (SOAP encoding violation on "INF" for type double/float)

This commit is contained in:
Dmitry Stogov 2008-10-01 08:43:21 +00:00
parent 292016006e
commit 22223dbd36
2 changed files with 61 additions and 1 deletions

View File

@ -944,7 +944,15 @@ static zval *to_zval_double(encodeTypePtr type, xmlNodePtr data)
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");

View File

@ -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)