From 89f4d632da7483f990e3fa75d4a11aee69c61386 Mon Sep 17 00:00:00 2001
From: oes <oes@users.sourceforge.net>
Date: Sun, 3 Mar 2002 15:07:49 +0000
Subject: [PATCH] Re-enabled automatic config reloading

---
 jcc.c     |  9 +++++----
 loadcfg.c |  6 ++++--
 loaders.c | 15 ++++++++++++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/jcc.c b/jcc.c
index f804bf9c..28ee02b4 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.64 2002/03/03 09:18:03 joergs Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.65 2002/03/03 14:49:11 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,9 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.64 2002/03/03 09:18:03 joergs Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.65  2002/03/03 14:49:11  oes
+ *    Fixed CLF logging: Now uses client's original HTTP request
+ *
  *    Revision 1.64  2002/03/03 09:18:03  joergs
  *    Made jumbjuster work on AmigaOS again.
  *
@@ -485,8 +488,6 @@ const char project_h_rcs[] = PROJECT_H_VERSION;
 struct client_state  clients[1];
 struct file_list     files[1];
 
-short int MustReload = 0;
-
 #ifdef FEATURE_STATISTICS
 int urls_read     = 0;     /* total nr of urls read inc rejected */
 int urls_rejected = 0;     /* total nr of urls rejected */
@@ -547,7 +548,7 @@ static void SIG_handler( int signal )
    switch( signal )
    {
       case SIGHUP:
-         MustReload = 1;
+         log_error(LOG_LEVEL_INFO, "ignoring HUP signal (%d)", signal);
          break;
       case SIGTERM:
          log_error(LOG_LEVEL_INFO, "exiting by signal %d .. bye", signal);
diff --git a/loadcfg.c b/loadcfg.c
index 48b72a1a..c38b2162 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.29 2002/01/17 21:02:30 jongfoster Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.30 2002/01/22 23:31:43 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -35,6 +35,9 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.29 2002/01/17 21:02:30 jongfoster
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $
+ *    Revision 1.30  2002/01/22 23:31:43  jongfoster
+ *    Replacing strsav() with string_append()
+ *
  *    Revision 1.29  2002/01/17 21:02:30  jongfoster
  *    Moving all our URL and URL pattern parsing code to urlmatch.c.
  *
@@ -1393,7 +1396,6 @@ struct configuration_spec * load_config(void)
    files->next = fs;
 
    current_configfile = fs;
-   MustReload = 0;
 
    return (config);
 }
diff --git a/loaders.c b/loaders.c
index 74fab48f..1db12210 100644
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.35 2002/01/17 21:03:08 jongfoster Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.36 2002/01/22 23:46:18 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@ -35,6 +35,16 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.35 2002/01/17 21:03:08 jongfoster
  *
  * Revisions   :
  *    $Log: loaders.c,v $
+ *    Revision 1.36  2002/01/22 23:46:18  jongfoster
+ *    Moving edit_read_line() and simple_read_line() to loaders.c, and
+ *    extending them to support reading MS-DOS, Mac and UNIX style files
+ *    on all platforms.
+ *
+ *    Modifying read_config_line() (without changing it's prototype) to
+ *    be a trivial wrapper for edit_read_line().  This means that we have
+ *    one function to read a line and handle comments, which is common
+ *    between the initialization code and the edit interface.
+ *
  *    Revision 1.35  2002/01/17 21:03:08  jongfoster
  *    Moving all our URL and URL pattern parsing code to urlmatch.c.
  *
@@ -422,8 +432,7 @@ int check_file_changed(const struct file_list * current,
        && (current->lastmodified == statbuf->st_mtime)
        && (0 == strcmp(current->filename, filename)))
    {
-       /* force reload of configfile and all the logs */
-       if ( !MustReload ) return 0;
+      return 0;
    }
 
    fs = (struct file_list *)zalloc(sizeof(struct file_list));
-- 
2.39.2