X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=parsers.c;h=ec7e9517e13613f52f9105b39a0cd70ee14a34d5;hp=fc43e01edf941fb6046dc7e57f19b31f6b5985b8;hb=a50deb2b0141bc830f07c572aab6415be9c5b2b4;hpb=d3d2e02dc0e7a919f89dcf8a640ab44578f46b2d

diff --git a/parsers.c b/parsers.c
index fc43e01e..ec7e9517 100644
--- a/parsers.c
+++ b/parsers.c
@@ -1,4 +1,4 @@
-const char parsers_rcs[] = "$Id: parsers.c,v 1.11 2001/05/29 20:11:19 joergs Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.21 2001/07/31 14:46:00 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/parsers.c,v $
@@ -41,8 +41,53 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.11 2001/05/29 20:11:19 joergs Exp
  *
  * Revisions   :
  *    $Log: parsers.c,v $
+ *    Revision 1.21  2001/07/31 14:46:00  oes
+ *     - Persistant connections now suppressed
+ *     - sed() no longer appends empty header to csp->headers
+ *
+ *    Revision 1.20  2001/07/30 22:08:36  jongfoster
+ *    Tidying up #defines:
+ *    - All feature #defines are now of the form FEATURE_xxx
+ *    - Permanently turned off WIN_GUI_EDIT
+ *    - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ *    Revision 1.19  2001/07/25 17:21:54  oes
+ *    client_uagent now saves copy of User-Agent: header value
+ *
+ *    Revision 1.18  2001/07/13 14:02:46  oes
+ *     - Included fix to repair broken HTTP requests that
+ *       don't contain a path, not even '/'.
+ *     - Removed all #ifdef PCRS
+ *     - content_type now always inspected and classified as
+ *       text, gif or other.
+ *     - formatting / comments
+ *
+ *    Revision 1.17  2001/06/29 21:45:41  oes
+ *    Indentation, CRLF->LF, Tab-> Space
+ *
+ *    Revision 1.16  2001/06/29 13:32:42  oes
+ *    - Fixed a comment
+ *    - Adapted free_http_request
+ *    - Removed logentry from cancelled commit
+ *
+ *    Revision 1.15  2001/06/03 19:12:38  oes
+ *    deleted const struct interceptors
+ *
+ *    Revision 1.14  2001/06/01 18:49:17  jongfoster
+ *    Replaced "list_share" with "list" - the tiny memory gain was not
+ *    worth the extra complexity.
+ *
+ *    Revision 1.13  2001/05/31 21:30:33  jongfoster
+ *    Removed list code - it's now in list.[ch]
+ *    Renamed "permission" to "action", and changed many features
+ *    to use the actions file rather than the global config.
+ *
+ *    Revision 1.12  2001/05/31 17:33:13  oes
+ *
+ *    CRLF -> LF
+ *
  *    Revision 1.11  2001/05/29 20:11:19  joergs
- *    '/* inside comment' warning removed.
+ *    '/ * inside comment' warning removed.
  *
  *    Revision 1.10  2001/05/29 09:50:24  jongfoster
  *    Unified blocklist/imagelist/permissionslist.
@@ -179,6 +224,7 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.11 2001/05/29 20:11:19 joergs Exp
 #endif
 
 #include "project.h"
+#include "list.h"
 #include "parsers.h"
 #include "encode.h"
 #include "filters.h"
@@ -189,6 +235,7 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.11 2001/05/29 20:11:19 joergs Exp
 #include "errlog.h"
 #include "jbsockets.h"
 #include "miscutil.h"
+#include "cgi.h"
 
 const char parsers_h_rcs[] = PARSERS_H_VERSION;
 
@@ -213,39 +260,28 @@ const struct parsers client_patterns[] = {
    { "from:",                    5,    client_from },
    { "cookie:",                  7,    client_send_cookie },
    { "x-forwarded-for:",         16,   client_x_forwarded },
-   { "proxy-connection:",        17,   crumble },
-#ifdef DENY_GZIP
+#ifdef FEATURE_DENY_GZIP
    { "Accept-Encoding: gzip",    21,   crumble },
-#endif /* def DENY_GZIP */
-#if defined(DETECT_MSIE_IMAGES)
+#endif /* def FEATURE_DENY_GZIP */
+#if defined(FEATURE_IMAGE_DETECT_MSIE)
    { "Accept:",                   7,   client_accept },
-#endif /* defined(DETECT_MSIE_IMAGES) */
-#ifdef FORCE_LOAD
+#endif /* defined(FEATURE_IMAGE_DETECT_MSIE) */
+#ifdef FEATURE_FORCE_LOAD
    { "Host:",                     5,   client_host },
-#endif /* def FORCE_LOAD */
+#endif /* def FEATURE_FORCE_LOAD */
 /* { "if-modified-since:",       18,   crumble }, */
+   { "Keep-Alive:",              11,   crumble },
+   { "connection:",              11,   crumble },
+   { "proxy-connection:",        17,   crumble },        
    { NULL,                       0,    NULL }
 };
 
-const struct interceptors intercept_patterns[] = {
-   { "show-proxy-args",    14, show_proxy_args },
-   { "ijb-send-banner",    14, ijb_send_banner },
-#ifdef TRUST_FILES
-   { "ij-untrusted-url",   15, ij_untrusted_url },
-#endif /* def TRUST_FILES */
-   { "show-url-info",      13, ijb_show_url_info },
-   { NULL, 0, NULL }
-};
 
 const struct parsers server_patterns[] = {
    { "set-cookie:",        11, server_set_cookie },
    { "connection:",        11, crumble },
-#if defined(PCRS) || defined(KILLPOPUPS)
    { "Content-Type:",      13, content_type },
-#endif /* defined(PCRS) || defined(KILLPOPUPS) */
-#ifdef PCRS
    { "Content-Length:",    15, content_length },
-#endif /* def PCRS */
    { NULL, 0, NULL }
 };
 
@@ -254,11 +290,13 @@ void (* const add_client_headers[])(struct client_state *) = {
    client_cookie_adder,
    client_x_forwarded_adder,
    client_xtra_adder,
+   connection_close_adder,   
    NULL
 };
 
 
 void (* const add_server_headers[])(struct client_state *) = {
+   connection_close_adder, 
    NULL
 };
 
@@ -419,125 +457,6 @@ char *get_header(struct client_state *csp)
 }
 
 
-/*********************************************************************
- *
- * Function    :  enlist
- *
- * Description :  Append a string into a specified string list.
- *
- * Parameters  :
- *          1  :  h = pointer to list 'dummy' header
- *          2  :  s = string to add to the list
- *
- * Returns     :  N/A
- *
- *********************************************************************/
-void enlist(struct list *h, const char *s)
-{
-   struct list *n = (struct list *)malloc(sizeof(*n));
-   struct list *l;
-
-   if (n)
-   {
-      n->str  = strdup(s);
-      n->next = NULL;
-
-      if ((l = h->last))
-      {
-         l->next = n;
-      }
-      else
-      {
-         h->next = n;
-      }
-
-      h->last = n;
-   }
-
-}
-
-
-/*********************************************************************
- *
- * Function    :  destroy_list
- *
- * Description :  Destroy a string list (opposite of enlist)
- *
- * Parameters  :
- *          1  :  h = pointer to list 'dummy' header
- *
- * Returns     :  N/A
- *
- *********************************************************************/
-void destroy_list(struct list *h)
-{
-   struct list *p, *n;
-
-   for (p = h->next; p ; p = n)
-   {
-      n = p->next;
-      freez(p->str);
-      freez(p);
-   }
-
-   memset(h, '\0', sizeof(*h));
-
-}
-
-
-/*********************************************************************
- *
- * Function    :  list_to_text
- *
- * Description :  "Flaten" a string list into 1 long \r\n delimited string.
- *
- * Parameters  :
- *          1  :  h = pointer to list 'dummy' header
- *
- * Returns     :  NULL on malloc error, else new long string.
- *
- *********************************************************************/
-static char *list_to_text(struct list *h)
-{
-   struct list *p;
-   char *ret = NULL;
-   char *s;
-   int size;
-
-   size = 0;
-
-   for (p = h->next; p ; p = p->next)
-   {
-      if (p->str)
-      {
-         size += strlen(p->str) + 2;
-      }
-   }
-
-   if ((ret = (char *)malloc(size + 1)) == NULL)
-   {
-      return(NULL);
-   }
-
-   ret[size] = '\0';
-
-   s = ret;
-
-   for (p = h->next; p ; p = p->next)
-   {
-      if (p->str)
-      {
-         strcpy(s, p->str);
-         s += strlen(s);
-         *s++ = '\r'; *s++ = '\n';
-      }
-   }
-
-   return(ret);
-
-}
-
-
 /*********************************************************************
  *
  * Function    :  sed
@@ -590,14 +509,6 @@ char *sed(const struct parsers pats[], void (* const more_headers[])(struct clie
       (*f)(csp);
    }
 
-   /* add the blank line at the end of the header, if necessary */
-   if ( (csp->headers->last == NULL)
-     || (csp->headers->last->str == NULL)
-     || (*csp->headers->last->str != '\0') )
-   {
-      enlist(csp->headers, "");
-   }
-
    hdr = list_to_text(csp->headers);
 
    return(hdr);
@@ -625,6 +536,8 @@ void free_http_request(struct http_request *http)
    freez(http->hostport);
    freez(http->path);
    freez(http->ver);
+   freez(http->host_ip_addr_str);
+   freez(http->user_agent);
 
 }
 
@@ -654,7 +567,6 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat
    http->cmd = strdup(req);
 
    buf = strdup(req);
-
    n = ssplit(buf, " \r\n", v, SZ(v), 1, 1);
 
    if (n == 3)
@@ -668,35 +580,19 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat
          http->ver      = strdup(v[2]);
       }
 
-#ifdef WEBDAV
-
-/* This next line is a little ugly, but it simplifies the if statement below. */
-/* Basically if using webDAV, we want the OR condition to use these too.      */
-
-/*
- * by haroon
- * These are the headers as defined in RFC2518 to add webDAV support
- */
-
-#define OR_WEBDAV || \
-         (0 == strcmpic(v[0], "propfind")) || \
-         (0 == strcmpic(v[0], "proppatch")) || \
-         (0 == strcmpic(v[0], "move")) || \
-         (0 == strcmpic(v[0], "copy")) || \
-         (0 == strcmpic(v[0], "mkcol")) || \
-         (0 == strcmpic(v[0], "lock")) || \
-         (0 == strcmpic(v[0], "unlock"))
-
-#else /* No webDAV support is enabled.  Provide an empty OR_WEBDAV macro. */
-
-#define OR_WEBDAV
-
-#endif
-
       /* or it could be a GET or a POST (possibly webDAV too) */
-      if ((strcmpic(v[0], "get")  == 0) ||
-          (strcmpic(v[0], "head") == 0) OR_WEBDAV ||
-          (strcmpic(v[0], "post") == 0))
+      if ((0 == strcmpic(v[0], "get"))
+       || (0 == strcmpic(v[0], "head"))
+       || (0 == strcmpic(v[0], "post"))
+       /* These are the headers as defined in RFC2518 to add webDAV support: */
+       || (0 == strcmpic(v[0], "propfind"))
+       || (0 == strcmpic(v[0], "proppatch"))
+       || (0 == strcmpic(v[0], "move"))
+       || (0 == strcmpic(v[0], "copy"))
+       || (0 == strcmpic(v[0], "mkcol"))
+       || (0 == strcmpic(v[0], "lock"))
+       || (0 == strcmpic(v[0], "unlock"))
+       )
       {
          http->ssl      = 0;
          http->gpc      = strdup(v[0]);
@@ -716,11 +612,29 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat
             url = NULL;
          }
 
-         if (url && (p = strchr(url, '/')))
+         if (url)
          {
-            http->path = strdup(p);
-            *p = '\0';
-            http->hostport = strdup(url);
+            if ((p = strchr(url, '/')))
+            {
+               http->path = strdup(p);
+               *p = '\0';
+               http->hostport = strdup(url);
+            }
+            /* 
+             * Repair broken HTTP requests that don't contain a path
+             */
+            else
+            {
+               /* Repair hostport & path */
+               http->path = strdup("/");
+               http->hostport = strdup(url);
+
+               /* Even repair cmd in case we're just forwarding. Boy are we nice ;-)  */
+               freez(http->cmd);
+               http->cmd = strsav(http->cmd, http->gpc);
+               http->cmd = strsav(http->cmd, " / ");
+               http->cmd = strsav(http->cmd, http->ver);
+            }
          }
       }
    }
@@ -802,8 +716,6 @@ char *crumble(const struct parsers *v, char *s, struct client_state *csp)
 }
 
 
-#if defined(PCRS) || defined(KILLPOPUPS)
-
 /*********************************************************************
  *
  * Function    :  content_type
@@ -820,24 +732,24 @@ char *crumble(const struct parsers *v, char *s, struct client_state *csp)
  *********************************************************************/
 char *content_type(const struct parsers *v, char *s, struct client_state *csp)
 {
-   if (strstr (s, " text/") || strstr (s, "application/x-javascript"))
-      csp->is_text = 1;
+   if (strstr(s, " text/") || strstr(s, "application/x-javascript"))
+      csp->content_type = CT_TEXT;
+   else if (strstr(s, " image/gif"))
+      csp->content_type = CT_GIF;
    else
-      csp->is_text = 0;
+      csp->content_type = 0;
 
    return(strdup(s));
 
 }
-#endif /* defined(PCRS) || defined(KILLPOPUPS) */
 
 
-#ifdef PCRS
 /*********************************************************************
  *
  * Function    :  content_length
  *
- * Description :  Crunch Content-Length header if & only if we are
- *                filtering this page through PCRS.
+ * Description :  Adjust Content-Length header if we modified
+ *                the body.
  *
  * Parameters  :
  *          1  :  v = ignored
@@ -850,19 +762,19 @@ char *content_type(const struct parsers *v, char *s, struct client_state *csp)
 char *content_length(const struct parsers *v, char *s, struct client_state *csp)
 {
    if (csp->content_length != 0) /* Content has been modified */
-	{
-	   s = (char *) zalloc(100);
-	   sprintf(s, "Content-Length: %d", csp->content_length);
-		log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", csp->content_length);
-	   return(s);
-	}
+   {
+      s = (char *) zalloc(100);
+      sprintf(s, "Content-Length: %d", csp->content_length);
+
+   	log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", csp->content_length);
+      return(s);
+   }
    else
    {
       return(strdup(s));
    }
-}
 
-#endif /* def PCRS */
+}
 
 
 /*********************************************************************
@@ -883,51 +795,47 @@ char *content_length(const struct parsers *v, char *s, struct client_state *csp)
  *********************************************************************/
 char *client_referrer(const struct parsers *v, char *s, struct client_state *csp)
 {
-#ifdef FORCE_LOAD
+   const char * newval;
+#ifdef FEATURE_FORCE_LOAD
    /* Since the referrer can include the prefix even
     * even if the request itself is non-forced, we must
     * clean it unconditionally 
     */
    strclean(s, FORCE_PREFIX);
-#endif /* def FORCE_LOAD */
+#endif /* def FEATURE_FORCE_LOAD */
 
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
    csp->referrer = strdup(s);
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
 
    /*
-    * Check permissionsfile.  If we have allowed this site to get the
-    * referer, then send it and we're done.
+    * Are we sending referer?
     */
-   if (csp->permissions & PERMIT_REFERER)
+   if ((csp->action->flags & ACTION_HIDE_REFERER) == 0)
    {
       return(strdup(s));
    }
 
+   newval = csp->action->string[ACTION_STRING_REFERER];
+
    /*
-    * Check configfile.  Are we blocking referer?
+    * Are we blocking referer?
     */
-   if ( (csp->config->referrer == NULL) 
-     || (*csp->config->referrer == '@') )
+   if ((newval == NULL) || (0 == strcmpic(newval, "block")) )
    {
       log_error(LOG_LEVEL_HEADER, "crunch!");
       return(NULL);
    }
 
    /*
-    * Check configfile.  Are we always sending referer?
-    */
-   if (*csp->config->referrer == '.')
-   {
-      return(strdup(s));
-   }
-
-   /*
-    * New option § or L: Forge a referer as http://[hostname:port of REQUEST]/
-    * to fool stupid checks for in-site links
+    * Are we forging referer?
     */
-   if (*csp->config->referrer == '§' || *csp->config->referrer == 'L')
+   if (0 == strcmpic(newval, "forge"))
    {
+      /*
+       * Forge a referer as http://[hostname:port of REQUEST]/
+       * to fool stupid checks for in-site links
+       */
       log_error(LOG_LEVEL_HEADER, "crunch+forge!");
       s = strsav(NULL, "Referer: ");
       s = strsav(s, "http://");
@@ -937,15 +845,36 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp
    }
 
    /*
-    * We have a specific (fixed) referer we want to send.
+    * Have we got a fixed referer?
     */
+   if (0 == strncmpic(newval, "http://", 7))
+   {
+      /*
+       * We have a specific (fixed) referer we want to send.
+       */
 
-   log_error(LOG_LEVEL_HEADER, "modified");
+      log_error(LOG_LEVEL_HEADER, "modified");
 
-   s = strsav( NULL, "Referer: " );
-   s = strsav( s, csp->config->referrer );
-   return(s);
+      s = strsav( NULL, "Referer: " );
+      s = strsav( s, newval );
+      return(s);
+   }
+
+   /* Should never get here! */
+   log_error(LOG_LEVEL_ERROR, "Bad parameter: +referer{%s}", newval);
 
+   /*
+    * Forge is probably the best default.
+    *
+    * Forge a referer as http://[hostname:port of REQUEST]/
+    * to fool stupid checks for in-site links
+    */
+   log_error(LOG_LEVEL_HEADER, "crunch+forge!");
+   s = strsav(NULL, "Referer: ");
+   s = strsav(s, "http://");
+   s = strsav(s, csp->http->hostport);
+   s = strsav(s, "/");
+   return(s);
 }
 
 
@@ -953,8 +882,9 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp
  *
  * Function    :  client_uagent
  *
- * Description :  Handle the "user-agent" config setting properly.
- *                Called from `sed'.
+ * Description :  Handle the "user-agent" config setting properly
+ *                and remember its original value to enable browser
+ *                bug workarounds. Called from `sed'.
  *
  * Parameters  :
  *          1  :  v = ignored
@@ -967,7 +897,15 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp
  *********************************************************************/
 char *client_uagent(const struct parsers *v, char *s, struct client_state *csp)
 {
-#ifdef DETECT_MSIE_IMAGES
+   const char * newval;
+
+   /* Save the client's User-Agent: value */
+   if (strlen(s) >= 12)
+   {
+      csp->http->user_agent = strdup(s + 12);
+   }
+
+#ifdef FEATURE_IMAGE_DETECT_MSIE
    if (strstr (s, "MSIE "))
    {
       /* This is Microsoft Internet Explorer.
@@ -975,36 +913,23 @@ char *client_uagent(const struct parsers *v, char *s, struct client_state *csp)
        */
       csp->accept_types |= ACCEPT_TYPE_IS_MSIE;
    }
-#endif /* def DETECT_MSIE_IMAGES */
+#endif /* def FEATURE_IMAGE_DETECT_MSIE */
 
-   if (csp->config->uagent == NULL)
-   {
-      log_error(LOG_LEVEL_HEADER, "default");
-      return(strdup(DEFAULT_USER_AGENT));
-   }
-
-   if (*csp->config->uagent == '.')
+   if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0)
    {
       return(strdup(s));
    }
 
-   if (*csp->config->uagent == '@')
+   newval = csp->action->string[ACTION_STRING_USER_AGENT];
+   if (newval == NULL)
    {
-      if (csp->permissions & PERMIT_USER_AGENT)
-      {
-         return(strdup(s));
-      }
-      else
-      {
-         log_error(LOG_LEVEL_HEADER, "default");
-         return(strdup(DEFAULT_USER_AGENT));
-      }
+      return(strdup(s));
    }
 
    log_error(LOG_LEVEL_HEADER, "modified");
 
    s = strsav( NULL, "User-Agent: " );
-   s = strsav( s, csp->config->uagent );
+   s = strsav( s, newval );
    return(s);
 
 }
@@ -1026,33 +951,15 @@ char *client_uagent(const struct parsers *v, char *s, struct client_state *csp)
  *********************************************************************/
 char *client_ua(const struct parsers *v, char *s, struct client_state *csp)
 {
-   if (csp->config->uagent == NULL)
-   {
-      log_error(LOG_LEVEL_HEADER, "crunch!");
-      return(NULL);
-   }
-
-   if (*csp->config->uagent == '.')
+   if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0)
    {
       return(strdup(s));
    }
-
-   if (*csp->config->uagent == '@')
+   else
    {
-      if (csp->permissions & PERMIT_USER_AGENT)
-      {
-         return(strdup(s));
-      }
-      else
-      {
-         log_error(LOG_LEVEL_HEADER, "crunch!");
-         return(NULL);
-      }
+      log_error(LOG_LEVEL_HEADER, "crunch!");
+      return(NULL);
    }
-
-   log_error(LOG_LEVEL_HEADER, "crunch!");
-   return(NULL);
-
 }
 
 
@@ -1074,22 +981,28 @@ char *client_ua(const struct parsers *v, char *s, struct client_state *csp)
  *********************************************************************/
 char *client_from(const struct parsers *v, char *s, struct client_state *csp)
 {
-   /* if not set, zap it */
-   if (csp->config->from == NULL)
+   const char * newval;
+
+   if ((csp->action->flags & ACTION_HIDE_FROM) == 0)
    {
-      log_error(LOG_LEVEL_HEADER, "crunch!");
-      return(NULL);
+      return(strdup(s));
    }
 
-   if (*csp->config->from == '.')
+   newval = csp->action->string[ACTION_STRING_FROM];
+
+   /*
+    * Are we blocking referer?
+    */
+   if ((newval == NULL) || (0 == strcmpic(newval, "block")) )
    {
-      return(strdup(s));
+      log_error(LOG_LEVEL_HEADER, "crunch!");
+      return(NULL);
    }
 
    log_error(LOG_LEVEL_HEADER, " modified");
 
    s = strsav( NULL, "From: " );
-   s = strsav( s, csp->config->from );
+   s = strsav( s, newval );
    return(s);
 
 }
@@ -1113,7 +1026,7 @@ char *client_from(const struct parsers *v, char *s, struct client_state *csp)
  *********************************************************************/
 char *client_send_cookie(const struct parsers *v, char *s, struct client_state *csp)
 {
-   if (csp->permissions & PERMIT_COOKIE_READ)
+   if ((csp->action->flags & ACTION_NO_COOKIE_READ) == 0)
    {
       enlist(csp->cookie_list, s + v->len + 1);
    }
@@ -1148,8 +1061,9 @@ char *client_send_cookie(const struct parsers *v, char *s, struct client_state *
  *********************************************************************/
 char *client_x_forwarded(const struct parsers *v, char *s, struct client_state *csp)
 {
-   if (csp->config->add_forwarded)
+   if ((csp->action->flags & ACTION_HIDE_FORWARDED) == 0)
    {
+      /* Save it so we can re-add it later */
       csp->x_forwarded = strdup(s);
    }
 
@@ -1162,7 +1076,7 @@ char *client_x_forwarded(const struct parsers *v, char *s, struct client_state *
 
 }
 
-#if defined(DETECT_MSIE_IMAGES)
+#if defined(FEATURE_IMAGE_DETECT_MSIE)
 /*********************************************************************
  *
  * Function    :  client_accept
@@ -1182,7 +1096,7 @@ char *client_x_forwarded(const struct parsers *v, char *s, struct client_state *
  *********************************************************************/
 char *client_accept(const struct parsers *v, char *s, struct client_state *csp)
 {
-#ifdef DETECT_MSIE_IMAGES
+#ifdef FEATURE_IMAGE_DETECT_MSIE
    if (strstr (s, "image/gif"))
    {
       /* Client will accept HTML.  If this seems counterintuitive,
@@ -1194,12 +1108,12 @@ char *client_accept(const struct parsers *v, char *s, struct client_state *csp)
    {
       csp->accept_types |= ACCEPT_TYPE_MSIE_IMAGE;
    }
-#endif /* def DETECT_MSIE_IMAGES */
+#endif /* def FEATURE_IMAGE_DETECT_MSIE */
 
    return(strdup(s));
 
 }
-#endif /* defined(DETECT_MSIE_IMAGES) */
+#endif /* defined(FEATURE_IMAGE_DETECT_MSIE) */
 
 
 
@@ -1220,27 +1134,27 @@ char *client_accept(const struct parsers *v, char *s, struct client_state *csp)
  *********************************************************************/
 void client_cookie_adder(struct client_state *csp)
 {
-   struct list *l;
+   struct list *lst;
    char *tmp = NULL;
    char *e;
 
-   for (l = csp->cookie_list->next; l ; l = l->next)
+   for (lst = csp->cookie_list->next; lst ; lst = lst->next)
    {
       if (tmp)
       {
          tmp = strsav(tmp, "; ");
       }
-      tmp = strsav(tmp, l->str);
+      tmp = strsav(tmp, lst->str);
    }
 
-   for (l = csp->config->wafer_list->next;  l ; l = l->next)
+   for (lst = csp->action->multi[ACTION_MULTI_WAFER]->next;  lst ; lst = lst->next)
    {
       if (tmp)
       {
          tmp = strsav(tmp, "; ");
       }
 
-      if ((e = cookie_encode(l->str)))
+      if ((e = cookie_encode(lst->str)))
       {
          tmp = strsav(tmp, e);
          freez(e);
@@ -1276,12 +1190,12 @@ void client_cookie_adder(struct client_state *csp)
  *********************************************************************/
 void client_xtra_adder(struct client_state *csp)
 {
-   struct list *l;
+   struct list *lst = csp->action->multi[ACTION_MULTI_ADD_HEADER];
 
-   for (l = csp->config->xtra_list->next; l ; l = l->next)
+   for (lst = lst->next; lst ; lst = lst->next)
    {
-      log_error(LOG_LEVEL_HEADER, "addh: %s", l->str);
-      enlist(csp->headers, l->str);
+      log_error(LOG_LEVEL_HEADER, "addh: %s", lst->str);
+      enlist(csp->headers, lst->str);
    }
 
 }
@@ -1303,7 +1217,7 @@ void client_x_forwarded_adder(struct client_state *csp)
 {
    char *p = NULL;
 
-   if (csp->config->add_forwarded == 0)
+   if ((csp->action->flags & ACTION_HIDE_FORWARDED) != 0)
    {
       return;
    }
@@ -1326,6 +1240,28 @@ void client_x_forwarded_adder(struct client_state *csp)
 }
 
 
+/*********************************************************************
+ *
+ * Function    :  connection_close_adder
+ *
+ * Description :  Adds a "Connection: close" header to csp->headers
+ *                as a temporary fix for the needed but missing HTTP/1.1
+ *                support. Called from `sed'.
+ *                FIXME: This whole function shouldn't be neccessary!
+ *
+ * Parameters  :
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void connection_close_adder(struct client_state *csp)
+{
+   enlist(csp->headers, strdup("Connection: close"));
+
+}
+
+
 /*********************************************************************
  *
  * Function    :  server_set_cookie
@@ -1344,14 +1280,14 @@ void client_x_forwarded_adder(struct client_state *csp)
  *********************************************************************/
 char *server_set_cookie(const struct parsers *v, char *s, struct client_state *csp)
 {
-#ifdef JAR_FILES
+#ifdef FEATURE_COOKIE_JAR
    if (csp->config->jar)
    {
       fprintf(csp->config->jar, "%s\t%s\n", csp->http->host, (s + v->len + 1));
    }
-#endif /* def JAR_FILES */
+#endif /* def FEATURE_COOKIE_JAR */
 
-   if (!(csp->permissions & PERMIT_COOKIE_SET))
+   if ((csp->action->flags & ACTION_NO_COOKIE_SET) != 0)
    {
       return(crumble(v, s, csp));
    }
@@ -1361,7 +1297,7 @@ char *server_set_cookie(const struct parsers *v, char *s, struct client_state *c
 }
 
 
-#ifdef FORCE_LOAD
+#ifdef FEATURE_FORCE_LOAD
 /*********************************************************************
  *
  * Function    :  client_host
@@ -1386,10 +1322,10 @@ char *client_host(const struct parsers *v, char *s, struct client_state *csp)
  
    return(cleanhost);
 }
-#endif /* def FORCE_LOAD */
+#endif /* def FEATURE_FORCE_LOAD */
  
  
-#ifdef FORCE_LOAD 
+#ifdef FEATURE_FORCE_LOAD 
 /*********************************************************************
  *
  * Function    :  strclean
@@ -1423,7 +1359,7 @@ int strclean(const char *string, const char *substring)
 
    return(hits);
 }
-#endif /* def FORCE_LOAD */
+#endif /* def FEATURE_FORCE_LOAD */
 
 
 /*