Typos

diff --git a/cgi.c b/cgi.c
index 08cadde..062b976 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-const char cgi_rcs[] = "$Id: cgi.c,v 1.61 2002/04/10 13:37:48 oes Exp $";
+const char cgi_rcs[] = "$Id: cgi.c,v 1.62 2002/04/10 19:59:46 jongfoster Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.c,v $


@@ -38,6 +38,11 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.61 2002/04/10 13:37:48 oes Exp $";
  *
  * Revisions   :
  *    $Log: cgi.c,v $
  *
  * Revisions   :
  *    $Log: cgi.c,v $

+ *    Revision 1.62  2002/04/10 19:59:46  jongfoster
+ *    Fixes to #include in templates:
+ *    - Didn't close main file if loading an included template fails.
+ *    - I'm paranoid and want to disallow "#include /etc/passwd".
+ *

  *    Revision 1.61  2002/04/10 13:37:48  oes
  *    Made templates modular: template_load now recursive with max depth 1
  *
  *    Revision 1.61  2002/04/10 13:37:48  oes
  *    Made templates modular: template_load now recursive with max depth 1
  *


@@ -555,7 +560,7 @@ static struct map *parse_cgi_parameters(char *argstring);
  * Function    :  dispatch_cgi
  *
  * Description :  Checks if a request URL has either the magical
  * Function    :  dispatch_cgi
  *
  * Description :  Checks if a request URL has either the magical

- *                hostname CGI_SITE_1_HOST (usully http://i.j.b/) or
+ *                hostname CGI_SITE_1_HOST (usually http://p.p/) or

  *                matches CGI_SITE_2_HOST CGI_SITE_2_PATH (usually
  *                http://ijbswa.sourceforge.net/config). If so, it passes
  *                the (rest of the) path onto dispatch_known_cgi, which
  *                matches CGI_SITE_2_HOST CGI_SITE_2_PATH (usually
  *                http://ijbswa.sourceforge.net/config). If so, it passes
  *                the (rest of the) path onto dispatch_known_cgi, which

diff --git a/config b/config
index abac7e7..ebe260f 100644 (file)
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #  Sample Configuration file for Privoxy
 
 #
 #  Sample Configuration file for Privoxy
 
 #

-# $Id: config,v 1.31 2002/03/24 12:58:57 swa Exp $
+# $Id: config,v 1.32 2002/04/02 20:11:35 oes Exp $

 #
 
 #  Table of Contents
 #
 
 #  Table of Contents


@@ -308,9 +308,9 @@ toggle 1
 #  require up to buffer-limit Kbytes *each*, unless you have set
 #  single-threaded below.
 #
 #  require up to buffer-limit Kbytes *each*, unless you have set
 #  single-threaded below.
 #

-#  Default: 4069, i.e. 4 MB
+#  Default: 4096, i.e. 4 MB

 #
 #

-buffer-limit 4069
+buffer-limit 4096

 
 
 #
 
 
 #

diff --git a/default.action b/default.action
index 7e0250b..70d3dcc 100644 (file)
--- a/default.action
+++ b/default.action
@@ -30,13 +30,13 @@ shop        = -filter -no-cookies-keep
 +filter{webbugs} \
 +filter{nimda} \
 +filter{banners-by-size} \
 +filter{webbugs} \
 +filter{nimda} \
 +filter{banners-by-size} \

-+no-compression \

 +hide-forwarded \
 +hide-from{block} \
 +hide-referer{forge} \
 -hide-user-agent \
 -image \
 +image-blocker{pattern} \
 +hide-forwarded \
 +hide-from{block} \
 +hide-referer{forge} \
 -hide-user-agent \
 -image \
 +image-blocker{pattern} \

++no-compression \

 +no-cookies-keep \
 -no-cookies-read \
 -no-cookies-set \
 +no-cookies-keep \
 -no-cookies-read \
 -no-cookies-set \

diff --git a/project.h b/project.h
index ca8ea3a..da8548e 100644 (file)
--- a/project.h
+++ b/project.h
@@ -1,6 +1,6 @@
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED

-#define PROJECT_H_VERSION "$Id: project.h,v 1.64 2002/04/03 22:28:03 gliptak Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.65 2002/04/04 00:36:36 gliptak Exp $"

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $


@@ -36,6 +36,9 @@
  *
  * Revisions   :
  *    $Log: project.h,v $
  *
  * Revisions   :
  *    $Log: project.h,v $

+ *    Revision 1.65  2002/04/04 00:36:36  gliptak
+ *    always use pcre for matching
+ *

  *    Revision 1.64  2002/04/03 22:28:03  gliptak
  *    Removed references to gnu_regex
  *
  *    Revision 1.64  2002/04/03 22:28:03  gliptak
  *    Removed references to gnu_regex
  *


@@ -993,7 +996,7 @@ struct configuration_spec
    int debug;
    int multi_threaded;
 
    int debug;
    int multi_threaded;
 

-   /* Features that can be enabled/disabled throuigh the config file */
+   /* Features that can be enabled/disabled through the config file */

    unsigned feature_flags;
 
    const char *logfile;
    unsigned feature_flags;
 
    const char *logfile;