diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/Makefile.inc | 1 | ||||
| -rw-r--r-- | tests/data/test1136 | 60 | ||||
| -rwxr-xr-x | tests/runtests.pl | 18 |
3 files changed, 78 insertions, 1 deletions
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index d84b4e2a7..b053534e8 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -118,6 +118,7 @@ test1104 test1105 test1106 test1107 test1108 test1109 test1110 test1111 \ test1112 test1113 test1114 test1115 test1116 test1117 test1118 test1119 \ test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \ test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \ +test1136 \ \ test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \ diff --git a/tests/data/test1136 b/tests/data/test1136 new file mode 100644 index 000000000..16c48b2a3 --- /dev/null +++ b/tests/data/test1136 @@ -0,0 +1,60 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +HTTP proxy +cookies +cookiejar +PSL +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 4 +Content-Type: text/html +Funny-head: yesyes +Set-Cookie: test1=forbidden1; domain=example.ck; path=/; +Set-Cookie: test2=allowed2; domain=www.example.ck; path=/; +Set-Cookie: test3=forbidden3; domain=ck; path=/; +Set-Cookie: test4=allowed4; domain=www.ck; path=/; +Set-Cookie: test5=forbidden5; domain=z-1.compute-1.amazonaws.com; path=/; + +boo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +Check cookies against PSL +</name> +<setenv> +TZ=GMT +</setenv> +<command> +http://www.example.ck/1136 http://www.ck/1136 http://z-1.compute-1.amazonaws.com/1136 -b none -c log/jar1136.txt -x %HOSTIP:%HTTPPORT +</command> + +</client> + +# Verify data after the test has been "shot" +<verify> +<file name="log/jar1136.txt" mode="text"> +# Netscape HTTP Cookie File +# http://curl.haxx.se/docs/http-cookies.html +# This file was generated by libcurl! Edit at your own risk. + +.www.example.ck TRUE / FALSE 0 test2 allowed2 +.www.ck TRUE / FALSE 0 test4 allowed4 +</file> +</verify> +</testcase> diff --git a/tests/runtests.pl b/tests/runtests.pl index 77ec672d9..dc4b71cdf 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -224,6 +224,7 @@ my $has_http2; # set if libcurl is built with HTTP2 support my $has_crypto; # set if libcurl is built with cryptographic support my $has_cares; # set if built with c-ares my $has_threadedres;# set if built with threaded resolver +my $has_psl; # set if libcurl is built with PSL support # this version is decided by the particular nghttp2 library that is being used my $h2cver = "h2c"; @@ -2474,6 +2475,10 @@ sub checksystem { # Metalink enabled $has_metalink=1; } + if($feat =~ /PSL/i) { + # PSL enabled + $has_psl=1; + } if($feat =~ /AsynchDNS/i) { if(!$has_cares) { # this means threaded resolver @@ -2599,8 +2604,9 @@ sub checksystem { logmsg sprintf("* HTTP Unix %s\n", $http_unix?"ON ":"OFF"); logmsg sprintf("* FTP IPv6 %8s", $ftp_ipv6?"ON ":"OFF"); logmsg sprintf(" Libtool lib: %s\n", $libtool?"ON ":"OFF"); - logmsg sprintf("* Shared build: %-3s", $has_shared); + logmsg sprintf("* PSL: %8s", $has_psl?"ON ":"OFF"); logmsg sprintf(" Resolver: %s\n", $resolver); + if($ssl_version) { logmsg sprintf("* SSL library: %13s\n", $ssllib); } @@ -2981,6 +2987,11 @@ sub singletest { next; } } + elsif($1 eq "PSL") { + if($has_psl) { + next; + } + } elsif($1 eq "socks") { next; } @@ -3117,6 +3128,11 @@ sub singletest { next; } } + elsif($1 eq "PSL") { + if(!$has_psl) { + next; + } + } else { next; } |