Filled in a function comment.

[privoxy.git] / jcc.c

diff --git a/jcc.c b/jcc.c
index 38ac12d..0970e0b 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.8 2001/05/25 22:43:18 jongfoster Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.9 2001/05/26 00:28:36 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,13 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.8 2001/05/25 22:43:18 jongfoster Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.9  2001/05/26 00:28:36  jongfoster
+ *    Automatic reloading of config file.
+ *    Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32).
+ *    Most of the global variables have been moved to a new
+ *    struct configuration_spec, accessed through csp->config->globalname
+ *    Most of the globals remaining are used by the Win32 GUI.
+ *
  *    Revision 1.8  2001/05/25 22:43:18  jongfoster
  *    Fixing minor memory leak and buffer overflow.
  *
@@ -1113,29 +1120,38 @@ static void listen_loop(void)
          {
             exit(1); 
          }
-#endif
+#endif\r
+         freez(csp);
          continue;
       }
       else
       {
          log_error(LOG_LEVEL_CONNECT, "OK");
-      }
+      }\r
 
 #if defined(TOGGLE)
       /* by haroon - most of credit to srt19170 */
       csp->toggled_on = g_bToggleIJB;
 #endif
 
-      /* add it to the list of clients */
-      csp->next = clients->next;
-      clients->next = csp;
-
       if (run_loader(csp))
       {
          log_error(LOG_LEVEL_FATAL, "a loader failed - must exit");
          /* Never get here - LOG_LEVEL_FATAL causes program exit */
       }
-
+\r
+      if (block_acl(NULL,csp))\r
+      {\r
+         log_error(LOG_LEVEL_CONNECT, "Connection dropped due to ACL");\r
+         close_socket(csp->cfd);\r
+         freez(csp);\r
+         continue;\r
+      }\r
+
+      /* add it to the list of clients */\r
+      csp->next = clients->next;\r
+      clients->next = csp;\r
+\r
       if (config->multi_threaded)
       {
          int child_id;