dmitry          Fri Feb 27 09:52:25 2004 EDT

  Modified files:              
    /php-src/ext/soap   php_encoding.c 
    /php-src/ext/soap/tests/schema      test_schema.inc 
    /php-src/ext/soap/tests/soap12      T45.phpt T47.phpt 
  Log:
  win32 specific fixes
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.64&r2=1.65&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.64 php-src/ext/soap/php_encoding.c:1.65
--- php-src/ext/soap/php_encoding.c:1.64        Wed Feb 25 09:34:50 2004
+++ php-src/ext/soap/php_encoding.c     Fri Feb 27 09:52:22 2004
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_encoding.c,v 1.64 2004/02/25 14:34:50 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.65 2004/02/27 14:52:22 dmitry Exp $ */
 
 #include <time.h>
 
@@ -660,7 +660,7 @@
 
        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;
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/test_schema.inc?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/soap/tests/schema/test_schema.inc
diff -u php-src/ext/soap/tests/schema/test_schema.inc:1.5 
php-src/ext/soap/tests/schema/test_schema.inc:1.6
--- php-src/ext/soap/tests/schema/test_schema.inc:1.5   Thu Feb 12 06:02:16 2004
+++ php-src/ext/soap/tests/schema/test_schema.inc       Fri Feb 27 09:52:23 2004
@@ -70,11 +70,5 @@
     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
http://cvs.php.net/diff.php/php-src/ext/soap/tests/soap12/T45.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/soap/tests/soap12/T45.phpt
diff -u php-src/ext/soap/tests/soap12/T45.phpt:1.1 
php-src/ext/soap/tests/soap12/T45.phpt:1.2
--- php-src/ext/soap/tests/soap12/T45.phpt:1.1  Fri Jan 30 10:08:52 2004
+++ php-src/ext/soap/tests/soap12/T45.phpt      Fri Feb 27 09:52:24 2004
@@ -19,7 +19,7 @@
         <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 @@
 ?>
 --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
http://cvs.php.net/diff.php/php-src/ext/soap/tests/soap12/T47.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/soap/tests/soap12/T47.phpt
diff -u php-src/ext/soap/tests/soap12/T47.phpt:1.1 
php-src/ext/soap/tests/soap12/T47.phpt:1.2
--- php-src/ext/soap/tests/soap12/T47.phpt:1.1  Fri Jan 30 10:08:52 2004
+++ php-src/ext/soap/tests/soap12/T47.phpt      Fri Feb 27 09:52:24 2004
@@ -14,7 +14,7 @@
           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 @@
 ?>
 --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

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

Reply via email to