From: oes <oes@users.sourceforge.net>
Date: Mon, 23 Jul 2001 13:26:12 +0000 (+0000)
Subject: Fixed bug in popup-killing for the first read that caused binary garbage to be sent... 
X-Git-Tag: v_2_9_9~215
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/static/gitweb.js?a=commitdiff_plain;h=083c2b953b12b96d3a320a0b55966cb746e4e090;p=privoxy.git

Fixed bug in popup-killing for the first read that caused binary garbage to be sent between headers and body
---

diff --git a/jcc.c b/jcc.c
index 9f3083da..9deb39d0 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.26 2001/07/18 12:31:36 oes Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.27 2001/07/19 19:09:47 haroon Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,17 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.26 2001/07/18 12:31:36 oes Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.27  2001/07/19 19:09:47  haroon
+ *    - Added code to take care of the situation where while processing the first
+ *      server response (which includes the server header), after finding the end
+ *      of the headers we were not looking past the end of the headers for
+ *      content modification. I enabled it for filter_popups.
+ *      Someone else should look to see if other similar operations should be
+ *      done to the discarded portion of the buffer.
+ *
+ *      Note 2001/07/20: No, the other content modification mechanisms will process
+ *                       the whole iob later anyway. --oes
+ *
  *    Revision 1.26  2001/07/18 12:31:36  oes
  *    cosmetics
  *
@@ -992,11 +1003,10 @@ static void chat(struct client_state *csp)
             {
                block_popups_now = 1;
                /*
-                    * even though the header has been found, don't forget about the
-                    * left over portion of the buffer which will usually contain body text
-                    */
-               n = strlen(csp->iob->cur);
-               filter_popups(csp->iob->cur, n);
+                * Filter the part of the body that came in the same read
+                * as the last headers:
+                */
+               filter_popups(csp->iob->cur, csp->iob->eod - csp->iob->cur);
             }
 
 #endif /* def KILLPOPUPS */