X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=parsers.c;h=bdf36cbc5d451d78ebd4560f8bb59d76172ef92a;hb=2dbee0b79404c35522b90e110445041a5822599d;hp=36a819f4a3cb4f3e800eb4e467efcdae7f16b4bb;hpb=8931748f574279927c586ce0096edf77eff94147;p=privoxy.git

diff --git a/parsers.c b/parsers.c
index 36a819f4..bdf36cbc 100644
--- a/parsers.c
+++ b/parsers.c
@@ -1,4 +1,4 @@
-const char parsers_rcs[] = "$Id: parsers.c,v 1.234 2011/10/08 17:31:51 fabiankeil Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.236 2011/10/23 11:23:55 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/parsers.c,v $
@@ -252,7 +252,6 @@ static const add_header_func_ptr add_client_headers[] = {
    client_host_adder,
    client_x_forwarded_for_adder,
    client_xtra_adder,
-   /* Temporarily disabled:    client_accept_encoding_adder, */
    client_connection_header_adder,
    NULL
 };
@@ -1853,10 +1852,6 @@ static jb_err client_connection(struct client_state *csp, char **header)
              /*
               * While we imply keep-alive to the server,
               * we have to remember that the client didn't.
-              *
-              * XXX: The implied keep-alive currently doesn't
-              *      actually work due to a not yet properly
-              *      analyzed regression in chat()
               */
              csp->flags &= ~CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE;
           }
@@ -3485,36 +3480,6 @@ static jb_err client_host_adder(struct client_state *csp)
 }
 
 
-#if 0
-/*********************************************************************
- *
- * Function    :  client_accept_encoding_adder
- *
- * Description :  Add an Accept-Encoding header to the client's request
- *                that disables compression if the action applies, and
- *                the header is not already there. Called from `sed'.
- *                Note: For HTTP/1.0, the absence of the header is enough.
- *
- * Parameters  :
- *          1  :  csp = Current client state (buffers, headers, etc...)
- *
- * Returns     :  JB_ERR_OK on success, or
- *                JB_ERR_MEMORY on out-of-memory error.
- *
- *********************************************************************/
-static jb_err client_accept_encoding_adder(struct client_state *csp)
-{
-   if (   ((csp->action->flags & ACTION_NO_COMPRESSION) != 0)
-       && (!strcmpic(csp->http->ver, "HTTP/1.1")) )
-   {
-      return enlist_unique(csp->headers, "Accept-Encoding: identity;q=1.0, *;q=0", 16);
-   }
-
-   return JB_ERR_OK;
-}
-#endif
-
-
 /*********************************************************************
  *
  * Function    :  client_xtra_adder