From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 14 Jun 2009 14:33:01 +0000 (+0000)
Subject: Fix a tokenize() regression that caused it to miss tokens with trailing comments.
X-Git-Tag: v_3_0_14~104
X-Git-Url: http://www.privoxy.org/gitweb/?a=commitdiff_plain;h=1d9dfeb44673d358f7de0d70a9e7a8b151727585;p=privoxy.git

Fix a tokenize() regression that caused it to miss tokens with trailing comments.

This it turn caused Privoxy-Regression-Test to always execute a test
that should only be executed if enable-edit-actions is enabled.

Looks like we need a Privoxy-Regression-Test-Regression-Test.
---

diff --git a/tools/privoxy-regression-test.pl b/tools/privoxy-regression-test.pl
index 955fc871..cdb2b093 100755
--- a/tools/privoxy-regression-test.pl
+++ b/tools/privoxy-regression-test.pl
@@ -7,7 +7,7 @@
 # A regression test "framework" for Privoxy. For documentation see:
 # perldoc privoxy-regression-test.pl
 #
-# $Id: privoxy-regression-test.pl,v 1.185 2009/06/10 16:36:42 fk Exp $
+# $Id: privoxy-regression-test.pl,v 1.186 2009/06/14 14:29:25 fk Exp $
 #
 # Wish list:
 #
@@ -225,7 +225,7 @@ sub tokenize ($) {
     s@&amp;@&@g;
 
     # Tokenize
-    if (/^\#\s*([^=:#]*?)\s*[=]\s*([^#]+)$/) {
+    if (/^\#\s*([^=:#]*?)\s*[=]\s*([^#]+)(?:#.*)?$/) {
 
         $token = $1;
         $value = $2;