X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=e0813497db93796eea4334f38af89caedbbf0a5a;hp=9deb39d028a7044143035615415e8841e0b6878d;hb=9a52f71d5b56fef388e573ea512a55c713f91dc9;hpb=083c2b953b12b96d3a320a0b55966cb746e4e090

diff --git a/jcc.c b/jcc.c
index 9deb39d0..e0813497 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.27 2001/07/19 19:09:47 haroon Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.36 2001/09/10 10:56:15 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,38 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.27 2001/07/19 19:09:47 haroon Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    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
+ *    - Permanently turned off WIN_GUI_EDIT
+ *    - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ *    Revision 1.33  2001/07/29 19:32:00  jongfoster
+ *    Renaming _main() [mingw32 only] to real_main(), for ANSI compliance.
+ *
+ *    Revision 1.32  2001/07/29 18:47:05  jongfoster
+ *    Adding missing #include "loadcfg.h"
+ *
+ *    Revision 1.31  2001/07/29 12:17:48  oes
+ *    Applied pthread fix by Paul Lieverse
+ *
+ *    Revision 1.30  2001/07/25 22:57:13  jongfoster
+ *    __BEOS__ no longer overrides FEATURE_PTHREAD.
+ *    This is because FEATURE_PTHREAD will soon be widely used, so I
+ *    want to keep it simple.
+ *
+ *    Revision 1.29  2001/07/24 12:47:06  oes
+ *    Applied BeOS support update by Eugenia
+ *
+ *    Revision 1.28  2001/07/23 13:26:12  oes
+ *    Fixed bug in popup-killing for the first read that caused binary garbage to be sent between headers and body
+ *
  *    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
@@ -306,6 +338,7 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.27 2001/07/19 19:09:47 haroon Exp $";
 #include "gateway.h"
 #include "actions.h"
 #include "cgi.h"
+#include "loadcfg.h"
 
 const char jcc_h_rcs[] = JCC_H_VERSION;
 const char project_h_rcs[] = PROJECT_H_VERSION;
@@ -313,10 +346,10 @@ const char project_h_rcs[] = PROJECT_H_VERSION;
 struct client_state  clients[1];
 struct file_list     files[1];
 
-#ifdef STATISTICS
+#ifdef FEATURE_STATISTICS
 int urls_read     = 0;     /* total nr of urls read inc rejected */
 int urls_rejected = 0;     /* total nr of urls rejected */
-#endif /* def STATISTICS */
+#endif /* def FEATURE_STATISTICS */
 
 
 static void listen_loop(void);
@@ -371,36 +404,36 @@ static const char VANILLA_WAFER[] =
 static void chat(struct client_state *csp)
 {
 /*
- * This next lines are a little ugly, but they simplifies the if statements below.
- * Basically if TOGGLE, then we want the if to test "csp->toggled_on", else we don't
- * And if FORCE_LOAD, then we want the if to test "csp->toggled_on", else we don't
+ * This next lines are a little ugly, but they simplifies the if statements
+ * below.  Basically if TOGGLE, then we want the if to test "csp->toggled_on",
+ * else we don't.  And if FEATURE_FORCE_LOAD, then we want the if to test
+ * "csp->toggled_on", else we don't
  */
-#ifdef TOGGLE
+#ifdef FEATURE_TOGGLE
 #   define IS_TOGGLED_ON_AND (csp->toggled_on) &&
-#else /* ifndef TOGGLE */
+#else /* ifndef FEATURE_TOGGLE */
 #   define IS_TOGGLED_ON_AND
-#endif /* ndef TOGGLE */
-#ifdef FORCE_LOAD
+#endif /* ndef FEATURE_TOGGLE */
+#ifdef FEATURE_FORCE_LOAD
 #   define IS_NOT_FORCED_AND (!csp->force) && 
-#else /* ifndef FORCE_LOAD */
+#else /* ifndef FEATURE_FORCE_LOAD */
 #   define IS_NOT_FORCED_AND
-#endif /* def FORCE_LOAD */
+#endif /* def FEATURE_FORCE_LOAD */
 
 #define IS_ENABLED_AND   IS_TOGGLED_ON_AND IS_NOT_FORCED_AND
 
    char buf[BUFFER_SIZE];
    char *hdr, *p, *req;
-   char *err = NULL;
    fd_set rfds;
    int n, maxfd, server_body;
    int ms_iis5_hack = 0;
    int byte_count = 0;
    const struct forward_spec * fwd;
    struct http_request *http;
-#ifdef KILLPOPUPS
+#ifdef FEATURE_KILL_POPUPS
    int block_popups;         /* bool, 1==will block popups */
    int block_popups_now = 0; /* bool, 1==currently blocking popups */
-#endif /* def KILLPOPUPS */
+#endif /* def FEATURE_KILL_POPUPS */
 
    int pcrs_filter;        /* bool, 1==will filter through pcrs */
    int gif_deanimate;      /* bool, 1==will deanimate gifs */
@@ -438,7 +471,7 @@ static void chat(struct client_state *csp)
          continue;   /* more to come! */
       }
  
-#ifdef FORCE_LOAD
+#ifdef FEATURE_FORCE_LOAD
       /* If this request contains the FORCE_PREFIX,
        * better get rid of it now and set the force flag --oes
        */
@@ -453,7 +486,7 @@ static void chat(struct client_state *csp)
       {
          csp->force = 0;
       }
-#endif /* def FORCE_LOAD */
+#endif /* def FEATURE_FORCE_LOAD */
   
       parse_http_request(req, http, csp);
       freez(req);
@@ -526,19 +559,19 @@ static void chat(struct client_state *csp)
 
    /* decide what we're to do with cookies */
 
-#ifdef TOGGLE
+#ifdef FEATURE_TOGGLE
    if (!csp->toggled_on)
    {
       /* Most compatible set of actions (i.e. none) */
       init_current_action(csp->action);
    }
    else
-#endif /* ndef TOGGLE */
+#endif /* ndef FEATURE_TOGGLE */
    {
       url_actions(http, csp);
    }
 
-#ifdef JAR_FILES
+#ifdef FEATURE_COOKIE_JAR
    /*
     * If we're logging cookies in a cookie jar, and the user has not
     * supplied any wafers, and the user has not told us to suppress the
@@ -550,11 +583,11 @@ static void chat(struct client_state *csp)
    {
       enlist(csp->action->multi[ACTION_MULTI_WAFER], VANILLA_WAFER);
    }
-#endif /* def JAR_FILES */
+#endif /* def FEATURE_COOKIE_JAR */
 
-#ifdef KILLPOPUPS
+#ifdef FEATURE_KILL_POPUPS
    block_popups               = ((csp->action->flags & ACTION_NO_POPUPS) != 0);
-#endif /* def KILLPOPUPS */
+#endif /* def FEATURE_KILL_POPUPS */
 
    pcrs_filter                = (csp->rlist != NULL) &&  /* There are expressions to be used */
                                 ((csp->action->flags & ACTION_FILTER) != 0);
@@ -604,15 +637,15 @@ static void chat(struct client_state *csp)
    	    ( NULL != (rsp = block_url(csp)))
 
           /* ..or untrusted */
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
           || ( NULL != (rsp = trust_url(csp)))
-#endif 
+#endif /* def FEATURE_TRUST */
 
           /* ..or a fast redirect kicked in */
-#ifdef FAST_REDIRECTS
+#ifdef FEATURE_FAST_REDIRECTS
           || (((csp->action->flags & ACTION_FAST_REDIRECTS) != 0) && 
    		     (NULL != (rsp = redirect_url(csp))))
-#endif /* def FAST_REDIRECTS */
+#endif /* def FEATURE_FAST_REDIRECTS */
    		 ))
    	)
    {
@@ -623,10 +656,10 @@ static void chat(struct client_state *csp)
          log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host);
       }
 
-#ifdef STATISTICS
+#ifdef FEATURE_STATISTICS
       /* Count as a rejected request */
       csp->rejected = 1;
-#endif /* def STATISTICS */
+#endif /* def FEATURE_STATISTICS */
 
       /* Log (FIXME: All intercept reasons apprear as "crunch" with Status 200) */
       log_error(LOG_LEVEL_GPC, "%s%s crunch!", http->hostport, http->path);
@@ -828,13 +861,13 @@ static void chat(struct client_state *csp)
           */
          buf[n] = '\0';
 
-#ifdef KILLPOPUPS
+#ifdef FEATURE_KILL_POPUPS
          /* Filter the popups on this read. */
          if (block_popups_now)
          {
-            filter_popups(buf, n);
+            filter_popups(buf);
          }
-#endif /* def KILLPOPUPS */
+#endif /* def FEATURE_KILL_POPUPS */
 
          /* Normally, this would indicate that we've read
           * as much as the server has sent us and we can
@@ -994,7 +1027,7 @@ static void chat(struct client_state *csp)
              * may be in the buffer)
              */
 
-#ifdef KILLPOPUPS
+#ifdef FEATURE_KILL_POPUPS
             /* Start blocking popups if appropriate. */
 
             if ((csp->content_type & CT_TEXT) &&  /* It's a text / * MIME-Type */
@@ -1006,10 +1039,10 @@ static void chat(struct client_state *csp)
                 * 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);
+               filter_popups(csp->iob->cur);
             }
 
-#endif /* def KILLPOPUPS */
+#endif /* def FEATURE_KILL_POPUPS */
 
             /* Buffer and pcrs filter this if appropriate. */
 
@@ -1046,7 +1079,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 */
 
@@ -1152,7 +1185,7 @@ static int32 server_thread(void *data)
  *
  *********************************************************************/
 #ifdef __MINGW32__
-int _main(int argc, const char *argv[])
+int real_main(int argc, const char *argv[])
 #else
 int main(int argc, const char *argv[])
 #endif
@@ -1342,10 +1375,10 @@ static void listen_loop(void)
          log_error(LOG_LEVEL_CONNECT, "OK");
       }
 
-#if defined(TOGGLE)
+#ifdef FEATURE_TOGGLE
       /* by haroon - most of credit to srt19170 */
       csp->toggled_on = g_bToggleIJB;
-#endif
+#endif /* def FEATURE_TOGGLE */
 
       if (run_loader(csp))
       {
@@ -1353,7 +1386,7 @@ static void listen_loop(void)
          /* Never get here - LOG_LEVEL_FATAL causes program exit */
       }
 
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
       if (block_acl(NULL,csp))
       {
          log_error(LOG_LEVEL_CONNECT, "Connection dropped due to ACL");
@@ -1361,7 +1394,7 @@ static void listen_loop(void)
          freez(csp);
          continue;
       }
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
 
       /* add it to the list of clients */
       csp->next = clients->next;
@@ -1382,6 +1415,7 @@ static void listen_loop(void)
             pthread_attr_t attrs;
 
             pthread_attr_init(&attrs);
+            pthread_attr_setdetachstate(&attrs, PTHREAD_CREATE_DETACHED);
             child_id = (pthread_create(&the_thread, &attrs,
                (void*)serve, csp) ? -1 : 0);
             pthread_attr_destroy(&attrs);