X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Ftestsuite.php;h=696138b9bd9d4a0c3c6881c6cddae04ff23b4df0;hb=fa9fa7bcea0b663f147e2044ecc320acee36bd59;hp=e5fb6d8d1dc1c4e430af51e0c35f0c7413993c2c;hpb=2e4d7e8aedf960a3b5c5d0eeb29f4a1175142011;p=plcapi.git

diff --git a/test/testsuite.php b/test/testsuite.php
index e5fb6d8..696138b 100644
--- a/test/testsuite.php
+++ b/test/testsuite.php
@@ -573,8 +573,15 @@ And turned it into nylon';
             $rcookies = $r->cookies();
             // remove extra cookies which might have been set by proxies
             foreach($rcookies as $c => $v)
+            {
                 if(!in_array($c, array('c2', 'c3', 'c4', 'c5')))
                     unset($rcookies[$c]);
+                // Seems like we get this when using php-fpm and php 5.5+ ...
+                if (isset($rcookies[$c]['Max-Age']))
+                {
+                    unset($rcookies[$c]['Max-Age']);
+                }
+            }
             foreach($cookies as $c => $v)
                 // format for date string in cookies: 'Mon, 31 Oct 2005 13:50:56 GMT'
                 // but PHP versions differ on that, some use 'Mon, 31-Oct-2005 13:50:56 GMT'...
@@ -774,7 +781,7 @@ class LocalHostMultiTests extends LocalhostTests
 
     function testHttps()
     {
-        global $HTTPSSERVER, $HTTPSURI, $HTTPSIGNOREPEER, $HTTPSVERIFYHOST;
+        global $HTTPSSERVER, $HTTPSURI, $HTTPSIGNOREPEER, $HTTPSVERIFYHOST, $SSLVERSION;
         if(!function_exists('curl_init'))
         {
             $this->fail('CURL missing: cannot test https functionality');
@@ -786,12 +793,13 @@ class LocalHostMultiTests extends LocalhostTests
         $this->client->path = $HTTPSURI;
         $this->client->setSSLVerifyPeer(!$HTTPSIGNOREPEER);
         $this->client->setSSLVerifyHost($HTTPSVERIFYHOST);
+        $this->client->setSSLVersion($SSLVERSION);
         $this->_runtests();
     }
 
     function testHttpsProxy()
     {
-        global $HTTPSSERVER, $HTTPSURI, $HTTPSIGNOREPEER, $HTTPSVERIFYHOST, $PROXYSERVER, $PROXYPORT, $NOPROXY;
+        global $HTTPSSERVER, $HTTPSURI, $HTTPSIGNOREPEER, $HTTPSVERIFYHOST, $SSLVERSION, $PROXYSERVER, $PROXYPORT, $NOPROXY;
         if(!function_exists('curl_init'))
         {
             $this->fail('CURL missing: cannot test https functionality');
@@ -810,6 +818,7 @@ class LocalHostMultiTests extends LocalhostTests
         $this->client->path = $HTTPSURI;
         $this->client->setSSLVerifyPeer(!$HTTPSIGNOREPEER);
         $this->client->setSSLVerifyHost($HTTPSVERIFYHOST);
+        $this->client->setSSLVersion($SSLVERSION);
         $this->_runtests();
     }
 
@@ -867,9 +876,9 @@ class ParsingBugsTests extends PHPUnit_TestCase
         $response = utf8_encode(
 '<?xml version="1.0"?>
 <!-- $Id -->
-<!-- found by G. giunta, covers what happens when lib receives
+<!-- found by G. Giunta, covers what happens when lib receives
   UTF8 chars in response text and comments -->
-<!-- ���&#224;&#252;&#232; -->
+<!-- ' . chr(224) . chr(252) . chr(232) . '&#224;&#252;&#232; -->
 <methodResponse>
 <fault>
 <value>
@@ -880,7 +889,7 @@ class ParsingBugsTests extends PHPUnit_TestCase
 </member>
 <member>
 <name>faultString</name>
-<value><string>���&#224;&#252;&#232;</string></value>
+<value><string>' . chr(224) . chr(252) . chr(232) . '&#224;&#252;&#232;</string></value>
 </member>
 </struct>
 </value>
@@ -889,7 +898,7 @@ class ParsingBugsTests extends PHPUnit_TestCase
         $m=new xmlrpcmsg('dummy');
         $r=$m->parseResponse($response);
         $v=$r->faultString();
-        $this->assertEquals('������', $v);
+        $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v);
     }
 
     function testValidNumbers()