Bump for-privoxy-version to 3.0.18 due to the recently added +fast-redirects{} tests

[privoxy.git] / regression-tests.action

diff --git a/regression-tests.action b/regression-tests.action
index 038c698..fe0f9df 100644 (file)
--- a/regression-tests.action
+++ b/regression-tests.action
@@ -1,5 +1,5 @@
 #############################################################################
-# $Id: regression-tests.action,v 1.30 2009/07/11 11:20:53 fabiankeil Exp $
+# $Id: regression-tests.action,v 1.38 2011/10/30 16:21:19 fabiankeil Exp $
 #############################################################################
 #
 # This is a configuration file for Privoxy-Regression-Test
@@ -10,7 +10,7 @@
 #
 #############################################################################
 #
-# Copyright (c) 2007-2009 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
@@ -26,8 +26,10 @@
 #
 #############################################################################
 
+# While the syntax used is understood by Privoxy 3.0.14 and later,
+# some of the +fast-redirects{} tests require at least 3.0.18 to work.
 {{settings}}
-for-privoxy-version=3.0.14
+for-privoxy-version=3.0.18
 
 # Some dependencies Privoxy-Regression-Test should know about:
 #
@@ -37,8 +39,11 @@ for-privoxy-version=3.0.14
 # 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
@@ -78,11 +83,11 @@ 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
@@ -102,7 +107,7 @@ TAG:^hide-accept-language\{block\}$
 {+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
@@ -122,17 +127,17 @@ TAG:^hide-referrer\{conditional-block\}$
 {+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\}$
@@ -428,6 +433,7 @@ TAG:^prevent-compression$
 # Set Header    = Request-Range: bytes=1234-5678
 # Expect Header = REMOVAL
 {\
+ -client-header-tagger{range-requests} \
  +deanimate-gifs{last} \
  -filter \
 }
@@ -440,6 +446,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} \
 }
@@ -452,6 +459,7 @@ TAG:^filter\{banners-by-size\}$
 # Set Header    = Request-Range: bytes=1234-5678
 # Expect Header = NO CHANGE
 {\
+ -client-header-tagger{range-requests} \
  -deanimate-gifs \
  -filter \
 }
@@ -555,9 +563,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
@@ -684,8 +695,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
 
@@ -744,10 +753,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
@@ -819,3 +838,28 @@ trailing-dot.example.org
 # Expect Header = X-LWS-Test: "This  is  quoted" this is not "this  is  " but " this again is not
 {}
 TAG:^LWS Tests$
+
+{+fast-redirects{check-decoded-url}}
+# Redirected URL = http://redirect.example.net/blafasel&url=http://redirected1.example.net/
+# Redirect Destination = http://redirected1.example.net/
+# Redirected URL = http://redirect.example.net/blafasel&url=http%3A%2F%2Fredirected2.example.net%2F&parameter=not-part-of-the-redirected-url
+# Redirect Destination = http://redirected2.example.net/
+# Redirected URL = http://redirect.example.net/blafasel&url=http%3A%2F%2Fredirected3.example.net%2F&parameter=not-part-of-the-redirected-url
+# Redirect Destination = http://redirected3.example.net/
+# Redirected URL = http://redirect.example.net/blafasel&url=http%3A%2F%2Fredirected4.example.net%2F%26parameter=part-of-the-redirected-url
+# Redirect Destination = http://redirected4.example.net/&parameter=part-of-the-redirected-url
+# Redirected URL = http://redirect.example.net/blafasel&url1=http%3A%2F%2Fredirected5.example.net%2F%26parameter1=part-of-the-redirected-url&url2=http%3A%2F%2Fredirected5.example.net%2F%26parameter2=part-of-the-redirected-url2
+# Redirect Destination = http://redirected5.example.net/&parameter2=part-of-the-redirected-url2
+# Redirected URL = http://redirect.example.net/blafasel&url1=http%3A%2F%2Fredirected6.example.net%2F%26parameter1=part-of-the-redirected-url&url2=http%3A%2F%2Fredirected6.example.net%2F%26parameter2=part-of-the-redirected-url2&parameter3=not-part-of-the-redirected-url2
+# Redirect Destination = http://redirected6.example.net/&parameter2=part-of-the-redirected-url2
+# Redirected URL = http://redirect.example.net/blafasel?x=http%3A%2F%2Fredirected7.example.net%2F%26parameter1=part-of-the-redirected-url1&parameter2=not-part-of-the-redirected-url1
+# Redirect Destination = http://redirected7.example.net/&parameter1=part-of-the-redirected-url1
+# Redirected URL = http://redirect.example.net/blafasel?x=http%3A%2F%2Fredirected8.example.net%2F%26parameter1=part-of-the-redirected-url1&parameter2=not-part-of-the-redirected-url1&parameter3=not-part-of-the-redirected-url1
+# Redirect Destination = http://redirected8.example.net/&parameter1=part-of-the-redirected-url1
+redirect.example.net/
+
+{+fast-redirects{simple-check}}
+# Redirected URL = http://redirect2.example.net/blafasel?x=http://redirected.example.net/&parameter1=part-of-the-redirected-url1&parameter2=part-of-the-redirected-url1
+# Redirect Destination = http://redirected.example.net/&parameter1=part-of-the-redirected-url1&parameter2=part-of-the-redirected-url1
+redirect2.example.net/
+