win32 specific fixes

diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 9487336a569362bc421c43430f9d0a5dac920a89..35ba391304c992deed28c9c77f05faec36b026cf 100644 (file)
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -660,7 +660,7 @@ static xmlNodePtr to_xml_ulong(encodeTypePtr type, zval *data, int style, xmlNod
 
        if (Z_TYPE_P(data) == IS_DOUBLE) {
                char s[16];
-               sprintf(s, "%0.0F",Z_DVAL_P(data));
+               sprintf(s, "%0.0f",Z_DVAL_P(data));
                xmlNodeSetContent(ret, s);
        } else {
                zval tmp = *data;

diff --git a/ext/soap/tests/schema/test_schema.inc b/ext/soap/tests/schema/test_schema.inc
index 6ef38a0c65e1c2234d269a57a75c2ddf70b32523..64635a10ca9c62bec5abb9ee9809c0c5b343755f 100644 (file)
--- a/ext/soap/tests/schema/test_schema.inc
+++ b/ext/soap/tests/schema/test_schema.inc
@@ -70,11 +70,5 @@ EOF;
     ob_end_clean();
     var_dump($val);
   }
-
-/*
-  xml_parse_into_struct($xml,$x->__getlastrequest(),&$x,&$y);
-  var_dump($x);
-  var_dump($y);
-*/
 }
 ?>
\ No newline at end of file

diff --git a/ext/soap/tests/soap12/T45.phpt b/ext/soap/tests/soap12/T45.phpt
index 68e3cceeefe0d34d471223ad08e9242aabde30d3..4bbcc818d41838e608cb45cac6347de550336e99 100644 (file)
--- a/ext/soap/tests/soap12/T45.phpt
+++ b/ext/soap/tests/soap12/T45.phpt
@@ -19,7 +19,7 @@ $HTTP_RAW_POST_DATA = <<<EOF
         <varString xsi:type="xsd:string">hello world</varString>
         <varStruct xsi:type="ns1:SOAPStruct">
           <varInt xsi:type="xsd:int">99</varInt>
-          <varFloat xsi:type="xsd:float">4.0699e-12</varFloat>
+          <varFloat xsi:type="xsd:float">5.5</varFloat>
           <varString xsi:type="xsd:string">nested struct</varString>
         </varStruct>
       </inputStruct>
@@ -31,5 +31,5 @@ include "soap12-test.inc";
 ?>
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://example.org/ts-tests/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoNestedStructResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="ns2:SOAPStructStruct"><varString xsi:type="xsd:string">hello world</varString><varInt xsi:type="xsd:int">42</varInt><varFloat xsi:type="xsd:float">0.005</varFloat><varStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">nested struct</varString><varInt xsi:type="xsd:int">99</varInt><varFloat xsi:type="xsd:float">4.0699E-12</varFloat></varStruct></return></ns1:echoNestedStructResponse></env:Body></env:Envelope>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://example.org/ts-tests/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoNestedStructResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="ns2:SOAPStructStruct"><varString xsi:type="xsd:string">hello world</varString><varInt xsi:type="xsd:int">42</varInt><varFloat xsi:type="xsd:float">0.005</varFloat><varStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">nested struct</varString><varInt xsi:type="xsd:int">99</varInt><varFloat xsi:type="xsd:float">5.5</varFloat></varStruct></return></ns1:echoNestedStructResponse></env:Body></env:Envelope>
 ok

diff --git a/ext/soap/tests/soap12/T47.phpt b/ext/soap/tests/soap12/T47.phpt
index e1d8b8f1a49cd7ecb62d4fde43862448bd9613d1..a9bb43e36820c249585f1fac1a2a7c29960ac2c3 100644 (file)
--- a/ext/soap/tests/soap12/T47.phpt
+++ b/ext/soap/tests/soap12/T47.phpt
@@ -14,7 +14,7 @@ $HTTP_RAW_POST_DATA = <<<EOF
           env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
       <inputFloatArray enc:itemType="xsd:float" enc:arraySize="2"
                        xmlns:enc="http://www.w3.org/2003/05/soap-encoding">
-        <item xsi:type="xsd:float">0.00000555</item>
+        <item xsi:type="xsd:float">5.5</item>
         <item xsi:type="xsd:float">12999.9</item>
       </inputFloatArray>
     </test:echoFloatArray>
@@ -25,5 +25,5 @@ include "soap12-test.inc";
 ?>
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://example.org/ts-tests/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoFloatArrayResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return enc:itemType="xsd:float" enc:arraySize="2" xsi:type="ns2:ArrayOffloat"><item xsi:type="xsd:float">5.55E-06</item><item xsi:type="xsd:float">12999.9</item></return></ns1:echoFloatArrayResponse></env:Body></env:Envelope>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://example.org/ts-tests/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoFloatArrayResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return enc:itemType="xsd:float" enc:arraySize="2" xsi:type="ns2:ArrayOffloat"><item xsi:type="xsd:float">5.5</item><item xsi:type="xsd:float">12999.9</item></return></ns1:echoFloatArrayResponse></env:Body></env:Envelope>
 ok