Backport v4 updates

[m6w6/ext-http] / tests / client002.phpt

diff --git a/tests/client002.phpt b/tests/client002.phpt
index e07b82e21669fff8e5e38e250611c8c4397993c5..5b0b2aadc4033e3ad2e611cb4fbc7f75e7401777 100644 (file)
--- a/tests/client002.phpt
+++ b/tests/client002.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
@@ -16,8 +16,10 @@ class Observer implements SplObserver
 {
        function update(SplSubject $client, http\Client\Request $request = null, StdClass $progress = null) {
                echo "P";
-               if ($client->getProgressInfo($request) != $progress) {
-                       var_dump($progress);
+               /* fence against buggy infof() calls in some curl versions */
+               $compare = $client->getProgressInfo($request);
+               if ($progress->info !== "prepare" && $compare && $compare != $progress) {
+                       var_dump($progress, $compare);
                }
        }
 }