upgrade test suite to 5.3

diff --git a/tests/HttpMessage_001.phpt b/tests/HttpMessage_001.phpt
index e787523b2f20a57ebbb15906ee6db1502771f225..8f711c1ab18357a73c5b2e775fb383214da6af24 100644 (file)
--- a/tests/HttpMessage_001.phpt
+++ b/tests/HttpMessage_001.phpt
@@ -3,7 +3,7 @@ HttpMessage
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -40,7 +40,7 @@ try {
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 string(15) "Partial content"
 string(1) "X"
 string(190) "HTTP/1.1 301

diff --git a/tests/HttpMessage_002.phpt b/tests/HttpMessage_002.phpt
index d1fd173d23b25c35d239cc057355da7865e93e29..65c1b6c8b55783c6a15fdd64d2d219e174675515 100644 (file)
--- a/tests/HttpMessage_002.phpt
+++ b/tests/HttpMessage_002.phpt
@@ -3,7 +3,7 @@ HttpMessage properties
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkcls('HttpMessage');
 ?>
 --FILE--
@@ -25,8 +25,8 @@ $m->test();
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 Array
 (
 )
-%sFatal error%sCannot access HttpMessage properties by reference or array key/index in%s
+%aFatal error%aCannot access HttpMessage properties by reference or array key/index in%a

diff --git a/tests/HttpMessage_003.phpt b/tests/HttpMessage_003.phpt
index 8c416b9b906df9f99574aa6d219887a7812df2ab..e2f9f4f24e8a622b74c8e94ed8b694b1d15b8e82 100644 (file)
--- a/tests/HttpMessage_003.phpt
+++ b/tests/HttpMessage_003.phpt
@@ -3,7 +3,7 @@ HttpMessage implements Serializable, Countable
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -31,7 +31,7 @@ var_dump($m->count());
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 int(3)
 string(148) "HTTP/1.1 301
 Location: /anywhere
@@ -44,26 +44,26 @@ Content-Length: 1
 X
 "
 object(HttpMessage)#%d (%d) {
-  ["type:protected"]=>
+  ["type":protected]=>
   int(2)
-  ["body:protected"]=>
+  ["body":protected]=>
   string(0) ""
-  ["requestMethod:protected"]=>
+  ["requestMethod":protected]=>
   string(0) ""
-  ["requestUrl:protected"]=>
+  ["requestUrl":protected]=>
   string(0) ""
-  ["responseStatus:protected"]=>
+  ["responseStatus":protected]=>
   string(2) "Ok"
-  ["responseCode:protected"]=>
+  ["responseCode":protected]=>
   int(200)
-  ["httpVersion:protected"]=>
+  ["httpVersion":protected]=>
   float(1.1)
-  ["headers:protected"]=>
+  ["headers":protected]=>
   array(1) {
     ["Server"]=>
     string(9) "Funky/1.0"
   }
-  ["parentMessage:protected"]=>
+  ["parentMessage":protected]=>
   NULL
 }
 int(1)

diff --git a/tests/HttpMessage_004.phpt b/tests/HttpMessage_004.phpt
index ab0ede96fb52adea579d335d90b777576d3f556c..6324233ef43a09edc84e3da7d88ccefafb68ab69 100644 (file)
--- a/tests/HttpMessage_004.phpt
+++ b/tests/HttpMessage_004.phpt
@@ -30,7 +30,7 @@ var_dump($d->getBody());
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 bool(false)
 string(3) "Hi!"
 Done
\ No newline at end of file

diff --git a/tests/HttpMessage_005.phpt b/tests/HttpMessage_005.phpt
index 6466d6e22d9e33dc45e16a397320897fd2eb58a0..81dd7dd0106c978ea67d1114252d1d53291e3156 100644 (file)
--- a/tests/HttpMessage_005.phpt
+++ b/tests/HttpMessage_005.phpt
@@ -42,7 +42,7 @@ echo $m1->toString(true);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 GET http://example.com/ HTTP/1.0
 HTTP/1.1 200 ok
 Server: Funky/2.0

diff --git a/tests/HttpMessage_006.phpt b/tests/HttpMessage_006.phpt
index e1e236d539ad24555db19e504f45d23e04542c5a..c7363cee70e6eb2583b9da23a88cc8816f2e4f91 100644 (file)
--- a/tests/HttpMessage_006.phpt
+++ b/tests/HttpMessage_006.phpt
@@ -23,7 +23,7 @@ foreach ($m as $msg) {
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 ==
 HTTP/1.1 304 Not Modified
 ==

diff --git a/tests/HttpMessage_007.phpt b/tests/HttpMessage_007.phpt
index f74e9563a88dc4dcc852d94b73747f63240f8101..02d4de0e8ca390eb380e3192ea9ffd73f7ee4f1c 100644 (file)
--- a/tests/HttpMessage_007.phpt
+++ b/tests/HttpMessage_007.phpt
@@ -22,7 +22,7 @@ echo $r->toString(true);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 GET /first HTTP/1.1
 HTTP/1.1 200 Ok-first
 GET /second HTTP/1.1

diff --git a/tests/HttpQueryString_001.phpt b/tests/HttpQueryString_001.phpt
index ec64eaddbddc13ecaacd1ba159d932276ddf8f66..413bb34cab078de0cd6f13cb5d568c37f9b7d36c 100644 (file)
--- a/tests/HttpQueryString_001.phpt
+++ b/tests/HttpQueryString_001.phpt
@@ -3,7 +3,7 @@ HttpQueryString global
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -37,7 +37,7 @@ var_dump($_SERVER['QUERY_STRING']);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 string(42) "a=b&c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3"
 NULL
 string(1) "b"
@@ -72,7 +72,7 @@ object(stdClass)#%d (%d) {
   int(3)
 }
 object(HttpQueryString)#1 (2) {
-  ["queryArray:private"]=>
+  ["queryArray":"HttpQueryString":private]=>
   &array(3) {
     ["c"]=>
     string(3) "3.4"
@@ -91,7 +91,7 @@ object(HttpQueryString)#1 (2) {
       string(1) "2"
     }
   }
-  ["queryString:private"]=>
+  ["queryString":"HttpQueryString":private]=>
   &string(49) "c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3&z%5B0%5D=2"
 }
 array(3) {

diff --git a/tests/HttpQueryString_002.phpt b/tests/HttpQueryString_002.phpt
index 9968bf6c210054291048a75e3c2c4fb620cf91f1..d711f26deff5319697749d444872c2d865b8ccaf 100644 (file)
--- a/tests/HttpQueryString_002.phpt
+++ b/tests/HttpQueryString_002.phpt
@@ -3,7 +3,7 @@ HttpQueryString local
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -33,7 +33,7 @@ var_dump($array);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 string(42) "a=b&c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3"
 NULL
 string(1) "b"
@@ -68,7 +68,7 @@ object(stdClass)#%d (%d) {
   int(3)
 }
 object(HttpQueryString)#1 (2) {
-  ["queryArray:private"]=>
+  ["queryArray":"HttpQueryString":private]=>
   array(3) {
     ["c"]=>
     string(3) "3.4"
@@ -87,7 +87,7 @@ object(HttpQueryString)#1 (2) {
       string(1) "2"
     }
   }
-  ["queryString:private"]=>
+  ["queryString":"HttpQueryString":private]=>
   string(49) "c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3&z%5B0%5D=2"
 }
 array(3) {

diff --git a/tests/HttpQueryString_003.phpt b/tests/HttpQueryString_003.phpt
index f90a5826d0d08544606a27bd712d3131fa22e90f..0287ce9774cee324a1b1e13495ef736b01600c58 100644 (file)
--- a/tests/HttpQueryString_003.phpt
+++ b/tests/HttpQueryString_003.phpt
@@ -3,7 +3,7 @@ HttpQueryString xlate
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkext('iconv');
 ?>
 --FILE--
@@ -17,7 +17,7 @@ $qs->xlate("utf8", "latin1");
 var_dump($qs->get());
 echo "Done\n";
 --EXPECTF--
-%sTEST
+%aTEST
 string(29) "%E4%5B0%5D=%FC&%F6%5Ba%5D=%DF"
 string(41) "%C3%A4%5B0%5D=%C3%BC&%C3%B6%5Ba%5D=%C3%9F"
 string(29) "%E4%5B0%5D=%FC&%F6%5Ba%5D=%DF"

diff --git a/tests/HttpQueryString_004.phpt b/tests/HttpQueryString_004.phpt
index cf70e666abaa81386279577e7e30e43973a6e070..cb73ea64955a6e60088448dc9bed03c17496d404 100644 (file)
--- a/tests/HttpQueryString_004.phpt
+++ b/tests/HttpQueryString_004.phpt
@@ -3,22 +3,32 @@ HttpQueryString w/ objects
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
 echo "-TEST\n";
-$foo = (object) array("bar" => (object) array("baz" => 1), "\0*\0prop" => "dontshow");
-$foo->bar->baz = 1;
+class test_props {
+       public $bar;
+       public $baz;
+       protected $dont_show;
+       private $dont_show2;
+       function __construct() {
+               $this->bar = (object) array("baz"=>1);
+               $this->dont_show = 'xxx';
+               $this->dont_show2 = 'zzz';
+       }
+}
+$foo = new test_props;
 var_dump($q = new HttpQueryString(false, $foo));
 $foo->bar->baz = 0;
 var_dump($q->mod($foo));
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 object(HttpQueryString)#3 (2) {
-  ["queryArray:private"]=>
+  ["queryArray":"HttpQueryString":private]=>
   array(1) {
     ["bar"]=>
     array(1) {
@@ -26,11 +36,11 @@ object(HttpQueryString)#3 (2) {
       int(1)
     }
   }
-  ["queryString:private"]=>
+  ["queryString":"HttpQueryString":private]=>
   string(14) "bar%5Bbaz%5D=1"
 }
 object(HttpQueryString)#4 (2) {
-  ["queryArray:private"]=>
+  ["queryArray":"HttpQueryString":private]=>
   array(1) {
     ["bar"]=>
     array(1) {
@@ -38,7 +48,7 @@ object(HttpQueryString)#4 (2) {
       int(0)
     }
   }
-  ["queryString:private"]=>
+  ["queryString":"HttpQueryString":private]=>
   string(14) "bar%5Bbaz%5D=0"
 }
 Done

diff --git a/tests/HttpRequestDataShare_001.phpt b/tests/HttpRequestDataShare_001.phpt
index cdbdc36c57ce715478e6508c6623ac71350606e0..728fe0d6b1c6e2604894e009dccd2dfff8454035 100644 (file)
--- a/tests/HttpRequestDataShare_001.phpt
+++ b/tests/HttpRequestDataShare_001.phpt
@@ -33,6 +33,6 @@ var_dump(current($r1->getResponseCookies())->cookies["PREF"] === HttpUtil::parse
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 bool(true)
 Done

diff --git a/tests/HttpRequestDataShare_002.phpt b/tests/HttpRequestDataShare_002.phpt
index 4c61a796e64067bb7cd017eef320ce1c65e60b3d..9bd2a1815a166b45dbb8346e02314dce90c5080f 100644 (file)
--- a/tests/HttpRequestDataShare_002.phpt
+++ b/tests/HttpRequestDataShare_002.phpt
@@ -38,7 +38,7 @@ if (current($r1->getResponseCookies())->cookies["PREF"] !== HttpUtil::parseCooki
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 object(HttpRequestDataShare)#1 (4) {
   ["cookie"]=>
   bool(true)

diff --git a/tests/HttpRequestPool_001.phpt b/tests/HttpRequestPool_001.phpt
index 4008e500daede6095faeee3e99a182af93d44a82..f94e92f2d0b2803d19a15724fd82b7d9c2024f16 100644 (file)
--- a/tests/HttpRequestPool_001.phpt
+++ b/tests/HttpRequestPool_001.phpt
@@ -3,7 +3,7 @@ HttpRequestPool
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkcls('HttpRequestPool');
 checkurl('www.php.net');
 checkurl('dev.iworks.at');
@@ -43,7 +43,7 @@ echo "Done\n";
 ?>
 
 --EXPECTF--
-%sTEST
+%aTEST
 http://www.php.net/=200:200
 http://dev.iworks.at/ext-http/.print_request.php=200:200
 .

diff --git a/tests/HttpRequestPool_003.phpt b/tests/HttpRequestPool_003.phpt
index 91871c6044f60a6178cf89f2cef318bc1cbd9360..b08a706489e06e7561a68ba70ffc32acb5603518 100644 (file)
--- a/tests/HttpRequestPool_003.phpt
+++ b/tests/HttpRequestPool_003.phpt
@@ -121,7 +121,7 @@ printf("Elapsed: %0.3fs\n", microtime(true)-$time);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 %d %s %d
 %d %s %d
 %d %s %d

diff --git a/tests/HttpRequestPool_004.phpt b/tests/HttpRequestPool_004.phpt
index baafe8a57f1d16a4435c41ad56f6d0871126d66c..8348ec172807f894be04a1b99dd542a3f6861181 100644 (file)
--- a/tests/HttpRequestPool_004.phpt
+++ b/tests/HttpRequestPool_004.phpt
@@ -3,7 +3,7 @@ HttpRequestPool::__destruct() invalid curl handle
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkcls('HttpRequest');
 checkcls('HttpRequestPool');
 ?>
@@ -15,5 +15,5 @@ $p = null;
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 Done

diff --git a/tests/HttpRequestPool_005.phpt b/tests/HttpRequestPool_005.phpt
index b08729efd4558a3bf251cb50965f3c3bd0614020..ac16995edb4800ee9b7d366bb69d4a9472f04902 100644 (file)
--- a/tests/HttpRequestPool_005.phpt
+++ b/tests/HttpRequestPool_005.phpt
@@ -3,7 +3,7 @@ HttpRequestPool exception
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkcls('HttpRequestPool');
 ?>
 --FILE--
@@ -31,7 +31,7 @@ try {
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 HttpRequestPoolException: Exception caused by 2 inner exception(s)
        HttpInvalidParamException: Empty or too short HTTP message: ''
                HttpRequestException: %souldn't resolve host name; %s (http://_____/)

diff --git a/tests/HttpRequestPool_006.phpt b/tests/HttpRequestPool_006.phpt
index 1b5cb9f14269c6c0e2017a79b9de0bb720be483a..043c2082ac1ccdc4051bbcbb309f8a804f93b4d1 100644 (file)
--- a/tests/HttpRequestPool_006.phpt
+++ b/tests/HttpRequestPool_006.phpt
@@ -32,18 +32,18 @@ var_dump($p->getAttachedRequests());
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
-exception 'HttpRequestPoolException' with message 'HttpRequest object(#%d) cannot be detached from the HttpRequestPool while executing the progress callback' in %sHttpRequestPool_006.php:%d
+%aTEST
+exception 'HttpRequestPoolException' with message 'HttpRequest object(#%d) cannot be detached from the HttpRequestPool while executing the progress callback' in %aHttpRequestPool_006.php:%d
 Stack trace:
-#0 %sHttpRequestPool_006.php(%d): HttpRequestPool->detach(Object(r))
+#0 %aHttpRequestPool_006.php(%d): HttpRequestPool->detach(Object(r))
 #1 [internal function]: r->onProgress(Array)
-#2 %sHttpRequestPool_006.php(%d): HttpRequestPool->send()
+#2 %aHttpRequestPool_006.php(%d): HttpRequestPool->send()
 #3 {main}
-exception 'HttpRequestPoolException' with message 'HttpRequest object(#%d) cannot be detached from the HttpRequestPool while executing the progress callback' in %sHttpRequestPool_006.php:%d
+exception 'HttpRequestPoolException' with message 'HttpRequest object(#%d) cannot be detached from the HttpRequestPool while executing the progress callback' in %aHttpRequestPool_006.php:%d
 Stack trace:
-#0 %sHttpRequestPool_006.php(%d): HttpRequestPool->detach(Object(r))
+#0 %aHttpRequestPool_006.php(%d): HttpRequestPool->detach(Object(r))
 #1 [internal function]: r->onProgress(Array)
-#2 %sHttpRequestPool_006.php(%d): HttpRequestPool->send()
+#2 %aHttpRequestPool_006.php(%d): HttpRequestPool->send()
 #3 {main}
 array(0) {
 }

diff --git a/tests/HttpRequestPool_007.phpt b/tests/HttpRequestPool_007.phpt
index 8e97d402c8a5cb90897b1d75b5be67e04d63c628..29a2505d2c33fc08040ff6d00bae91c58447798d 100644 (file)
--- a/tests/HttpRequestPool_007.phpt
+++ b/tests/HttpRequestPool_007.phpt
@@ -28,7 +28,7 @@ class Request extends HttpRequest
                $c = $this->getResponseCode();
                $b = $this->getResponseBody();
                
-               printf("%d %s %d\n", $c, $u, strlen($b));
+               printf("%d %a %d\n", $c, $u, strlen($b));
                
                if ($c == 200 && $this->pool->dir) {
                        file_put_contents($this->pool->all[$u], $b);
@@ -112,55 +112,55 @@ printf("Elapsed: %0.3fs\n", microtime(true)-$time);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
-%d %s %d
+%aTEST
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
+%d %a %d
 Elapsed: %fs
 Done

diff --git a/tests/HttpRequest_001.phpt b/tests/HttpRequest_001.phpt
index abe65065417eb4a06291abc39e1abcc867b9e208..ddb0a43426b12d1765cf92bf1c4c689d79e42dd5 100644 (file)
--- a/tests/HttpRequest_001.phpt
+++ b/tests/HttpRequest_001.phpt
@@ -3,7 +3,7 @@ HttpRequest options
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkcls('HttpRequest');
 ?>
 --FILE--
@@ -22,7 +22,7 @@ $r1 = null;
 $r2 = null;
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 Array
 (
     [0] => Array

diff --git a/tests/HttpRequest_002.phpt b/tests/HttpRequest_002.phpt
index 5710d598f565e12011b0bd842fbe72a4dab9572f..6ad0ceddacdad3b0759f4faa346ca80281282753 100644 (file)
--- a/tests/HttpRequest_002.phpt
+++ b/tests/HttpRequest_002.phpt
@@ -3,7 +3,7 @@ HttpRequest GET/POST
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkcls('HttpRequest');
 checkurl('www.google.com');
 checkurl('dev.iworks.at');
@@ -28,7 +28,7 @@ var_dump($r->getResponseMessage()->getResponseCode());
 echo "Done";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 Array
 (
     [effective_url] => http://www.google.com/
@@ -56,9 +56,9 @@ Array
     [proxyauth_avail] => %d
     [os_errno] => %d
     [num_connects] => %d
-    [ssl_engines] => Array%s
+    [ssl_engines] => Array%a
 
-    [cookies] => Array%s
+    [cookies] => Array%a
 
     [error] => 
 )
@@ -76,7 +76,7 @@ Array
         (
             [name] => data.txt
             [type] => text/plain
-            [tmp_name] => %s
+            [tmp_name] => %a
             [error] => 0
             [size] => 1010
         )

diff --git a/tests/HttpRequest_003.phpt b/tests/HttpRequest_003.phpt
index 3ce4fcb65324607c0866f8b1523fe88c8ad79f7b..879b42b87fd71e2ecb536ca4429ff015557c4de7 100644 (file)
--- a/tests/HttpRequest_003.phpt
+++ b/tests/HttpRequest_003.phpt
@@ -3,7 +3,7 @@ HttpRequest SSL
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkurl('arweb.info');
 skipif(!http_support(HTTP_SUPPORT_SSLREQUESTS), 'need ssl-request support')
 ?>
@@ -24,7 +24,7 @@ $r->send();
 var_dump($o);
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 string(10) "1234567890"
 bool(true)
 bool(true)

diff --git a/tests/HttpRequest_004.phpt b/tests/HttpRequest_004.phpt
index 948a07e816247c9e4d3c28729c2fec11aeeff8d7..313a4dc137ba93026004184230e066c468708d30 100644 (file)
--- a/tests/HttpRequest_004.phpt
+++ b/tests/HttpRequest_004.phpt
@@ -39,7 +39,7 @@ var_dump($fields);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 
 First Request
 string(%d) "Array

diff --git a/tests/HttpRequest_005.phpt b/tests/HttpRequest_005.phpt
index 8f9b7e4435d2849301737dc40228c7ccbadd7911..0e78984832c1cc544a5d3e2b1e939fae12dc6472 100644 (file)
--- a/tests/HttpRequest_005.phpt
+++ b/tests/HttpRequest_005.phpt
@@ -20,5 +20,5 @@ foreach (get_class_methods('HttpRequest') as $method) {
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 Done

diff --git a/tests/HttpRequest_006.phpt b/tests/HttpRequest_006.phpt
index 24ee8a1ab42b8e1b676de79b7e3449c1b94e2d86..114d0b07369c7a9f56e49a047f59890a9a970cb5 100644 (file)
--- a/tests/HttpRequest_006.phpt
+++ b/tests/HttpRequest_006.phpt
@@ -20,7 +20,7 @@ var_dump($r->send());
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 object(HttpMessage)#%d (%d) {
   ["type:protected"]=>
   int(2)
@@ -57,7 +57,7 @@ object(HttpMessage)#%d (%d) {
   float(1.1)
   ["headers:protected"]=>
   array(6) {
-    %s
+    %a
   }
   ["parentMessage:protected"]=>
   NULL
@@ -98,7 +98,7 @@ object(HttpMessage)#%d (%d) {
   float(1.1)
   ["headers:protected"]=>
   array(6) {
-    %s
+    %a
   }
   ["parentMessage:protected"]=>
   NULL
@@ -139,7 +139,7 @@ object(HttpMessage)#%d (%d) {
   float(1.1)
   ["headers:protected"]=>
   array(6) {
-    %s
+    %a
   }
   ["parentMessage:protected"]=>
   NULL

diff --git a/tests/HttpRequest_007.phpt b/tests/HttpRequest_007.phpt
index f440c83d2776b7e6a7a7916bfeb7958edd9822c5..067e36c477d702c95645e76e959b43130f8b8d78 100644 (file)
--- a/tests/HttpRequest_007.phpt
+++ b/tests/HttpRequest_007.phpt
@@ -18,9 +18,9 @@ var_dump($r->getHistory()->toString(true));
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 string(%d) "PUT /ext-http/.print_put.php5 HTTP/1.1
-User-Agent: PECL::HTTP/%s
+User-Agent: PECL::HTTP/%a
 Host: dev.iworks.at
 Accept: */*
 Content-Type: text/plain
@@ -41,9 +41,9 @@ echo "Done\n";
 
 HTTP/1.1 100 Continue
 HTTP/1.1 200 OK
-Date: %s
-Server: %s
-X-Powered-By: %s
+Date: %a
+Server: %a
+X-Powered-By: %a
 Vary: Accept-Encoding
 Content-Length: %d
 Content-Type: text/html

diff --git a/tests/HttpRequest_008.phpt b/tests/HttpRequest_008.phpt
index 638d4c8d080280e9b66d2ff3a25fce3b1b479178..81dbcb3b8a482d4ed6001a356771c4642ae190ae 100644 (file)
--- a/tests/HttpRequest_008.phpt
+++ b/tests/HttpRequest_008.phpt
@@ -19,10 +19,10 @@ var_dump($r->getRawRequestMessage());
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 int(200)
 string(%d) "FOOBAR /ext-http/.print_request.php HTTP/1.1
-User-Agent: %s
+User-Agent: %a
 Host: dev.iworks.at
 Accept: */*
 Content-Type: text/plain

diff --git a/tests/HttpRequest_009.phpt b/tests/HttpRequest_009.phpt
index e74121a789bd09deb0d1744301e48747909b0f58..bbc2ddf808ac9b28f41b53942d7d8b6504177382 100644 (file)
--- a/tests/HttpRequest_009.phpt
+++ b/tests/HttpRequest_009.phpt
@@ -29,7 +29,7 @@ $r->send();
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 Array
 (
     [dltotal] => %f
@@ -37,7 +37,7 @@ Array
     [ultotal] => %f
     [ulnow] => %f
 )
-%srray
+%array
 (
     [dltotal] => %f
     [dlnow] => %f

diff --git a/tests/HttpRequest_010.phpt b/tests/HttpRequest_010.phpt
index 10ec767477191468744a30bd7a8d7191c90354d6..292cc1f02538daa40654c33277077301a5ca9e57 100644 (file)
--- a/tests/HttpRequest_010.phpt
+++ b/tests/HttpRequest_010.phpt
@@ -3,7 +3,7 @@ HttpRequest cookie API
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkcls("HttpRequest");
 ?>
 --FILE--
@@ -42,7 +42,7 @@ if ($c[2] !== $c[3]) {
 
 echo "Done\n";
 --EXPECTF--
-%sTEST
+%aTEST
 bool(true)
 bool(true)
 Done

diff --git a/tests/HttpResponse_001.phpt b/tests/HttpResponse_001.phpt
index 21db4588423de6a6f1fe04d9f03c4fcad71c4d60..8d2417dd263694a2fa6709c0581f3b261b8d6e98 100644 (file)
--- a/tests/HttpResponse_001.phpt
+++ b/tests/HttpResponse_001.phpt
@@ -3,7 +3,7 @@ HttpResponse - send data with caching headers
 --SKIPIF--
 <?php 
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkcgi();
 ?>
 --FILE--
@@ -14,10 +14,10 @@ HttpResponse::setData('foobar');
 HttpResponse::send();
 ?>
 --EXPECTF--
-X-Powered-By: PHP/%s
+X-Powered-By: PHP/%a
 Cache-Control: public, must-revalidate, max-age=3600
-Last-Modified: %s, %d %s 20%d %d:%d:%d GMT
-Content-Type: %s
+Last-Modified: %a, %d %a 20%d %d:%d:%d GMT
+Content-Type: %a
 Accept-Ranges: bytes
 ETag: "3858f62230ac3c915f300c664312c63f"
 Content-Length: 6

diff --git a/tests/HttpResponse_002.phpt b/tests/HttpResponse_002.phpt
index 49ad6fa4b44899081548adadd0d7f29440fae85f..584f4a78e9b5ac3498bd9f4026f47fc9a5a337fa 100644 (file)
--- a/tests/HttpResponse_002.phpt
+++ b/tests/HttpResponse_002.phpt
@@ -3,7 +3,7 @@ HttpResponse - send gzipped file
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkcgi();
 skipif(!http_support(HTTP_SUPPORT_ENCODINGS), "need zlib support");
 ?>
@@ -16,10 +16,10 @@ HttpResponse::setFile(__FILE__);
 HttpResponse::send();
 ?>
 --EXPECTF--
-X-Powered-By: PHP/%s
-Content-Type: %s
+X-Powered-By: PHP/%a
+Content-Type: %a
 Accept-Ranges: bytes
 Content-Encoding: gzip
 Vary: Accept-Encoding
 
-%s
+%a

diff --git a/tests/HttpResponse_003.phpt b/tests/HttpResponse_003.phpt
index 22f46749a1e3721e3a063b41f55f3366ed2bc394..8a45f47970845e526978b6ba068a75e9d0219a3a 100644 (file)
--- a/tests/HttpResponse_003.phpt
+++ b/tests/HttpResponse_003.phpt
@@ -3,7 +3,7 @@ HttpResponse - send gzipped file with caching headers
 --SKIPIF--
 <?php 
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkcgi();
 skipif(!http_support(HTTP_SUPPORT_ENCODINGS), "need zlib support");
 ?>
@@ -18,13 +18,13 @@ HttpResponse::setFile(__FILE__);
 HttpResponse::send();
 ?>
 --EXPECTF--
-X-Powered-By: PHP/%s
+X-Powered-By: PHP/%a
 Cache-Control: public, must-revalidate, max-age=3600
-Last-Modified: %s, %d %s 20%d %d:%d:%d GMT
-Content-Type: %s
+Last-Modified: %a, %d %a 20%d %d:%d:%d GMT
+Content-Type: %a
 Accept-Ranges: bytes
-ETag: "%s"
+ETag: "%a"
 Content-Encoding: gzip
 Vary: Accept-Encoding
 
-%s
+%a

diff --git a/tests/HttpResponse_004.phpt b/tests/HttpResponse_004.phpt
index ffe26c90671411f4d53d9864ab1644a28a6d7fd4..d8d02f9cbc431d27de3f03e011d1d48f9f923d3d 100644 (file)
--- a/tests/HttpResponse_004.phpt
+++ b/tests/HttpResponse_004.phpt
@@ -4,7 +4,7 @@ HttpResponse - send cached gzipped data
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 skipif(!http_support(HTTP_SUPPORT_ENCODINGS), "need zlib support");
 ?>
 --ENV--
@@ -19,7 +19,7 @@ HttpResponse::setData("abc");
 HttpResponse::send();
 ?>
 --EXPECTF--
-Status: 304
+Status: 304%s
 X-Powered-By: PHP/%s
 Cache-Control: public, must-revalidate, max-age=3600
 Last-Modified: %s

diff --git a/tests/HttpResponse_005.phpt b/tests/HttpResponse_005.phpt
index c43e7f819330591c0d1d241b918dbf0afd90d354..afa768c8f5b568099442546be8a3ef63e25e8061 100644 (file)
--- a/tests/HttpResponse_005.phpt
+++ b/tests/HttpResponse_005.phpt
@@ -4,7 +4,7 @@ HttpResponse file not found
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -17,7 +17,7 @@ HttpResponse::setFile("__nonexistant__.pdf");
 HttpResponse::send();
 ?>
 --EXPECTF--
-Status: 404
+Status: 404%s
 X-Powered-By: PHP/%s
 Content-Type: text/plain
 

diff --git a/tests/allowed_methods_002.phpt b/tests/allowed_methods_002.phpt
index 800a805f3ba69d5a72b6fce3760bbc9748cbf479..99d0c61c8e9f66706d513b75069c132cbedf18e0 100644 (file)
--- a/tests/allowed_methods_002.phpt
+++ b/tests/allowed_methods_002.phpt
@@ -4,7 +4,7 @@ allowed methods
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -14,8 +14,8 @@ ini_set('http.request.methods.allowed', 'POST');
 echo "Done\n";
 ?>
 --EXPECTF--
-Status: 405
-X-Powered-By: PHP/%s
+Status: 405%s
+X-Powered-By: PHP/%a
 Allow: POST
-Content-type: %s
+Content-type: %a
 

diff --git a/tests/allowed_methods_002_logging.phpt b/tests/allowed_methods_002_logging.phpt
index 73b458bc00b2c804c28f1710cafefdcc0030c2a4..6edbb6c76b43799c061add014554c8640edb1239 100644 (file)
--- a/tests/allowed_methods_002_logging.phpt
+++ b/tests/allowed_methods_002_logging.phpt
@@ -4,7 +4,7 @@ logging allowed methods
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_HOST=example.com
@@ -16,6 +16,6 @@ log_content(_AMETH_LOG);
 echo "Done";
 ?>
 --EXPECTF--
-%sTEST
-%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d      [405-ALLOWED]   Allow: POST     <%s>
+%aTEST
+%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d      [405-ALLOWED]   Allow: POST     <%a>
 Done

diff --git a/tests/build_str_001.phpt b/tests/build_str_001.phpt
index 8aeafcc06143bbcbf7ac0134d92c4931b1308f30..8e2ce39ad9c600abc1ec200b7dde742661bacb70 100644 (file)
--- a/tests/build_str_001.phpt
+++ b/tests/build_str_001.phpt
@@ -22,7 +22,7 @@ echo http_build_str(array(1,2,array(3)), "foo", "&"), "\n";
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 a=b
 a=b&c%5B0%5D=1
 a=b&c%5B0%5D=1&d%5Be%5D=f

diff --git a/tests/build_url_001.phpt b/tests/build_url_001.phpt
index d131f55503dbe38b289e3e04eff5a64bdf07bb54..c8b5ad36c146e9868b358f4d518390d695905d69 100644 (file)
--- a/tests/build_url_001.phpt
+++ b/tests/build_url_001.phpt
@@ -12,7 +12,7 @@ echo http_build_url('with/some/path/'), "\n";
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
-http://%s/page
-http://%s/with/some/path/
+%aTEST
+http://%a/page
+http://%a/with/some/path/
 Done

diff --git a/tests/build_url_002.phpt b/tests/build_url_002.phpt
index dbaa93723b95db91685702558efbfa184b10ebd4..787b7f42840b22b5927f78328a19b45a9b0d7002 100644 (file)
--- a/tests/build_url_002.phpt
+++ b/tests/build_url_002.phpt
@@ -15,7 +15,7 @@ print_r($u);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 https://www.example.com:9999/replaced?q=1#n
 https://www.example.com:9999/replaced?q=1#n
 Array

diff --git a/tests/build_url_003.phpt b/tests/build_url_003.phpt
index cb2d84f2c8c83d800345b4a6466a764b1196fb9c..1e552904910c217e254e6686928bc64ebbc12b3b 100644 (file)
--- a/tests/build_url_003.phpt
+++ b/tests/build_url_003.phpt
@@ -3,7 +3,7 @@ http_build_url()
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_HOST=www.example.com
@@ -18,7 +18,7 @@ printf("-%s-\n", http_build_url($url, array('scheme' => 'ftp', 'host' => 'ftp.ex
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 -http://www.example.com/path/?query#anchor-
 -https://www.example.com/path/?query#anchor-
 -https://ssl.example.com/path/?query#anchor-

diff --git a/tests/build_url_004.phpt b/tests/build_url_004.phpt
index 10ce955f5e030de70d8395936df6e5e46e6ccad5..f518f7bc5db9facdc0d707762ebf3fc21fd55815 100644 (file)
--- a/tests/build_url_004.phpt
+++ b/tests/build_url_004.phpt
@@ -14,7 +14,7 @@ echo http_build_url("http://www.example.com:8080/foo?a[0]=b#frag", "?a[0]=1&b=c&
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 http://www.example.com/foo/baz
 http://www.example.com/foo/baz
 http://mike@www.example.com/foo/baz

diff --git a/tests/chunked_decode_001.phpt b/tests/chunked_decode_001.phpt
index 2575704c547f227c3d34efdfef21e4ce84c6e538..3d65dbfdfa503246d97cc75e422ad5a68c6b5a8c 100644 (file)
--- a/tests/chunked_decode_001.phpt
+++ b/tests/chunked_decode_001.phpt
@@ -19,7 +19,7 @@ $data =
 var_dump(http_chunked_decode($data));
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 string(12) "abra
 cadabra"
 

diff --git a/tests/chunked_decode_002.phpt b/tests/chunked_decode_002.phpt
index 8221ee89a08cf93b21da6aa69cfa193bbcdb6333..3444932ac53d7c0606a9b2be7347d58e2fb669eb 100644 (file)
--- a/tests/chunked_decode_002.phpt
+++ b/tests/chunked_decode_002.phpt
@@ -19,7 +19,7 @@ $data =
 var_dump(http_chunked_decode($data));
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 string(12) "abra
 cadabra"
 

diff --git a/tests/chunked_decode_003.phpt b/tests/chunked_decode_003.phpt
index 0081bbee3ca16c84f0df93f767235bd403a44c41..c9da8c2027cdce443d69b4f9a5da6d622703fcfb 100644 (file)
--- a/tests/chunked_decode_003.phpt
+++ b/tests/chunked_decode_003.phpt
@@ -19,8 +19,8 @@ $data =
 var_dump(http_chunked_decode($data));
 ?>
 --EXPECTF--
-%sTEST
-%sWarning%shttp_chunked_decode()%sTruncated message: chunk size 255 exceeds remaining data size 12 at pos 34 of 46 in%s
+%aTEST
+%aWarning%ahttp_chunked_decode()%aTruncated message: chunk size 255 exceeds remaining data size 12 at pos 34 of 46 in%a
 string(24) "abra
 cadabra
 all we got

diff --git a/tests/chunked_decode_004.phpt b/tests/chunked_decode_004.phpt
index 77aed2805ce91b7a9d6347e615d08254a3645a8c..5dc7157d8a754f480df74c7d4ae57e7c938511d6 100644 (file)
--- a/tests/chunked_decode_004.phpt
+++ b/tests/chunked_decode_004.phpt
@@ -19,7 +19,7 @@ $data =
 var_dump(http_chunked_decode($data));
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 string(24) "abra
 cadabra
 all we got

diff --git a/tests/cloning_001.phpt b/tests/cloning_001.phpt
index 7b40fdc5f0d03af938bb5dbadc63385e21ae7c54..20c8fe68753268d115b4ad38fa3dea806b13177b 100644 (file)
--- a/tests/cloning_001.phpt
+++ b/tests/cloning_001.phpt
@@ -3,7 +3,7 @@ cloning
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 checkcls('HttpRequest');
 ?>
 --FILE--
@@ -22,7 +22,7 @@ var_dump($r1->getResponseInfo() == $r2->getResponseInfo());
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 bool(false)
 bool(false)
 bool(false)

diff --git a/tests/date_001.phpt b/tests/date_001.phpt
index 7964be715cea6f92153903b7eaec10698e08b1b1..95d0268fab73b225d58024db89a731053b14a800 100644 (file)
--- a/tests/date_001.phpt
+++ b/tests/date_001.phpt
@@ -11,7 +11,7 @@ echo http_date(1), "\n";
 echo http_date(1234567890), "\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 Thu, 01 Jan 1970 00:00:01 GMT
 Fri, 13 Feb 2009 23:31:30 GMT
 

diff --git a/tests/date_002.phpt b/tests/date_002.phpt
index 1623595f87d69c0cd42128ae0697840e7447d8fd..aeb120555c9e3c03af9fa7df703c7b401d560ffc 100644 (file)
--- a/tests/date_002.phpt
+++ b/tests/date_002.phpt
@@ -14,8 +14,8 @@ var_dump($t > 1);
 echo "$t\n$d\nDone\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 bool(true)
 %d
-%s, %d %s %d %d:%d:%d GMT
+%a, %d %a %d %d:%d:%d GMT
 Done

diff --git a/tests/encoding_objects_001.phpt b/tests/encoding_objects_001.phpt
index 67da0ce634b3945178b037a6d63e0c02fccb2bc2..60fe4cdc59b19cf00bdb78e6da3e32fa3f8afeb4 100644 (file)
--- a/tests/encoding_objects_001.phpt
+++ b/tests/encoding_objects_001.phpt
@@ -27,7 +27,7 @@ var_dump($id == $pd);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 Hi there!
 Yo...
 bool(true)

diff --git a/tests/encodings.phpt b/tests/encodings.phpt
index f8676d5c26966a18a83ee8f5ad886588f595fce9..e55c6b9945f0e54b2a8d1ec96f886f76ad6cc958 100644 (file)
--- a/tests/encodings.phpt
+++ b/tests/encodings.phpt
@@ -37,7 +37,7 @@ if (extension_loaded('zlib')) {
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 bool(true)
 bool(true)
 bool(true)

diff --git a/tests/etag_mode_031.phpt b/tests/etag_mode_031.phpt
index 813b309373e60b293f2f6360ef4f3a616637ee83..43a0c1a15904e9f98fd8d4ca4a5c1fdb427f7fad 100644 (file)
--- a/tests/etag_mode_031.phpt
+++ b/tests/etag_mode_031.phpt
@@ -4,7 +4,7 @@ crc32 etag (may fail because PHPs crc32 is actually crc32b)
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -13,11 +13,11 @@ http_cache_etag();
 http_send_data("abc\n");
 ?>
 --EXPECTF--
-X-Powered-By: PHP/%s
+X-Powered-By: PHP/%a
 Cache-Control: private, must-revalidate, max-age=0
 Accept-Ranges: bytes
 ETag: "4e818847"
 Content-Length: 4
-Content-type: %s
+Content-type: %a
 
 abc

diff --git a/tests/etag_mode_032.phpt b/tests/etag_mode_032.phpt
index 87571182c53cfaaf64a0c3149d791fcc57ba3492..2f2c6436e591b0dbc421768a1a3c35feb25d097c 100644 (file)
--- a/tests/etag_mode_032.phpt
+++ b/tests/etag_mode_032.phpt
@@ -4,7 +4,7 @@ sha1 etag
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -13,11 +13,11 @@ http_cache_etag();
 http_send_data("abc\n");
 ?>
 --EXPECTF--
-X-Powered-By: PHP/%s
+X-Powered-By: PHP/%a
 Cache-Control: private, must-revalidate, max-age=0
 Accept-Ranges: bytes
 ETag: "03cfd743661f07975fa2f1220c5194cbaff48451"
 Content-Length: 4
-Content-type: %s
+Content-type: %a
 
 abc

diff --git a/tests/etag_mode_033.phpt b/tests/etag_mode_033.phpt
index 3f75c1608d759813cc963d8d615e7b0bd5e9dcd3..4842a83eecf3079339818c525b518a0233b9c2c9 100644 (file)
--- a/tests/etag_mode_033.phpt
+++ b/tests/etag_mode_033.phpt
@@ -4,7 +4,7 @@ md5 etag
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -13,11 +13,11 @@ http_cache_etag();
 http_send_data("abc\n");
 ?>
 --EXPECTF--
-X-Powered-By: PHP/%s
+X-Powered-By: PHP/%a
 Cache-Control: private, must-revalidate, max-age=0
 Accept-Ranges: bytes
 ETag: "0bee89b07a248e27c83fc3d5951213c1"
 Content-Length: 4
-Content-type: %s
+Content-type: %a
 
 abc

diff --git a/tests/etag_mode_034.phpt b/tests/etag_mode_034.phpt
index bce9e527c883e51f237beab45a0d517e46f36fca..6416a4801dc7305aff21f42cabb9d046f1a0b04b 100644 (file)
--- a/tests/etag_mode_034.phpt
+++ b/tests/etag_mode_034.phpt
@@ -4,7 +4,7 @@ ext/hash etag
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 skipif(!extension_loaded('hash'), 'need ext/hash support');
 ?>
 --FILE--
@@ -14,11 +14,11 @@ http_cache_etag();
 http_send_data("abc\n");
 ?>
 --EXPECTF--
-X-Powered-By: PHP/%s
+X-Powered-By: PHP/%a
 Cache-Control: private, must-revalidate, max-age=0
 Accept-Ranges: bytes
 ETag: "edeaaff3f1774ad2888673770c6d64097e391bc362d7d6fb34982ddf0efd18cb"
 Content-Length: 4
-Content-type: %s
+Content-type: %a
 
 abc

diff --git a/tests/etag_mode_041.phpt b/tests/etag_mode_041.phpt
index 694608ed5ab6b4fddf461e7a8494fcf60585028d..e1f8a5f850e0ef2f1da5fc1072d340568716938a 100644 (file)
--- a/tests/etag_mode_041.phpt
+++ b/tests/etag_mode_041.phpt
@@ -4,7 +4,7 @@ ob crc32 etag (may fail because PHPs crc32 is actually crc32b)
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -13,9 +13,9 @@ http_cache_etag();
 print("abc\n");
 ?>
 --EXPECTF--
-X-Powered-By: PHP/%s
+X-Powered-By: PHP/%a
 Cache-Control: private, must-revalidate, max-age=0
 ETag: "4e818847"
-Content-type: %s
+Content-type: %a
 
 abc

diff --git a/tests/etag_mode_042.phpt b/tests/etag_mode_042.phpt
index 59d7f42a8bac78149614da094760eed30e791141..843e636e84aeb4d781c2cd4a0a8678fba60ca1f4 100644 (file)
--- a/tests/etag_mode_042.phpt
+++ b/tests/etag_mode_042.phpt
@@ -4,7 +4,7 @@ ob sha1 etag
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -13,9 +13,9 @@ http_cache_etag();
 print("abc\n");
 ?>
 --EXPECTF--
-X-Powered-By: PHP/%s
+X-Powered-By: PHP/%a
 Cache-Control: private, must-revalidate, max-age=0
 ETag: "03cfd743661f07975fa2f1220c5194cbaff48451"
-Content-type: %s
+Content-type: %a
 
 abc

diff --git a/tests/etag_mode_043.phpt b/tests/etag_mode_043.phpt
index 065bc936d8ba77a5c75f73d4346be0cbe4440445..303312b416b07a78dc86a1aacdb1b294655b685f 100644 (file)
--- a/tests/etag_mode_043.phpt
+++ b/tests/etag_mode_043.phpt
@@ -4,7 +4,7 @@ ob md5 etag
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -13,9 +13,9 @@ http_cache_etag();
 print("abc\n");
 ?>
 --EXPECTF--
-X-Powered-By: PHP/%s
+X-Powered-By: PHP/%a
 Cache-Control: private, must-revalidate, max-age=0
 ETag: "0bee89b07a248e27c83fc3d5951213c1"
-Content-type: %s
+Content-type: %a
 
 abc

diff --git a/tests/etag_mode_044.phpt b/tests/etag_mode_044.phpt
index 0d8129ad257d093bd02ca1d4dae056e459080fd3..faf4bf1f25e83dd352071f1a6d6db0354e86bdec 100644 (file)
--- a/tests/etag_mode_044.phpt
+++ b/tests/etag_mode_044.phpt
@@ -4,7 +4,7 @@ ob ext/hash etag
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 skipif(!extension_loaded('hash'), 'need ext/hash support');
 ?>
 --FILE--
@@ -14,9 +14,9 @@ http_cache_etag();
 print("abc\n");
 ?>
 --EXPECTF--
-X-Powered-By: PHP/%s
+X-Powered-By: PHP/%a
 Cache-Control: private, must-revalidate, max-age=0
 ETag: "edeaaff3f1774ad2888673770c6d64097e391bc362d7d6fb34982ddf0efd18cb"
-Content-type: %s
+Content-type: %a
 
 abc

diff --git a/tests/exceptions.phpt b/tests/exceptions.phpt
index 1febe33275e33ab9737d1a507c4fc217194fa6eb..c99461fbddeecb789ac8b65317909cbc998a95b0 100644 (file)
--- a/tests/exceptions.phpt
+++ b/tests/exceptions.phpt
@@ -3,7 +3,7 @@ exceptions
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -37,7 +37,7 @@ foreach ($e as $i => $c) {
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
  1: HttpRuntimeException
  2: HttpInvalidParamException
  3: HttpHeaderException

diff --git a/tests/get_request_data_001.phpt b/tests/get_request_data_001.phpt
index 3dabaa14b3987ba02615f8b42b3a33f6145c404a..ea79b262cb93d4f81a04d52e5c685b20edede585 100644 (file)
--- a/tests/get_request_data_001.phpt
+++ b/tests/get_request_data_001.phpt
@@ -25,7 +25,7 @@ var_dump(fread(http_get_request_body_stream(), 4096));
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 Array
 (
     [Accept-Charset] => iso-8859-1, *

diff --git a/tests/match_request_header_001.phpt b/tests/match_request_header_001.phpt
index b832f34deda2287176252683fd169d79eb3bf779..7c1c2b7bfbea1a8ab9a1ebd02dc039160404c7f5 100644 (file)
--- a/tests/match_request_header_001.phpt
+++ b/tests/match_request_header_001.phpt
@@ -3,7 +3,7 @@ http_match_request_header()
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_FOO=bar
@@ -16,7 +16,7 @@ var_dump(http_match_request_header("foo", "BAR", 1));
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 bool(true)
 bool(true)
 bool(false)

diff --git a/tests/negotiation_001.phpt b/tests/negotiation_001.phpt
index 89a8e49bb3595cbfaf64ee1b85a4e389163c16c9..9cf99365b50c45072e2a5e5ae3e8e231b19594b0 100644 (file)
--- a/tests/negotiation_001.phpt
+++ b/tests/negotiation_001.phpt
@@ -3,7 +3,7 @@ negotiation
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_ACCEPT=application/xml, application/xhtml+xml, text/html ; q = .8
@@ -36,7 +36,7 @@ print_r($tresult);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 string(2) "de"
 string(2) "de"
 string(10) "iso-8859-1"

diff --git a/tests/ob_deflatehandler_001.phpt b/tests/ob_deflatehandler_001.phpt
index 2d7a059a2878987cc2ba7d263b8fd6e31cd30647..bd41dcdb8083f2bd4616c8bfa34cbc40639312c2 100644 (file)
--- a/tests/ob_deflatehandler_001.phpt
+++ b/tests/ob_deflatehandler_001.phpt
@@ -4,7 +4,7 @@ ob_deflatehandler
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 skipif(!http_support(HTTP_SUPPORT_ENCODINGS), "need zlib");
 ?>
 --ENV--
@@ -16,8 +16,8 @@ echo "-TEST\n";
 echo "Done\n";
 ?>
 --EXPECTF--
-%s
+%a
 Content-Encoding: gzip
 Vary: Accept-Encoding
-%s
+%a
 

diff --git a/tests/ob_inflatehandler_001.phpt b/tests/ob_inflatehandler_001.phpt
index 2e494de3e97f6ba57960713799848f07457bb777..5d352b4aca09f422769b6b25b230baf2cd715827 100644 (file)
--- a/tests/ob_inflatehandler_001.phpt
+++ b/tests/ob_inflatehandler_001.phpt
@@ -12,5 +12,5 @@ ob_start('ob_inflatehandler');
 echo http_deflate("TEST\n");
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 

diff --git a/tests/parse_cookie_001.phpt b/tests/parse_cookie_001.phpt
index a3dbe605e8f19618ec426bb2f2323e1b4f92f468..2668b0e10e0220e20f7cd8a7e97f66ee73b72384 100644 (file)
--- a/tests/parse_cookie_001.phpt
+++ b/tests/parse_cookie_001.phpt
@@ -13,8 +13,8 @@ var_dump(http_parse_cookie('name="value"; foo="bar\"baz"; hey=got"it ; path=/
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
-object(stdClass)%s {
+%aTEST
+object(stdClass)%a {
   ["cookies"]=>
   array(3) {
     ["name"]=>

diff --git a/tests/parse_cookie_002.phpt b/tests/parse_cookie_002.phpt
index f40c823f2dee4d1fc7de907f3dbc6ff0103852d8..b4179227cee657e2aeda495eeaaeed4f12317b8e 100644 (file)
--- a/tests/parse_cookie_002.phpt
+++ b/tests/parse_cookie_002.phpt
@@ -3,7 +3,7 @@ parse cookie
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -46,7 +46,7 @@ var_dump(http_parse_cookie('foo= " ')->cookies['foo']);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 string(0) ""
 string(0) ""
 string(0) ""

diff --git a/tests/parse_headers_001.phpt b/tests/parse_headers_001.phpt
index 9da8c815277a80999c62e79f9b8620e5e1c5460e..c81e8839eef46508316090201bd67a17c04a8d95 100644 (file)
--- a/tests/parse_headers_001.phpt
+++ b/tests/parse_headers_001.phpt
@@ -21,7 +21,7 @@ print_r(http_parse_headers(
 ));
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 Array
 (
     [Host] => Array

diff --git a/tests/parse_message_001.phpt b/tests/parse_message_001.phpt
index 84c874c12392fac8b0c05a77a39aab5c791864a2..a252d637459f114991e8385a321c9f093989a0e1 100644 (file)
--- a/tests/parse_message_001.phpt
+++ b/tests/parse_message_001.phpt
@@ -13,6 +13,6 @@ $m = http_parse_message(http_get('http://www.google.com'));
 echo $m->body;
 echo "Done\n";
 --EXPECTF--
-%sTEST
-<HTML>%sThe document has moved%s</HTML>
+%aTEST
+<HTML>%aThe document has moved%a</HTML>
 Done

diff --git a/tests/parse_message_002.phpt b/tests/parse_message_002.phpt
index 281215d4f6a1f3e825981e2832e80956158c0bdf..95a281570b452bf9a027e8953cfbc1361c292d4c 100644 (file)
--- a/tests/parse_message_002.phpt
+++ b/tests/parse_message_002.phpt
@@ -19,7 +19,7 @@ print_r(http_parse_message($message));
 
 echo "Done\n";
 --EXPECTF--
-%sTEST
+%aTEST
 stdClass Object
 (
     [type] => 2

diff --git a/tests/parse_message_003.phpt b/tests/parse_message_003.phpt
index 9ef5b21c906defaaa4dc3eda2688a0b9013257b0..3ceafe9dd84cbb33f1f3d2d8a57bd4cc8301e789 100644 (file)
--- a/tests/parse_message_003.phpt
+++ b/tests/parse_message_003.phpt
@@ -25,7 +25,7 @@ $msg = http_parse_message($message);
 
 echo "Done\n";
 --EXPECTF--
-%sTEST
+%aTEST
 string(2) "OK"
-%s Invalid Content-Range header: bytes 0-1/1 in%s
+%a Invalid Content-Range header: bytes 0-1/1 in%a
 Done

diff --git a/tests/parse_message_004.phpt b/tests/parse_message_004.phpt
index 759065ccae26a7d6a8ed742b07f270403a2738dd..5ce6048ddf530378346679be6cc92650260a358f 100644 (file)
--- a/tests/parse_message_004.phpt
+++ b/tests/parse_message_004.phpt
@@ -30,8 +30,8 @@ var_dump(http_parse_message($message));
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
-object(stdClass)%s {
+%aTEST
+object(stdClass)%a {
   ["type"]=>
   int(2)
   ["httpVersion"]=>
@@ -50,7 +50,7 @@ object(stdClass)%s {
   ["body"]=>
   string(10) "1234567890"
   ["parentMessage"]=>
-  object(stdClass)%s {
+  object(stdClass)%a {
     ["type"]=>
     int(1)
     ["httpVersion"]=>
@@ -69,7 +69,7 @@ object(stdClass)%s {
     ["body"]=>
     string(0) ""
     ["parentMessage"]=>
-    object(stdClass)%s {
+    object(stdClass)%a {
       ["type"]=>
       int(2)
       ["httpVersion"]=>
@@ -88,7 +88,7 @@ object(stdClass)%s {
       ["body"]=>
       string(0) ""
       ["parentMessage"]=>
-      object(stdClass)%s {
+      object(stdClass)%a {
         ["type"]=>
         int(1)
         ["httpVersion"]=>

diff --git a/tests/parse_message_005.phpt b/tests/parse_message_005.phpt
index f86aac7223c79b2b76aada681ade3b9e39b5aa6e..e07db870f24fea70d71134a646861ecb10d4c83c 100644 (file)
--- a/tests/parse_message_005.phpt
+++ b/tests/parse_message_005.phpt
@@ -26,7 +26,7 @@ Content-Range: bytes 0-0/100
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 stdClass Object
 (
     [type] => 2

diff --git a/tests/parse_params_001.phpt b/tests/parse_params_001.phpt
index bbfa63b3b936c80964af01e93280a7d5860fee8a..ab5a5b2f01a59bdabc25dac95de6fa06bdbd5b18 100644 (file)
--- a/tests/parse_params_001.phpt
+++ b/tests/parse_params_001.phpt
@@ -16,8 +16,8 @@ $p = http_parse_params('a=b'); var_dump($p->params[0]);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
-object(stdClass)%s {
+%aTEST
+object(stdClass)%a {
   ["params"]=>
   array(2) {
     [0]=>
@@ -29,7 +29,7 @@ object(stdClass)%s {
     }
   }
 }
-object(stdClass)%s {
+object(stdClass)%a {
   ["params"]=>
   array(2) {
     [0]=>
@@ -41,7 +41,7 @@ object(stdClass)%s {
     }
   }
 }
-object(stdClass)%s {
+object(stdClass)%a {
   ["params"]=>
   array(2) {
     [0]=>
@@ -53,7 +53,7 @@ object(stdClass)%s {
     }
   }
 }
-object(stdClass)%s {
+object(stdClass)%a {
   ["params"]=>
   array(3) {
     [0]=>

diff --git a/tests/persistent_handles_001.phpt b/tests/persistent_handles_001.phpt
index 8bdba2504882fff416b858ee717f8bcb1aaef4b7..05d63b53639dc8d716dba50ffa1259a9e5b3b044 100644 (file)
--- a/tests/persistent_handles_001.phpt
+++ b/tests/persistent_handles_001.phpt
@@ -17,7 +17,7 @@ echo "No free handles!\n";
 foreach (http_persistent_handles_count() as $provider => $idents) {
        foreach ((array)$idents as $ident => $counts) {
                if (!empty($counts["free"])) {
-                       printf("%s, %s, %s\n", $provider, $ident, $counts["free"]);
+                       printf("%a, %a, %a\n", $provider, $ident, $counts["free"]);
                }
        }
 }
@@ -38,7 +38,7 @@ print_r(http_persistent_handles_count());
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 No free handles!
 One free request handle within GLOBAL: int(1)
 Reusing request handle: bool(true)

diff --git a/tests/persistent_handles_002.phpt b/tests/persistent_handles_002.phpt
index fb4c8fa721b45f12f24125cae83507ad94cf1693..afaad11b9447945d01b644be3b55b494f744ca46 100644 (file)
--- a/tests/persistent_handles_002.phpt
+++ b/tests/persistent_handles_002.phpt
@@ -3,7 +3,7 @@ persistent handles
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 skipif(!http_support(HTTP_SUPPORT_REQUESTS), "need request support");
 skipif(function_exists('zend_thread_id'), "need non-ZTS build");
 ?>
@@ -18,7 +18,7 @@ echo "No free handles!\n";
 foreach (http_persistent_handles_count() as $provider => $idents) {
        foreach ((array)$idents as $ident => $counts) {
                if (!empty($counts["free"])) {
-                       printf("%s, %s, %s\n", $provider, $ident, $counts["free"]);
+                       printf("%a, %a, %a\n", $provider, $ident, $counts["free"]);
                }
        }
 }
@@ -40,7 +40,7 @@ print_r(http_persistent_handles_count());
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 No free handles!
 One free request handle within GLOBAL: int(1)
 Reusing request handle: bool(true)

diff --git a/tests/persistent_handles_003.phpt b/tests/persistent_handles_003.phpt
index 30158358d1eec98faa5b42cea1a1fef8fa75b623..f676f560599aa0880bb319b19f9c87c0aa4b112f 100644 (file)
--- a/tests/persistent_handles_003.phpt
+++ b/tests/persistent_handles_003.phpt
@@ -17,7 +17,7 @@ echo "No free handles!\n";
 foreach (http_persistent_handles_count() as $provider => $idents) {
        foreach ((array)$idents as $ident => $counts) {
                if (!empty($counts["free"])) {
-                       printf("%s, %s, %s\n", $provider, $ident, $counts["free"]);
+                       printf("%a, %a, %a\n", $provider, $ident, $counts["free"]);
                }
        }
 }
@@ -39,7 +39,7 @@ print_r(http_persistent_handles_count());
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 No free handles!
 One free request handle within GLOBAL: int(1)
 Reusing request handle: bool(true)

diff --git a/tests/redirect_011.phpt b/tests/redirect_011.phpt
index fc3f3d24541a35f56cac2717965f3bfc17e27a5d..e30fed04d5ec554423202d1c6251fd76fe6146b8 100644 (file)
--- a/tests/redirect_011.phpt
+++ b/tests/redirect_011.phpt
@@ -4,7 +4,7 @@ http_redirect() with params
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_HOST=localhost
@@ -15,10 +15,10 @@ log_prepare(_REDIR_LOG);
 http_redirect('redirect', array('a' => 1, 'b' => 2));
 ?>
 --EXPECTF--
-Status: 302
-X-Powered-By: PHP/%s
+Status: 302%s
+X-Powered-By: PHP/%a
 Location: http://localhost/redirect?a=1&b=2
-Content-type: %s
+Content-type: %a
 
 Redirecting to <a href="http://localhost/redirect?a=1&b=2">http://localhost/redirect?a=1&b=2</a>.
 

diff --git a/tests/redirect_011_logging.phpt b/tests/redirect_011_logging.phpt
index 237c043e1c6fb6cfa50bc63ff2e1f57bf324beb5..22eada52da3f5dfeb2077b0ed950b0e44785841f 100644 (file)
--- a/tests/redirect_011_logging.phpt
+++ b/tests/redirect_011_logging.phpt
@@ -4,7 +4,7 @@ logging redirects
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_HOST=example.com
@@ -16,6 +16,6 @@ log_content(_REDIR_LOG);
 echo "Done";
 ?>
 --EXPECTF--
-%sTEST
-%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d      [302-REDIRECT]  Location: http%s        <%s>
+%aTEST
+%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d      [302-REDIRECT]  Location: http%a        <%a>
 Done

diff --git a/tests/redirect_012.phpt b/tests/redirect_012.phpt
index 1d48ae58ed56cd91063877abdd9503517f69cfcd..620b679cafb0daed63dcbe8101c4263def2216e2 100644 (file)
--- a/tests/redirect_012.phpt
+++ b/tests/redirect_012.phpt
@@ -4,7 +4,7 @@ http_redirect() with session
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 checkext('session');
 ?>
 --ENV--
@@ -17,11 +17,11 @@ session_start();
 http_redirect('redirect', array('a' => 1), true);
 ?>
 --EXPECTF--
-Status: 302
-X-Powered-By: PHP/%s
-Set-Cookie: PHPSESSID=%s; path=/
-Expires: %s
-Cache-Control: %s
-Pragma: %s
-Location: http://localhost/redirect?a=1&PHPSESSID=%s
-Content-type: %s
+Status: 302%s
+X-Powered-By: PHP/%a
+Set-Cookie: PHPSESSID=%a; path=/
+Expires: %a
+Cache-Control: %a
+Pragma: %a
+Location: http://localhost/redirect?a=1&PHPSESSID=%a
+Content-type: %a

diff --git a/tests/redirect_012_logging.phpt b/tests/redirect_012_logging.phpt
index 237c043e1c6fb6cfa50bc63ff2e1f57bf324beb5..22eada52da3f5dfeb2077b0ed950b0e44785841f 100644 (file)
--- a/tests/redirect_012_logging.phpt
+++ b/tests/redirect_012_logging.phpt
@@ -4,7 +4,7 @@ logging redirects
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_HOST=example.com
@@ -16,6 +16,6 @@ log_content(_REDIR_LOG);
 echo "Done";
 ?>
 --EXPECTF--
-%sTEST
-%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d      [302-REDIRECT]  Location: http%s        <%s>
+%aTEST
+%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d      [302-REDIRECT]  Location: http%a        <%a>
 Done

diff --git a/tests/redirect_013.phpt b/tests/redirect_013.phpt
index 8ef8a6b76fdb2c786adbb9dd1ba1a2dbdf8a47cb..f8bec1772ab2d87d8197b4a078362ae0201853d4 100644 (file)
--- a/tests/redirect_013.phpt
+++ b/tests/redirect_013.phpt
@@ -4,7 +4,7 @@ http_redirect() permanent
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_HOST=localhost
@@ -15,10 +15,10 @@ log_prepare(_REDIR_LOG);
 http_redirect('redirect', null, false, HTTP_REDIRECT_PERM);
 ?>
 --EXPECTF--
-Status: 301
-X-Powered-By: PHP/%s
+Status: 301%s
+X-Powered-By: PHP/%a
 Location: http://localhost/redirect
-Content-type: %s
+Content-type: %a
 
 Redirecting to <a href="http://localhost/redirect">http://localhost/redirect</a>.
 

diff --git a/tests/redirect_013_logging.phpt b/tests/redirect_013_logging.phpt
index 0a98118d4b9f0adbba9e0e36049e9a0e46afd7d4..c8f77ac01931690799e9ceaf4eeb150273ec4a93 100644 (file)
--- a/tests/redirect_013_logging.phpt
+++ b/tests/redirect_013_logging.phpt
@@ -4,7 +4,7 @@ logging redirects
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_HOST=example.com
@@ -16,6 +16,6 @@ log_content(_REDIR_LOG);
 echo "Done";
 ?>
 --EXPECTF--
-%sTEST
-%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d      [301-REDIRECT]  Location: http%s        <%s>
+%aTEST
+%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d      [301-REDIRECT]  Location: http%a        <%a>
 Done

diff --git a/tests/request_cookies.phpt b/tests/request_cookies.phpt
index 8488b9d6c5a94d26840b464eeb131913ed014570..f83f46a0704f46af1b0f3efca86c5b948d070f91 100644 (file)
--- a/tests/request_cookies.phpt
+++ b/tests/request_cookies.phpt
@@ -22,14 +22,14 @@ echo $r->getHistory()->toString(true);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 GET /ext-http/.print_request.php HTTP/1.1
-User-Agent: %s
+User-Agent: %a
 Host: dev.iworks.at
 Accept: */*
 Cookie: name=val%3Due
 HTTP/1.1 200 OK
-%s
+%a
 
 Array
 (
@@ -37,12 +37,12 @@ Array
 )
 
 GET /ext-http/.print_request.php HTTP/1.1
-User-Agent: %s
+User-Agent: %a
 Host: dev.iworks.at
 Accept: */*
 Cookie: name=val=ue;
 HTTP/1.1 200 OK
-%s
+%a
 
 Array
 (

diff --git a/tests/request_etag.phpt b/tests/request_etag.phpt
index 69b26d2d0106f4dfb9121b4e2aa7ce55bf92de3f..9201b4bbd61388a1f6233c96d32683b02635c80c 100644 (file)
--- a/tests/request_etag.phpt
+++ b/tests/request_etag.phpt
@@ -12,10 +12,10 @@ var_dump(http_get("http://dev.iworks.at/ext-http/etag", array("etag" => '"26ad3a
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 string(%d) "HTTP/1.1 304 Not Modified
-Date: %s
-Server: %s
+Date: %a
+Server: %a
 ETag: "26ad3a-5-95eb19c0"
 "
 Done
\ No newline at end of file

diff --git a/tests/request_gzip.phpt b/tests/request_gzip.phpt
index 7855a6f691f4f065f739024252cf254f58869798..81f9bc4e66a2f24cbc24f92b71eddb8fa5830eff 100644 (file)
--- a/tests/request_gzip.phpt
+++ b/tests/request_gzip.phpt
@@ -14,8 +14,8 @@ var_dump(http_parse_message(http_get('http://dev.iworks.at/ext-http/.print_reque
 
 echo "Done\n";
 --EXPECTF--
-%sTEST
-object(stdClass)%s {
+%aTEST
+object(stdClass)%a {
   ["type"]=>
   int(2)
   ["httpVersion"]=>
@@ -26,7 +26,7 @@ object(stdClass)%s {
   string(2) "OK"
   ["headers"]=>
   array(8) {
-    %s
+    %a
     ["Vary"]=>
     string(15) "Accept-Encoding"
     ["Content-Length"]=>

diff --git a/tests/request_methods.phpt b/tests/request_methods.phpt
index 2832c80a0ac5d957df51b72ecbb17aff004ce3ae..05f6b07c1b99e9777a9d2c573e5e051b8fc8e53f 100644 (file)
--- a/tests/request_methods.phpt
+++ b/tests/request_methods.phpt
@@ -28,7 +28,7 @@ for ($i = 0; $i < 5; ++$i) {
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 int(0)
 UNKNOWN
 int(0)

diff --git a/tests/request_put_data.phpt b/tests/request_put_data.phpt
index bd81a1e57ab7dbb42a195efebb26ba58151360e4..a2887fd20f07c9222577d052c43ad581c7d13847 100644 (file)
--- a/tests/request_put_data.phpt
+++ b/tests/request_put_data.phpt
@@ -17,6 +17,6 @@ var_dump($data === $mess->body);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 bool(true)
 Done

diff --git a/tests/send_data_001.phpt b/tests/send_data_001.phpt
index 21c8d5c6d1e4984177aa40ec12e387fe53d8e6c6..2aadc8e3a790026a8c29609735a4f8eb8ede7b8f 100644 (file)
--- a/tests/send_data_001.phpt
+++ b/tests/send_data_001.phpt
@@ -4,7 +4,7 @@ http_send_data() NIL-NUM range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=-5
@@ -14,7 +14,7 @@ http_send_content_type('text/plain');
 http_send_data(str_repeat('123abc', 1000));
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: PHP/%s
 Content-Type: text/plain
 Accept-Ranges: bytes

diff --git a/tests/send_data_002.phpt b/tests/send_data_002.phpt
index e178041bbba8ab262921e0350f4a023ff18dfa99..8b9dd690274cebeb295eb802b360a2e5a051f505 100644 (file)
--- a/tests/send_data_002.phpt
+++ b/tests/send_data_002.phpt
@@ -4,7 +4,7 @@ http_send_data() NUM-NUM range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=5-6
@@ -14,7 +14,7 @@ http_send_content_type('text/plain');
 http_send_data(str_repeat('123abc', 1000));
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: PHP/%s
 Content-Type: text/plain
 Accept-Ranges: bytes

diff --git a/tests/send_data_003.phpt b/tests/send_data_003.phpt
index 06bc26771202430a54db5b50444c692a43b573d5..1fd8561e32fd54d24cb75120477a378d23b8e14a 100644 (file)
--- a/tests/send_data_003.phpt
+++ b/tests/send_data_003.phpt
@@ -4,7 +4,7 @@ http_send_data() NUM-NIL range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=5981-
@@ -14,7 +14,7 @@ http_send_content_type('text/plain');
 http_send_data(str_repeat('123abc', 1000));
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: PHP/%s
 Content-Type: text/plain
 Accept-Ranges: bytes

diff --git a/tests/send_data_005.phpt b/tests/send_data_005.phpt
index 4359efbb16e0bf7ea4b02666a479e1d0a10aff5e..2e16105672ffed71d29be50eafbf0a3b87cf5138 100644 (file)
--- a/tests/send_data_005.phpt
+++ b/tests/send_data_005.phpt
@@ -4,7 +4,7 @@ http_send_data() oversized range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=5990-6000
@@ -14,5 +14,4 @@ http_send_content_type('text/plain');
 http_send_data(str_repeat('123abc', 1000));
 ?>
 --EXPECTF--
-Status: 416
-%s
+Status: 416%a
\ No newline at end of file

diff --git a/tests/send_data_006.phpt b/tests/send_data_006.phpt
index a8ab006ebbdbac2bb5650f8265a814b866b41e13..3112c46f905b3e15d9c4262c4fdde40ab0bab802 100644 (file)
--- a/tests/send_data_006.phpt
+++ b/tests/send_data_006.phpt
@@ -4,7 +4,7 @@ http_send_data() multiple ranges
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-3, 4-5,9-11
@@ -14,7 +14,7 @@ http_send_content_type('text/plain');
 http_send_data(str_repeat('123abc', 1000));
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: PHP/%s
 Accept-Ranges: bytes
 Content-Type: multipart/byteranges; boundary=%d.%d

diff --git a/tests/send_data_007.phpt b/tests/send_data_007.phpt
index a0736617a58b76db40456c0d88596c23cb35e66a..3aa94c1317e201304789e718b8334cd1adc461fb 100644 (file)
--- a/tests/send_data_007.phpt
+++ b/tests/send_data_007.phpt
@@ -4,7 +4,7 @@ http_send_data() NIL-NIL range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-0
@@ -14,7 +14,7 @@ http_send_content_type('text/plain');
 http_send_data("abc");
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: PHP/%s
 Content-Type: text/plain
 Accept-Ranges: bytes

diff --git a/tests/send_data_008.phpt b/tests/send_data_008.phpt
index a3f196232a6ff74aaeb66c6c6b260f5a5840432a..bf8abb77601ed666c2f1fd936fcc024eacbd5034 100644 (file)
--- a/tests/send_data_008.phpt
+++ b/tests/send_data_008.phpt
@@ -4,7 +4,7 @@ http_send_data() multiple ranges
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-0,-1
@@ -14,7 +14,7 @@ http_send_content_type('text/plain');
 http_send_data("01");
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: PHP/%s
 Accept-Ranges: bytes
 Content-Type: multipart/byteranges; boundary=%d.%d

diff --git a/tests/send_failed_precond_001.phpt b/tests/send_failed_precond_001.phpt
index dd394e7ac113e7319cb59cb1952f04ce341cff7d..c8dc1c862e52aebc24d698b3a0f2a0f2567717f7 100644 (file)
--- a/tests/send_failed_precond_001.phpt
+++ b/tests/send_failed_precond_001.phpt
@@ -15,7 +15,7 @@ http_cache_last_modified();
 http_send_file(__FILE__);
 ?>
 --EXPECTF--
-Status: 412
+Status: 412%s
 X-Powered-By: %s
 Cache-Control: private, must-revalidate, max-age=0
 Last-Modified: %s

diff --git a/tests/send_file_005.phpt b/tests/send_file_005.phpt
index 292df3c084178ac6e6f268124c7f3a5c484b36a1..7cecd6df9479516d654e75cf71528815e7567c31 100644 (file)
--- a/tests/send_file_005.phpt
+++ b/tests/send_file_005.phpt
@@ -4,7 +4,7 @@ http_send_file() multiple ranges
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-3, 4-5,9-11
@@ -14,7 +14,7 @@ http_send_content_type('text/plain');
 http_send_file('data.txt');
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: PHP/%s
 Accept-Ranges: bytes
 Content-Type: multipart/byteranges; boundary=%d.%d

diff --git a/tests/send_file_006.phpt b/tests/send_file_006.phpt
index 925473e6fa31fe1dab368dca103475f991d5e627..c3eceb01e6fd328ab543fb254326e57d82b9e5ca 100644 (file)
--- a/tests/send_file_006.phpt
+++ b/tests/send_file_006.phpt
@@ -4,7 +4,7 @@ http_send_file() first/last byte range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-0,-1
@@ -14,7 +14,7 @@ http_send_content_type("text/plain");
 http_send_file('data.txt');
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: PHP/%s
 Accept-Ranges: bytes
 Content-Type: multipart/byteranges; boundary=%d.%d

diff --git a/tests/send_file_007.phpt b/tests/send_file_007.phpt
index 47c4b24380f4410936d1b8b658eea449a29f1ab8..eb6452dc446e6230252ad7c0122bc0215c1be650 100644 (file)
--- a/tests/send_file_007.phpt
+++ b/tests/send_file_007.phpt
@@ -4,7 +4,7 @@ http_send_file() NIL-NIL range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-0
@@ -13,7 +13,7 @@ HTTP_RANGE=bytes=0-0
 http_send_file('data.txt');
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: PHP/%s
 Accept-Ranges: bytes
 Content-Range: bytes 0-0/1010

diff --git a/tests/send_file_009.phpt b/tests/send_file_009.phpt
index bc157a95165fc08711eae3cfcf3acfee91648e09..bf539014f7dd1e9371977fd34471f2184d550f18 100644 (file)
--- a/tests/send_file_009.phpt
+++ b/tests/send_file_009.phpt
@@ -4,7 +4,7 @@ http_send_file() NUM-NUM range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=5-9
@@ -13,7 +13,7 @@ HTTP_RANGE=bytes=5-9
 http_send_file('data.txt');
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: PHP/%s
 Accept-Ranges: bytes
 Content-Range: bytes 5-9/1010

diff --git a/tests/send_file_010.phpt b/tests/send_file_010.phpt
index 20b853acea965dc02401fab9a21728beba552a09..31935c53656851aaa53b42334845bd8f5cfc0736 100644 (file)
--- a/tests/send_file_010.phpt
+++ b/tests/send_file_010.phpt
@@ -4,7 +4,7 @@ http_send_file() NIL-NUM range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=-9
@@ -13,7 +13,7 @@ HTTP_RANGE=bytes=-9
 http_send_file('data.txt');
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: PHP/%s
 Accept-Ranges: bytes
 Content-Range: bytes 1001-1009/1010

diff --git a/tests/send_file_011.phpt b/tests/send_file_011.phpt
index df6ec6021ac6d066fbac685e9b9f308c1b8aa141..99b43888a8336bf194b19c9621e37b1bf31f06e0 100644 (file)
--- a/tests/send_file_011.phpt
+++ b/tests/send_file_011.phpt
@@ -4,7 +4,7 @@ http_send_file() NUM-NIL range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=1000- 
@@ -13,7 +13,7 @@ HTTP_RANGE=bytes=1000-
 http_send_file('data.txt');
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: PHP/%s
 Accept-Ranges: bytes
 Content-Range: bytes 1000-1009/1010

diff --git a/tests/send_file_013.phpt b/tests/send_file_013.phpt
index e97a09157c810a639eb5ff421d9701081eded4ed..4de94b4d5f10d03cf8269190fcdede19c06cd2e3 100644 (file)
--- a/tests/send_file_013.phpt
+++ b/tests/send_file_013.phpt
@@ -4,7 +4,7 @@ http_send_file() oversized range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.1);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=-1111
@@ -15,4 +15,5 @@ http_send_file('data.txt');
 --EXPECTF--
 Status: 416
 X-Powered-By: PHP/%s
+Accept-Ranges: bytes
 Content-type: %s

diff --git a/tests/send_ifrange_001.phpt b/tests/send_ifrange_001.phpt
index 8f85abf8669d9eb7cd71514a434aa90b165438f4..b4aae05da53a79682b48eaf9b593a08ddf6eb653 100644 (file)
--- a/tests/send_ifrange_001.phpt
+++ b/tests/send_ifrange_001.phpt
@@ -4,7 +4,7 @@ http_send() If-Range
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-1
@@ -15,7 +15,7 @@ http_cache_etag('abc');
 http_send_file(__FILE__);
 ?>
 --EXPECTF--
-Status: 206
+Status: 206%s
 X-Powered-By: %s
 Cache-Control: private, must-revalidate, max-age=0
 ETag: "abc"

diff --git a/tests/send_ifrange_003.phpt b/tests/send_ifrange_003.phpt
index e3ea8ea84be46fc72138d94c899814c27a8204c3..df97814af9b393024739acd2c532530c86834218 100644 (file)
--- a/tests/send_ifrange_003.phpt
+++ b/tests/send_ifrange_003.phpt
@@ -4,7 +4,7 @@ http_send() If-Range
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5);
+checkmin(5.3);
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-1
@@ -22,4 +22,4 @@ Accept-Ranges: bytes
 Content-Length: %d
 Content-type: text/html
 
-%s
+%a

diff --git a/tests/stream_filters_001.phpt b/tests/stream_filters_001.phpt
index 73fd5677cec933500e2b9327f4fd3e3f8bd33110..56e522837d1846296f365520ec82b3e56f5de9eb 100644 (file)
--- a/tests/stream_filters_001.phpt
+++ b/tests/stream_filters_001.phpt
@@ -3,7 +3,7 @@ stream filters
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 ?>
 --FILE--
 <?php
@@ -30,7 +30,7 @@ unlink(F);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 string(30) "5
 Here 
 2

diff --git a/tests/stream_filters_002.phpt b/tests/stream_filters_002.phpt
index ad44ca01fce5f25e4019af82045d53f406eb159c..5167e140c7645fa4673f1ff021bed1b9d0f0bed4 100644 (file)
--- a/tests/stream_filters_002.phpt
+++ b/tests/stream_filters_002.phpt
@@ -43,7 +43,7 @@ unlink($n);
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 bool(true)
 bool(true)
 bool(true)

diff --git a/tests/stream_filters_003.phpt b/tests/stream_filters_003.phpt
index 9e2e48f8f5d9c6bee49db47482c20e41a2cd1657..145ec1537735f42c7491e4b57d03e9d88363f966 100644 (file)
--- a/tests/stream_filters_003.phpt
+++ b/tests/stream_filters_003.phpt
@@ -3,7 +3,7 @@ stream filter fun
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5);
+checkmin(5.3);
 skipif(!http_support(HTTP_SUPPORT_ENCODINGS), "need zlib");
 ?>
 --FILE--
@@ -36,7 +36,7 @@ foreach (str_split($text, 5) as $part) {
 }
 ?>
 --EXPECTF--
-%sTEST
+%aTEST
 This is some stream filter fun; we'll see if it bails out or not.
 The text should come out at the other end of the stream exactly like written to it.
 Go figure!