Introduced show-request cgi

[privoxy.git] / jcc.c

diff --git a/jcc.c b/jcc.c
index 0cfb75c..347f35f 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.34 2001/07/30 22:08:36 jongfoster Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.41 2001/09/16 17:05:14 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,27 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.34 2001/07/30 22:08:36 jongfoster Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.41  2001/09/16 17:05:14  jongfoster
+ *    Removing unused #include showarg.h
+ *
+ *    Revision 1.40  2001/09/16 15:41:45  jongfoster
+ *    Fixing signed/unsigned comparison warning.
+ *
+ *    Revision 1.39  2001/09/16 13:21:27  jongfoster
+ *    Changes to use new list functions.
+ *
+ *    Revision 1.38  2001/09/16 13:01:46  jongfoster
+ *    Removing redundant function call that zeroed zalloc()'d memory.
+ *
+ *    Revision 1.37  2001/09/10 11:12:24  oes
+ *    Deleted unused variable
+ *
+ *    Revision 1.36  2001/09/10 10:56:15  oes
+ *    Silenced compiler warnings
+ *
+ *    Revision 1.35  2001/07/31 14:44:22  oes
+ *    Deleted unused size parameter from filter_popups()
+ *
  *    Revision 1.34  2001/07/30 22:08:36  jongfoster
  *    Tidying up #defines:
  *    - All feature #defines are now of the form FEATURE_xxx
@@ -312,6 +333,10 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.34 2001/07/30 22:08:36 jongfoster Exp $";
 #  include <OS.h>      /* declarations for threads and stuff. */
 # endif
 
+# ifdef __EMX__
+#  include <sys/select.h>  /* OS/2/EMX needs a little help with select */
+# endif
+
 # ifndef FD_ZERO
 #  include <select.h>
 # endif
@@ -323,7 +348,6 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.34 2001/07/30 22:08:36 jongfoster Exp $";
 #include "jcc.h"
 #include "filters.h"
 #include "loaders.h"
-#include "showargs.h"
 #include "parsers.h"
 #include "killpopup.h"
 #include "miscutil.h"
@@ -418,7 +442,6 @@ static void chat(struct client_state *csp)
 
    char buf[BUFFER_SIZE];
    char *hdr, *p, *req;
-   char *err = NULL;
    fd_set rfds;
    int n, maxfd, server_body;
    int ms_iis5_hack = 0;
@@ -573,7 +596,7 @@ static void chat(struct client_state *csp)
     * vanilla wafer, then send the vanilla wafer.
     */
    if ((csp->config->jarfile != NULL)
-       && (csp->action->multi[ACTION_MULTI_WAFER]->next == NULL)
+       && list_is_empty(csp->action->multi[ACTION_MULTI_WAFER])
        && ((csp->action->flags & ACTION_VANILLA_WAFER) != 0))
    {
       enlist(csp->action->multi[ACTION_MULTI_WAFER], VANILLA_WAFER);
@@ -614,7 +637,7 @@ static void chat(struct client_state *csp)
    /* We have a request. */
 
    hdr = sed(client_patterns, add_client_headers, csp);
-   destroy_list(csp->headers);
+   list_remove_all(csp->headers);
 
    /* 
     * Now, check to see if we need to intercept it, i.e.
@@ -908,7 +931,7 @@ static void chat(struct client_state *csp)
                   n = strlen(hdr);
 
                   if ((write_socket(csp->cfd, hdr, n) != n)
-                      || (write_socket(csp->cfd, p != NULL ? p : csp->iob->cur, csp->content_length) != csp->content_length))
+                      || (write_socket(csp->cfd, p != NULL ? p : csp->iob->cur, csp->content_length) != (int)csp->content_length))
                   {
                      log_error(LOG_LEVEL_CONNECT, "write modified content to client failed: %E");
                      return;
@@ -1074,7 +1097,7 @@ static void chat(struct client_state *csp)
                return;
             }
 
-            !content_filter && (byte_count += n);
+            if(!content_filter) byte_count += n;
 
             /* we're finished with the server's header */
 
@@ -1307,8 +1330,6 @@ static void listen_loop(void)
          continue;
       }
 
-      memset(csp, '\0', sizeof(*csp));
-
       csp->active = 1;
       csp->sfd    = -1;