From 1f6593c5096d41f146d87799f7ca3e3d4446247a Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Fri, 8 Feb 2008 10:28:09 +0000 Subject: [PATCH] 5.3->5.2.5 --- tests/HttpMessage_001.phpt | 2 +- tests/HttpMessage_002.phpt | 2 +- tests/HttpMessage_003.phpt | 20 ++++++++++---------- tests/HttpQueryString_001.phpt | 6 +++--- tests/HttpQueryString_002.phpt | 6 +++--- tests/HttpQueryString_003.phpt | 2 +- tests/HttpQueryString_004.phpt | 10 +++++----- tests/HttpRequestPool_001.phpt | 2 +- tests/HttpRequestPool_004.phpt | 2 +- tests/HttpRequestPool_005.phpt | 2 +- tests/HttpRequest_001.phpt | 2 +- tests/HttpRequest_002.phpt | 2 +- tests/HttpRequest_003.phpt | 2 +- tests/HttpRequest_006.phpt | 6 +++--- tests/HttpRequest_010.phpt | 2 +- tests/HttpResponse_001.phpt | 2 +- tests/HttpResponse_002.phpt | 2 +- tests/HttpResponse_003.phpt | 2 +- tests/HttpResponse_004.phpt | 2 +- tests/HttpResponse_005.phpt | 2 +- tests/allowed_methods_002.phpt | 2 +- tests/allowed_methods_002_logging.phpt | 2 +- tests/build_url_003.phpt | 2 +- tests/build_url_004.phpt | 2 +- tests/cloning_001.phpt | 2 +- tests/etag_mode_031.phpt | 2 +- tests/etag_mode_032.phpt | 2 +- tests/etag_mode_033.phpt | 2 +- tests/etag_mode_034.phpt | 2 +- tests/etag_mode_041.phpt | 2 +- tests/etag_mode_042.phpt | 2 +- tests/etag_mode_043.phpt | 2 +- tests/etag_mode_044.phpt | 2 +- tests/exceptions.phpt | 2 +- tests/match_request_header_001.phpt | 2 +- tests/negotiation_001.phpt | 2 +- tests/ob_deflatehandler_001.phpt | 2 +- tests/parse_cookie_002.phpt | 2 +- tests/persistent_handles_002.phpt | 2 +- tests/redirect_011.phpt | 2 +- tests/redirect_011_logging.phpt | 2 +- tests/redirect_012.phpt | 2 +- tests/redirect_012_logging.phpt | 2 +- tests/redirect_013.phpt | 2 +- tests/redirect_013_logging.phpt | 2 +- tests/send_data_001.phpt | 2 +- tests/send_data_002.phpt | 2 +- tests/send_data_003.phpt | 2 +- tests/send_data_005.phpt | 2 +- tests/send_data_006.phpt | 2 +- tests/send_data_007.phpt | 2 +- tests/send_data_008.phpt | 2 +- tests/send_file_005.phpt | 2 +- tests/send_file_006.phpt | 2 +- tests/send_file_007.phpt | 2 +- tests/send_file_009.phpt | 2 +- tests/send_file_010.phpt | 2 +- tests/send_file_011.phpt | 2 +- tests/send_file_013.phpt | 2 +- tests/send_ifrange_001.phpt | 2 +- tests/send_ifrange_003.phpt | 2 +- tests/skip.inc | 4 ++-- tests/stream_filters_001.phpt | 2 +- tests/stream_filters_003.phpt | 2 +- 64 files changed, 84 insertions(+), 84 deletions(-) diff --git a/tests/HttpMessage_001.phpt b/tests/HttpMessage_001.phpt index 8f711c1..ecdf228 100644 --- a/tests/HttpMessage_001.phpt +++ b/tests/HttpMessage_001.phpt @@ -3,7 +3,7 @@ HttpMessage --SKIPIF-- --FILE-- --FILE-- diff --git a/tests/HttpMessage_003.phpt b/tests/HttpMessage_003.phpt index e2f9f4f..f0afbb9 100644 --- a/tests/HttpMessage_003.phpt +++ b/tests/HttpMessage_003.phpt @@ -3,7 +3,7 @@ HttpMessage implements Serializable, Countable --SKIPIF-- --FILE-- + ["type%sprotected%s]=> int(2) - ["body":protected]=> + ["body%sprotected%s]=> string(0) "" - ["requestMethod":protected]=> + ["requestMethod%sprotected%s]=> string(0) "" - ["requestUrl":protected]=> + ["requestUrl%sprotected%s]=> string(0) "" - ["responseStatus":protected]=> + ["responseStatus%sprotected%s]=> string(2) "Ok" - ["responseCode":protected]=> + ["responseCode%sprotected%s]=> int(200) - ["httpVersion":protected]=> + ["httpVersion%sprotected%s]=> float(1.1) - ["headers":protected]=> + ["headers%sprotected%s]=> array(1) { ["Server"]=> string(9) "Funky/1.0" } - ["parentMessage":protected]=> + ["parentMessage%sprotected%s]=> NULL } int(1) diff --git a/tests/HttpQueryString_001.phpt b/tests/HttpQueryString_001.phpt index 413bb34..9958e1a 100644 --- a/tests/HttpQueryString_001.phpt +++ b/tests/HttpQueryString_001.phpt @@ -3,7 +3,7 @@ HttpQueryString global --SKIPIF-- --FILE-- + ["queryArray%sprivate%s]=> &array(3) { ["c"]=> string(3) "3.4" @@ -91,7 +91,7 @@ object(HttpQueryString)#1 (2) { string(1) "2" } } - ["queryString":"HttpQueryString":private]=> + ["queryString%sprivate%s]=> &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 d711f26..3eba39b 100644 --- a/tests/HttpQueryString_002.phpt +++ b/tests/HttpQueryString_002.phpt @@ -3,7 +3,7 @@ HttpQueryString local --SKIPIF-- --FILE-- + ["queryArray%sprivate%s]=> array(3) { ["c"]=> string(3) "3.4" @@ -87,7 +87,7 @@ object(HttpQueryString)#1 (2) { string(1) "2" } } - ["queryString":"HttpQueryString":private]=> + ["queryString%sprivate%s]=> 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 0287ce9..6342ad6 100644 --- a/tests/HttpQueryString_003.phpt +++ b/tests/HttpQueryString_003.phpt @@ -3,7 +3,7 @@ HttpQueryString xlate --SKIPIF-- --FILE-- diff --git a/tests/HttpQueryString_004.phpt b/tests/HttpQueryString_004.phpt index cb73ea6..c7db402 100644 --- a/tests/HttpQueryString_004.phpt +++ b/tests/HttpQueryString_004.phpt @@ -3,7 +3,7 @@ HttpQueryString w/ objects --SKIPIF-- --FILE-- + ["queryArray%sprivate%s]=> array(1) { ["bar"]=> array(1) { @@ -36,11 +36,11 @@ object(HttpQueryString)#3 (2) { int(1) } } - ["queryString":"HttpQueryString":private]=> + ["queryString%sprivate%s]=> string(14) "bar%5Bbaz%5D=1" } object(HttpQueryString)#4 (2) { - ["queryArray":"HttpQueryString":private]=> + ["queryArray%sprivate%s]=> array(1) { ["bar"]=> array(1) { @@ -48,7 +48,7 @@ object(HttpQueryString)#4 (2) { int(0) } } - ["queryString":"HttpQueryString":private]=> + ["queryString%sprivate%s]=> string(14) "bar%5Bbaz%5D=0" } Done diff --git a/tests/HttpRequestPool_001.phpt b/tests/HttpRequestPool_001.phpt index f94e92f..c0d9c94 100644 --- a/tests/HttpRequestPool_001.phpt +++ b/tests/HttpRequestPool_001.phpt @@ -3,7 +3,7 @@ HttpRequestPool --SKIPIF-- diff --git a/tests/HttpRequestPool_005.phpt b/tests/HttpRequestPool_005.phpt index ac16995..4770fe7 100644 --- a/tests/HttpRequestPool_005.phpt +++ b/tests/HttpRequestPool_005.phpt @@ -3,7 +3,7 @@ HttpRequestPool exception --SKIPIF-- --FILE-- diff --git a/tests/HttpRequest_001.phpt b/tests/HttpRequest_001.phpt index ddb0a43..5ef2d9d 100644 --- a/tests/HttpRequest_001.phpt +++ b/tests/HttpRequest_001.phpt @@ -3,7 +3,7 @@ HttpRequest options --SKIPIF-- --FILE-- diff --git a/tests/HttpRequest_002.phpt b/tests/HttpRequest_002.phpt index 6ad0ced..b00c649 100644 --- a/tests/HttpRequest_002.phpt +++ b/tests/HttpRequest_002.phpt @@ -3,7 +3,7 @@ HttpRequest GET/POST --SKIPIF-- diff --git a/tests/HttpRequest_006.phpt b/tests/HttpRequest_006.phpt index 114d0b0..44afcde 100644 --- a/tests/HttpRequest_006.phpt +++ b/tests/HttpRequest_006.phpt @@ -25,7 +25,7 @@ object(HttpMessage)#%d (%d) { ["type:protected"]=> int(2) ["body:protected"]=> - string(309) "string(294) " + string(309) "string(294) " testMethod @@ -66,7 +66,7 @@ object(HttpMessage)#%d (%d) { ["type:protected"]=> int(2) ["body:protected"]=> - string(309) "string(294) " + string(309) "string(294) " testMethod @@ -107,7 +107,7 @@ object(HttpMessage)#%d (%d) { ["type:protected"]=> int(2) ["body:protected"]=> - string(309) "string(294) " + string(309) "string(294) " testMethod diff --git a/tests/HttpRequest_010.phpt b/tests/HttpRequest_010.phpt index 292cc1f..ed3ca71 100644 --- a/tests/HttpRequest_010.phpt +++ b/tests/HttpRequest_010.phpt @@ -3,7 +3,7 @@ HttpRequest cookie API --SKIPIF-- --FILE-- diff --git a/tests/HttpResponse_001.phpt b/tests/HttpResponse_001.phpt index 8d2417d..58fcf21 100644 --- a/tests/HttpResponse_001.phpt +++ b/tests/HttpResponse_001.phpt @@ -3,7 +3,7 @@ HttpResponse - send data with caching headers --SKIPIF-- --FILE-- diff --git a/tests/HttpResponse_002.phpt b/tests/HttpResponse_002.phpt index 584f4a7..bbfa30f 100644 --- a/tests/HttpResponse_002.phpt +++ b/tests/HttpResponse_002.phpt @@ -3,7 +3,7 @@ HttpResponse - send gzipped file --SKIPIF-- diff --git a/tests/HttpResponse_003.phpt b/tests/HttpResponse_003.phpt index 8a45f47..e128865 100644 --- a/tests/HttpResponse_003.phpt +++ b/tests/HttpResponse_003.phpt @@ -3,7 +3,7 @@ HttpResponse - send gzipped file with caching headers --SKIPIF-- diff --git a/tests/HttpResponse_004.phpt b/tests/HttpResponse_004.phpt index d8d02f9..88b7884 100644 --- a/tests/HttpResponse_004.phpt +++ b/tests/HttpResponse_004.phpt @@ -4,7 +4,7 @@ HttpResponse - send cached gzipped data --ENV-- diff --git a/tests/HttpResponse_005.phpt b/tests/HttpResponse_005.phpt index afa768c..bda3aa6 100644 --- a/tests/HttpResponse_005.phpt +++ b/tests/HttpResponse_005.phpt @@ -4,7 +4,7 @@ HttpResponse file not found --FILE-- --FILE-- --ENV-- HTTP_HOST=example.com diff --git a/tests/build_url_003.phpt b/tests/build_url_003.phpt index 1e55290..1736ca6 100644 --- a/tests/build_url_003.phpt +++ b/tests/build_url_003.phpt @@ -3,7 +3,7 @@ http_build_url() --SKIPIF-- --ENV-- HTTP_HOST=www.example.com diff --git a/tests/build_url_004.phpt b/tests/build_url_004.phpt index f518f7b..1db54a8 100644 --- a/tests/build_url_004.phpt +++ b/tests/build_url_004.phpt @@ -19,4 +19,4 @@ http://www.example.com/foo/baz http://www.example.com/foo/baz http://mike@www.example.com/foo/baz http://www.example.com/?a%5B0%5D=1&a%5B1%5D=b&b=c -Done \ No newline at end of file +Done diff --git a/tests/cloning_001.phpt b/tests/cloning_001.phpt index 20c8fe6..9d26682 100644 --- a/tests/cloning_001.phpt +++ b/tests/cloning_001.phpt @@ -3,7 +3,7 @@ cloning --SKIPIF-- --FILE-- diff --git a/tests/etag_mode_031.phpt b/tests/etag_mode_031.phpt index 43a0c1a..5f72338 100644 --- 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) --FILE-- --FILE-- --FILE-- --FILE-- diff --git a/tests/etag_mode_041.phpt b/tests/etag_mode_041.phpt index e1f8a5f..0834ede 100644 --- 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) --FILE-- --FILE-- --FILE-- --FILE-- diff --git a/tests/exceptions.phpt b/tests/exceptions.phpt index c99461f..fdda3f3 100644 --- a/tests/exceptions.phpt +++ b/tests/exceptions.phpt @@ -3,7 +3,7 @@ exceptions --SKIPIF-- --FILE-- --ENV-- HTTP_FOO=bar diff --git a/tests/negotiation_001.phpt b/tests/negotiation_001.phpt index 9cf9936..3c2a6d0 100644 --- a/tests/negotiation_001.phpt +++ b/tests/negotiation_001.phpt @@ -3,7 +3,7 @@ negotiation --SKIPIF-- --ENV-- HTTP_ACCEPT=application/xml, application/xhtml+xml, text/html ; q = .8 diff --git a/tests/ob_deflatehandler_001.phpt b/tests/ob_deflatehandler_001.phpt index bd41dcd..bed6803 100644 --- a/tests/ob_deflatehandler_001.phpt +++ b/tests/ob_deflatehandler_001.phpt @@ -4,7 +4,7 @@ ob_deflatehandler --ENV-- diff --git a/tests/parse_cookie_002.phpt b/tests/parse_cookie_002.phpt index b417922..220f4e9 100644 --- a/tests/parse_cookie_002.phpt +++ b/tests/parse_cookie_002.phpt @@ -3,7 +3,7 @@ parse cookie --SKIPIF-- --FILE-- diff --git a/tests/redirect_011.phpt b/tests/redirect_011.phpt index e30fed0..70a0262 100644 --- a/tests/redirect_011.phpt +++ b/tests/redirect_011.phpt @@ -4,7 +4,7 @@ http_redirect() with params --ENV-- HTTP_HOST=localhost diff --git a/tests/redirect_011_logging.phpt b/tests/redirect_011_logging.phpt index 22eada5..2735172 100644 --- a/tests/redirect_011_logging.phpt +++ b/tests/redirect_011_logging.phpt @@ -4,7 +4,7 @@ logging redirects --ENV-- HTTP_HOST=example.com diff --git a/tests/redirect_012.phpt b/tests/redirect_012.phpt index 620b679..977b593 100644 --- a/tests/redirect_012.phpt +++ b/tests/redirect_012.phpt @@ -4,7 +4,7 @@ http_redirect() with session --ENV-- diff --git a/tests/redirect_012_logging.phpt b/tests/redirect_012_logging.phpt index 22eada5..2735172 100644 --- a/tests/redirect_012_logging.phpt +++ b/tests/redirect_012_logging.phpt @@ -4,7 +4,7 @@ logging redirects --ENV-- HTTP_HOST=example.com diff --git a/tests/redirect_013.phpt b/tests/redirect_013.phpt index f8bec17..fb14140 100644 --- a/tests/redirect_013.phpt +++ b/tests/redirect_013.phpt @@ -4,7 +4,7 @@ http_redirect() permanent --ENV-- HTTP_HOST=localhost diff --git a/tests/redirect_013_logging.phpt b/tests/redirect_013_logging.phpt index c8f77ac..b2623bf 100644 --- a/tests/redirect_013_logging.phpt +++ b/tests/redirect_013_logging.phpt @@ -4,7 +4,7 @@ logging redirects --ENV-- HTTP_HOST=example.com diff --git a/tests/send_data_001.phpt b/tests/send_data_001.phpt index 2aadc8e..d744d8d 100644 --- a/tests/send_data_001.phpt +++ b/tests/send_data_001.phpt @@ -4,7 +4,7 @@ http_send_data() NIL-NUM range --ENV-- HTTP_RANGE=bytes=-5 diff --git a/tests/send_data_002.phpt b/tests/send_data_002.phpt index 8b9dd69..1dc775b 100644 --- a/tests/send_data_002.phpt +++ b/tests/send_data_002.phpt @@ -4,7 +4,7 @@ http_send_data() NUM-NUM range --ENV-- HTTP_RANGE=bytes=5-6 diff --git a/tests/send_data_003.phpt b/tests/send_data_003.phpt index 1fd8561..f47c38d 100644 --- a/tests/send_data_003.phpt +++ b/tests/send_data_003.phpt @@ -4,7 +4,7 @@ http_send_data() NUM-NIL range --ENV-- HTTP_RANGE=bytes=5981- diff --git a/tests/send_data_005.phpt b/tests/send_data_005.phpt index 2e16105..c373b10 100644 --- a/tests/send_data_005.phpt +++ b/tests/send_data_005.phpt @@ -4,7 +4,7 @@ http_send_data() oversized range --ENV-- HTTP_RANGE=bytes=5990-6000 diff --git a/tests/send_data_006.phpt b/tests/send_data_006.phpt index 3112c46..418d4f0 100644 --- a/tests/send_data_006.phpt +++ b/tests/send_data_006.phpt @@ -4,7 +4,7 @@ http_send_data() multiple ranges --ENV-- HTTP_RANGE=bytes=0-3, 4-5,9-11 diff --git a/tests/send_data_007.phpt b/tests/send_data_007.phpt index 3aa94c1..e82fa83 100644 --- a/tests/send_data_007.phpt +++ b/tests/send_data_007.phpt @@ -4,7 +4,7 @@ http_send_data() NIL-NIL range --ENV-- HTTP_RANGE=bytes=0-0 diff --git a/tests/send_data_008.phpt b/tests/send_data_008.phpt index bf8abb7..3a69563 100644 --- a/tests/send_data_008.phpt +++ b/tests/send_data_008.phpt @@ -4,7 +4,7 @@ http_send_data() multiple ranges --ENV-- HTTP_RANGE=bytes=0-0,-1 diff --git a/tests/send_file_005.phpt b/tests/send_file_005.phpt index 7cecd6d..51f6b8f 100644 --- a/tests/send_file_005.phpt +++ b/tests/send_file_005.phpt @@ -4,7 +4,7 @@ http_send_file() multiple ranges --ENV-- HTTP_RANGE=bytes=0-3, 4-5,9-11 diff --git a/tests/send_file_006.phpt b/tests/send_file_006.phpt index c3eceb0..1b93319 100644 --- a/tests/send_file_006.phpt +++ b/tests/send_file_006.phpt @@ -4,7 +4,7 @@ http_send_file() first/last byte range --ENV-- HTTP_RANGE=bytes=0-0,-1 diff --git a/tests/send_file_007.phpt b/tests/send_file_007.phpt index eb6452d..09f1167 100644 --- a/tests/send_file_007.phpt +++ b/tests/send_file_007.phpt @@ -4,7 +4,7 @@ http_send_file() NIL-NIL range --ENV-- HTTP_RANGE=bytes=0-0 diff --git a/tests/send_file_009.phpt b/tests/send_file_009.phpt index bf53901..2d360b0 100644 --- a/tests/send_file_009.phpt +++ b/tests/send_file_009.phpt @@ -4,7 +4,7 @@ http_send_file() NUM-NUM range --ENV-- HTTP_RANGE=bytes=5-9 diff --git a/tests/send_file_010.phpt b/tests/send_file_010.phpt index 31935c5..d0f4318 100644 --- a/tests/send_file_010.phpt +++ b/tests/send_file_010.phpt @@ -4,7 +4,7 @@ http_send_file() NIL-NUM range --ENV-- HTTP_RANGE=bytes=-9 diff --git a/tests/send_file_011.phpt b/tests/send_file_011.phpt index 99b4388..8444a7d 100644 --- a/tests/send_file_011.phpt +++ b/tests/send_file_011.phpt @@ -4,7 +4,7 @@ http_send_file() NUM-NIL range --ENV-- HTTP_RANGE=bytes=1000- diff --git a/tests/send_file_013.phpt b/tests/send_file_013.phpt index 4de94b4..cd3f3cb 100644 --- a/tests/send_file_013.phpt +++ b/tests/send_file_013.phpt @@ -4,7 +4,7 @@ http_send_file() oversized range --ENV-- HTTP_RANGE=bytes=-1111 diff --git a/tests/send_ifrange_001.phpt b/tests/send_ifrange_001.phpt index b4aae05..40185ac 100644 --- a/tests/send_ifrange_001.phpt +++ b/tests/send_ifrange_001.phpt @@ -4,7 +4,7 @@ http_send() If-Range --ENV-- HTTP_RANGE=bytes=0-1 diff --git a/tests/send_ifrange_003.phpt b/tests/send_ifrange_003.phpt index df97814..226c72f 100644 --- a/tests/send_ifrange_003.phpt +++ b/tests/send_ifrange_003.phpt @@ -4,7 +4,7 @@ http_send() If-Range --ENV-- HTTP_RANGE=bytes=0-1 diff --git a/tests/skip.inc b/tests/skip.inc index 63ae05c..d8770fb 100644 --- a/tests/skip.inc +++ b/tests/skip.inc @@ -6,8 +6,8 @@ if (!function_exists('fprintf')) { function skipif($if, $skip) { if ($if) { fprintf(STDOUT, "skip $skip"); exit(); }} function checkcgi() { skipif(!strncasecmp('CLI', PHP_SAPI, 3), 'need CGI SAPI'); } function checkext($ext) { skipif(!extension_loaded($ext), "need ext/$ext"); } -function checkmin($ver) { skipif(round($ver,1) > round((double) PHP_VERSION,1), sprintf("need PHP >= v%0.1f",$ver)); } -function checkmax($ver) { skipif(round($ver,1) < round((double) PHP_VERSION,1), sprintf("need PHP <= v%0.1f",$ver)); } +function checkmin($ver) { skipif(version_compare(PHP_VERSION, $ver) < 0, sprintf("need PHP >= v%s",$ver)); } +function checkmax($ver) { skipif(version_compare(PHP_VERSION, $ver) > 0, sprintf("need PHP <= v%s",$ver)); } function checkurl($url) { skipif(!@fsockopen($url, 80), "$url not responsive"); } function checkcls($cls) { skipif(!class_exists($cls), "need class $cls"); } function checkver($ver) { checkmin($ver); } diff --git a/tests/stream_filters_001.phpt b/tests/stream_filters_001.phpt index 56e5228..7a3ec69 100644 --- a/tests/stream_filters_001.phpt +++ b/tests/stream_filters_001.phpt @@ -3,7 +3,7 @@ stream filters --SKIPIF-- --FILE-- --FILE-- -- 2.30.2