X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=regression-tests.action;h=cb4184df4f62d590698a67ba0ae5c7f8c7f2d4ee;hp=1d8c262e16a5f71eb9b03f61628e13522741a86e;hb=f6e91fbff37352f79e883b50b4e036035eaf4600;hpb=e1a868421268987b89ea5b0070745984b063e082

diff --git a/regression-tests.action b/regression-tests.action
index 1d8c262e..cb4184df 100644
--- a/regression-tests.action
+++ b/regression-tests.action
@@ -1,5 +1,5 @@
 #############################################################################
-# $Id: regression-tests.action,v 1.31 2009/07/11 16:30:39 fabiankeil Exp $
+# $Id: regression-tests.action,v 1.35 2011/06/23 14:03:38 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
@@ -40,6 +40,8 @@ for-privoxy-version=3.0.14
 # 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
@@ -429,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 \
 }
@@ -441,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} \
 }
@@ -453,6 +457,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 \
 }
@@ -556,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
@@ -685,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
 
@@ -745,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