Added fix for undefined INADDR_NONE on Solaris by Bart Schelstraete

[privoxy.git] / jcc.c

diff --git a/jcc.c b/jcc.c
index 4e28e4f..84a7eb4 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.82 2002/03/13 00:27:05 jongfoster Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.85 2002/03/24 15:23:33 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -7,7 +7,7 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.82 2002/03/13 00:27:05 jongfoster Exp $";
  *                the main connection-handling function.
  *
  * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                IJBSWA team.  http://ijbswa.sourceforge.net
+ *                Privoxy team.  http://ijbswa.sourceforge.net
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and
@@ -33,6 +33,19 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.82 2002/03/13 00:27:05 jongfoster Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.85  2002/03/24 15:23:33  jongfoster
+ *    Name changes
+ *
+ *    Revision 1.84  2002/03/24 13:25:43  swa
+ *    name change related issues
+ *
+ *    Revision 1.83  2002/03/16 23:54:06  jongfoster
+ *    Adding graceful termination feature, to help look for memory leaks.
+ *    If you enable this (which, by design, has to be done by hand
+ *    editing config.h) and then go to http://i.j.b/die, then the program
+ *    will exit cleanly after the *next* request.  It should free all the
+ *    memory that was used.
+ *
  *    Revision 1.82  2002/03/13 00:27:05  jongfoster
  *    Killing warnings
  *
@@ -1600,7 +1613,7 @@ static int32 server_thread(void *data)
  *********************************************************************/
 void usage(const char *myname)
 {
-   printf("JunkBuster proxy version " VERSION " (" HOME_PAGE_URL ")\n"
+   printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n"
            "Usage: %s [--help] [--version] [--no-daemon] [--pidfile pidfile] [--user user[.group]] [configfile]\n"
            "Aborting.\n", myname);
  
@@ -1670,7 +1683,7 @@ int main(int argc, const char *argv[])
 
       else if(strcmp(argv[argc_pos], "--version") == 0)
       {
-         printf("Junkbuster version " VERSION " (" HOME_PAGE_URL ")\n");
+         printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n");
          exit(0);
       }
 
@@ -1895,7 +1908,7 @@ int main(int argc, const char *argv[])
  *                on failure.
  *
  * Parameters  :
- *          1  :  config = Junkbuster configuration.  Specifies port
+ *          1  :  config = Privoxy configuration.  Specifies port
  *                         to bind to.
  *
  * Returns     :  Port that was opened.
@@ -1934,7 +1947,7 @@ static jb_socket bind_port_helper(struct configuration_spec * config)
       {
          case -3 :
             log_error(LOG_LEVEL_FATAL, "can't bind to %s:%d: "
-               "There may be another junkbuster or some other "
+               "There may be another Privoxy or some other "
                "proxy running on port %d",
                (NULL != config->haddr) ? config->haddr : "INADDR_ANY",
                       config->hport, config->hport);
@@ -2009,6 +2022,23 @@ static void listen_loop(void)
       }
 #endif
 
+#ifdef __OS2__
+#ifdef FEATURE_COOKIE_JAR
+      /*
+       * Need a workaround here: we have to fclose() the jarfile, or we die because it's
+       * already open.  I think unload_configfile() is not being run, which should do
+       * this work.  Until that can get resolved, we'll use this workaround.
+       */
+       if (csp)
+         if(csp->config)
+           if (csp->config->jar)
+           {
+             fclose(csp->config->jar);
+             csp->config->jar = NULL;
+           }
+#endif /* FEATURE_COOKIE_JAR */
+#endif /* __OS2__ */
+
       if ( NULL == (csp = (struct client_state *) zalloc(sizeof(*csp))) )
       {
          log_error(LOG_LEVEL_FATAL, "malloc(%d) for csp failed: %E", sizeof(*csp));
@@ -2150,7 +2180,7 @@ static void listen_loop(void)
             NP_Entry, (ULONG)server_thread,
             NP_Output, Output(),
             NP_CloseOutput, FALSE,
-            NP_Name, (ULONG)"junkbuster child",
+            NP_Name, (ULONG)"privoxy child",
             NP_StackSize, 200*1024,
             TAG_DONE)))
          {
@@ -2244,6 +2274,9 @@ static void listen_loop(void)
    sweep();
    sweep();
 
+#if defined(unix)
+   free(basedir);
+#endif
 #if defined(_WIN32) && !defined(_WIN_CONSOLE)
    /* Cleanup - remove taskbar icon etc. */
    TermLogWindow();