X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=regression-tests.action;h=0e34aab16b78eb10a38d26ff21cd28a7e7de955b;hp=ee3a821ba6402d64e456ee19bad16e3f1d4cf796;hb=9f64327796090c2d4c10400df689ef0eedf78ab6;hpb=d48514c14861e7f176781c3245b1bc963821e65b

diff --git a/regression-tests.action b/regression-tests.action
index ee3a821b..0e34aab1 100644
--- a/regression-tests.action
+++ b/regression-tests.action
@@ -1,5 +1,5 @@
 #############################################################################
-# $Id: regression-tests.action,v 1.16 2008/09/19 15:31:38 fabiankeil Exp $
+# $Id: regression-tests.action,v 1.36 2011/07/30 15:22:39 fabiankeil Exp $
 #############################################################################
 #
 # This is a configuration file for Privoxy-Regression-Test
@@ -10,7 +10,7 @@
 #
 #############################################################################
 #
-# Copyright (c) 2007-2008 Fabian Keil <fk@fabiankeil.de>
+# Copyright (c) 2007-2011 Fabian Keil <fk@fabiankeil.de>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -27,12 +27,21 @@
 #############################################################################
 
 {{settings}}
-for-privoxy-version=3.0.9
+for-privoxy-version=3.0.14
 
 # Some dependencies Privoxy-Regression-Test should know about:
 #
-# Level 9 needs  = config line user-manual\s+(/|[A-Za-z]:)
+# Level  9 needs = config line user-manual\s+(\.?\.?/|[A-Za-z]:)
 # Level 12 needs = config line enable-edit-actions\s+1
+# Level 13 needs = feature status FEATURE_CONNECTION_KEEP_ALIVE Yes
+# Level 13 needs = config line keep-alive-timeout\s+[1-9]+
+# Level 14 needs = feature status FEATURE_CONNECTION_KEEP_ALIVE No
+# Level 15 needs = config line connection-sharing\s+0
+# Level 16 needs = feature status FEATURE_CONNECTION_KEEP_ALIVE Yes
+# Level 16 needs = config line connection-sharing\s+1
+# Level 17 needs = feature status FEATURE_PTHREAD Yes
+# Level 18 needs = feature status FEATURE_GRACEFUL_TERMINATION No
+# Level 19 needs = feature status FEATURE_GRACEFUL_TERMINATION Yes
 
 #######################################################
 # Enable taggers to activate the tests on demand
@@ -72,37 +81,61 @@ TAG:^hide-accept-language\{block\}$
 # 2) conditional-forge
 # 3) forge
 # 4) block
-# 5) a parameter that looks like a valid fake referrer 
+# 5) a parameter that looks like a valid fake referrer
 # 6) a parameter that looks like an invalid fake referrer
 #######################################################
 
-# Set Header    = Referer: http://www.example.org/foo 
+# Set Header    = Referer: http://www.example.org/foo
 # Expect Header = REMOVAL
 #
 # Set Header    = Referer: http://p.p/foo
 # Expect Header = NO CHANGE
+#
+# Set Header    = Referer: p.p/
+# Expect Header = REMOVAL
+#
+# Set Header    = Referer: p
+# Expect Header = REMOVAL
+#
+# Set Header    = Referer: http://
+# Expect Header = REMOVAL
+#
+# Set Header    = Referer: https://p.p/
+# Expect Header = REMOVAL
 {+hide-referrer{conditional-block}}
 TAG:^hide-referrer\{conditional-block\}$
 
-# Set Header    = Referer: http://www.example.org/foo 
+# Set Header    = Referer: http://www.example.org/foo
 # Expect Header = Referer: http://p.p/
 #
 # Set Header    = Referer: http://p.p/foo
 # Expect Header = NO CHANGE
+#
+# Set Header    = Referer: p.p/
+# Expect Header = Referer: http://p.p/
+#
+# Set Header    = Referer: p
+# Expect Header = Referer: http://p.p/
+#
+# Set Header    = Referer: http://
+# Expect Header = Referer: http://p.p/
+#
+# Set Header    = Referer: https://p.p/
+# Expect Header = Referer: http://p.p/
 {+hide-referrer{conditional-forge}}
 TAG:^hide-referrer\{conditional-forge\}$
 
-# Set Header    = Referer: http://www.example.org/foo 
+# Set Header    = Referer: http://www.example.org/foo
 # Expect Header = Referer: http://p.p/
 {+hide-referrer{forge}}
 TAG:^hide-referrer\{forge\}$
 
-# Set Header    = Referer: http://www.example.org/foo 
+# Set Header    = Referer: http://www.example.org/foo
 # Expect Header = REMOVAL
 {+hide-referrer{block}}
 TAG:^hide-referrer\{block\}$
 
-# Set Header    = Referer: http://www.example.org/foo 
+# Set Header    = Referer: http://www.example.org/foo
 # Expect Header = Referer: invalid
 {+hide-referrer{invalid}}
 TAG:^hide-referrer\{invalid\}$
@@ -224,6 +257,16 @@ TAG:^hide-if-modified-since\{block\}$
 # Expect Header = REMOVAL
 # Set Header    = If-Modified-Since: Thu, 04 Oct 2007 09:56:35 GMT
 # Expect Header = SOME CHANGE
+# Set Header    = If-Modified-Since: Thu, 1 Jan 1970 00:00:00 GMT
+# Expect Header = SOME CHANGE
+# Level = 17
+# Set Header    = If-Modified-Since: Thu, 1 Jan 123456789 00:00:00 GMT
+# Expect Header = REMOVAL
+# Set Header    = If-Modified-Since: Mon, 1 Jan 2525 00:00:00 GMT
+# Expect Header = SOME CHANGE
+# Level = 17
+# Set Header    = If-Modified-Since: Thu, 1 Jan 1970 02:00:00 GMT
+# Expect Header = SOME CHANGE
 
 {+hide-if-modified-since{-60} -crunch-if-none-match}
 TAG:^hide-if-modified-since\{-60\}$
@@ -232,6 +275,8 @@ TAG:^hide-if-modified-since\{-60\}$
 # Expect Header = REMOVAL
 # Set Header    = If-Modified-Since: Thu, 04 Oct 2007 09:56:35 GMT
 # Expect Header = SOME CHANGE
+# Set Header    = If-Modified-Since: Wed, 31 Dec 1969 23:59:59 GMT
+# Expect Header = SOME CHANGE
 
 {+hide-if-modified-since{+60} -crunch-if-none-match}
 TAG:^hide-if-modified-since\{\+60\}$
@@ -386,6 +431,7 @@ TAG:^prevent-compression$
 # Set Header    = Request-Range: bytes=1234-5678
 # Expect Header = REMOVAL
 {\
+ -client-header-tagger{range-requests} \
  +deanimate-gifs{last} \
  -filter \
 }
@@ -398,6 +444,7 @@ TAG:^deanimate-gifs\{last\}$
 # Set Header    = Request-Range: bytes=1234-5678
 # Expect Header = REMOVAL
 {\
+ -client-header-tagger{range-requests} \
  -deanimate-gifs \
  +filter{banners-by-size} \
 }
@@ -410,18 +457,45 @@ TAG:^filter\{banners-by-size\}$
 # Set Header    = Request-Range: bytes=1234-5678
 # Expect Header = NO CHANGE
 {\
+ -client-header-tagger{range-requests} \
  -deanimate-gifs \
  -filter \
 }
 TAG:^no-content-filter$
 
+# Set Header    = Connection: keep-alive
+# Expect Header = NO CHANGE
+# Level = 13
+# Set Header    = Connection:
+# Expect Header = REMOVAL
+# Level = 13
+{}
+TAG:^Connection: keep-alive$
+
 # Set Header    = Connection: keep-alive
 # Expect Header = Connection: close
+# Level = 14
 # Set Header    = Connection:
 # Expect Header = Connection: close
+# Level = 14
 {}
 TAG:^Connection: close$
 
+# Set Header    = Connection: close
+# Expect Header = NO CHANGE
+# Level = 15
+{}
+TAG:^connection-sharing disabled$
+
+# Set Header    = Connection: close
+# Expect Header = REMOVAL
+# Level = 16
+# Set Header    = Connection: keep-alive
+# Expect Header = NO CHANGE
+# Level = 16
+{}
+TAG:^connection-sharing enabled$
+
 # XXX: Removing a header by not specifying a value is
 # an inherited curl feature and could be viewed as a
 # bug as far as Privoxy-Regression-Test is concerned.
@@ -436,9 +510,15 @@ TAG:^No Host header$
 {}
 TAG:^Host header other than the target host$
 
-# XXX: check the RFC to use a real value
-# Set Header = Keep-Alive: Yes
+# Set Header = Keep-Alive: 20
+# Expect Header = NO CHANGE
+# Level = 13
+{}
+TAG:^Pass Keep-Alive header$
+
+# Set Header = Keep-Alive: 20
 # Expect Header = REMOVAL
+# Level = 14
 {}
 TAG:^Keep-Alive header removal$
 
@@ -481,9 +561,12 @@ TAG:^Max-Forwards header without TRACE method$
 ################################################################
 
 # Fetch Test = http://p.p/
-# Will fail if compiled with FEATURE_GRACEFUL_TERMINATION
 # Fetch Test = http://p.p/die
 # Expect Status Code = 404
+# Level = 18
+# Fetch Test = http://p.p/die
+# Expect Status Code = 200
+# Level = 19
 # Fetch Test = http://p.p/show-status
 # Fetch Test = http://config.privoxy.org/show-status?file=actions&index=0
 # Fetch Test = http://config.privoxy.org/show-status?file=filter&index=0
@@ -610,8 +693,6 @@ TAG:^Max-Forwards header without TRACE method$
 # Level = 9
 # Fetch Test = http://p.p/user-manual/templates.html
 # Level = 9
-# Fetch Test = http://p.p/user-manual/upgradersnote.html
-# Level = 9
 # Fetch Test = http://p.p/user-manual/whatsnew.html
 # Level = 9
 
@@ -670,10 +751,20 @@ p.p:3,22,79-81/
 {+forward-override{forward-socks5 127.0.0.1:12345 .}}
 oh-dear-this-hostname-is-so-very-long-that-it-can-not-possibly-be-forwarded-through-socks5-as-a-result-we-therefore-expect-privoxy-to-return-an-error-response-instead-of-forwarding-the-request-because-as-already-mentioned-this-host-is-really-very-long.example/
 
-# Fetch Test = http://oh-dear-this-hostname-is-short-enough-but-there-is-no-socks-server-listening.example
+# Fetch Test = http://oh-dear-this-hostname-is-short-enough-but-there-is-no-socks5-server-listening.example
 # Expect Status Code = 503
 {+forward-override{forward-socks5 127.0.0.1:12345 .}}
-oh-dear-this-hostname-is-short-enough-but-there-is-no-socks-server-listening.example
+oh-dear-this-hostname-is-short-enough-but-there-is-no-socks5-server-listening.example
+
+# Fetch Test = http://oh-dear-this-hostname-is-short-enough-but-there-is-no-socks4-server-listening.example
+# Expect Status Code = 503
+{+forward-override{forward-socks4 127.0.0.1:12345 .}}
+oh-dear-this-hostname-is-short-enough-but-there-is-no-socks4-server-listening.example
+
+# Fetch Test = http://oh-dear-this-hostname-is-short-enough-but-there-is-no-socks4a-server-listening.example
+# Expect Status Code = 503
+{+forward-override{forward-socks4a 127.0.0.1:12345 .}}
+oh-dear-this-hostname-is-short-enough-but-there-is-no-socks4a-server-listening.example
 
 # This one currently triggers the same error condition as the
 # test above (socks5 server unreachable), but once Privoxy
@@ -712,6 +803,11 @@ www.blocked-request.example/blocked-request-with-no-reason-specified
 # Blocked URL = http://domain-pattern-test.example.org/
 domain-pattern-test.example.
 
+{+block{Hostname patterns without trailing dots cover hostnames with trailing dots as well.}}
+# Blocked URL = http://trailing-dot.example.org./
+# Blocked URL = http://trailing-dot.example.org./foo
+trailing-dot.example.org
+
 # Just in case there is no white-space fuzzer in the house ...
 #
 # Set Header = X-LWS-Test: no superfluous white space here