Workaround for firefox hanging on blocked javascript pages

[privoxy.git] / jcc.c

diff --git a/jcc.c b/jcc.c
index de785a4..20647fa 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.305 2009/12/22 13:03:30 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.310 2009/12/29 13:17:37 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $


@@ -119,7 +119,7 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.305 2009/12/22 13:03:30 fabiankeil Exp $"
 const char jcc_h_rcs[] = JCC_H_VERSION;
 const char project_h_rcs[] = PROJECT_H_VERSION;
 
 const char jcc_h_rcs[] = JCC_H_VERSION;
 const char project_h_rcs[] = PROJECT_H_VERSION;
 

-int no_daemon = 0;
+int daemon_mode = 1;

 struct client_state  clients[1];
 struct file_list     files[1];
 
 struct client_state  clients[1];
 struct file_list     files[1];
 


@@ -2951,7 +2951,7 @@ int main(int argc, char **argv)
       else if (strcmp(argv[argc_pos], "--no-daemon" ) == 0)
       {
          set_debug_level(LOG_LEVEL_FATAL | LOG_LEVEL_ERROR | LOG_LEVEL_INFO);
       else if (strcmp(argv[argc_pos], "--no-daemon" ) == 0)
       {
          set_debug_level(LOG_LEVEL_FATAL | LOG_LEVEL_ERROR | LOG_LEVEL_INFO);

-         no_daemon = 1;
+         daemon_mode = 0;

       }
 
       else if (strcmp(argv[argc_pos], "--pidfile" ) == 0)
       }
 
       else if (strcmp(argv[argc_pos], "--pidfile" ) == 0)


@@ -3118,12 +3118,11 @@ int main(int argc, char **argv)
 #if defined(unix)
 {
    pid_t pid = 0;
 #if defined(unix)
 {
    pid_t pid = 0;

-#if 0
-   int   fd;
-#endif

 
 

-   if (!no_daemon)
+   if (daemon_mode)

    {
    {

+      int fd;
+

       pid  = fork();
 
       if ( pid < 0 ) /* error */
       pid  = fork();
 
       if ( pid < 0 ) /* error */


@@ -3148,33 +3147,50 @@ int main(int argc, char **argv)
          exit( 0 );
       }
       /* child */
          exit( 0 );
       }
       /* child */

-#if 1
-      /* Should be more portable, but not as well tested */
+

       setsid();
       setsid();

-#else /* !1 */
-#ifdef __FreeBSD__
-      setpgrp(0,0);
-#else /* ndef __FreeBSD__ */
-      setpgrp();
-#endif /* ndef __FreeBSD__ */
-      fd = open("/dev/tty", O_RDONLY);
-      if ( fd )
-      {
-         /* no error check here */
-         ioctl( fd, TIOCNOTTY,0 );
-         close ( fd );
-      }
-#endif /* 1 */
+

       /*
        * stderr (fd 2) will be closed later on,
        * when the config file has been parsed.
        */
       /*
        * stderr (fd 2) will be closed later on,
        * when the config file has been parsed.
        */

+      close(0);
+      close(1);
+
+      /*
+       * Reserve fd 0 and 1 to prevent abort() and friends
+       * from sending stuff to the clients or servers.
+       */
+      fd = open("/dev/null", O_RDONLY);
+      if (fd == -1)
+      {
+         log_error(LOG_LEVEL_FATAL, "Failed to open /dev/null: %E");
+      }
+      else if (fd != 0)
+      {
+         if (dup2(fd, 0) == -1)
+         {
+            log_error(LOG_LEVEL_FATAL, "Failed to reserve fd 0: %E");
+         }
+         close(fd);
+      }
+      fd = open("/dev/null", O_WRONLY);
+      if (fd == -1)
+      {
+         log_error(LOG_LEVEL_FATAL, "Failed to open /dev/null: %E");
+      }
+      else if (fd != 1)
+      {
+         if (dup2(fd, 1) == -1)
+         {
+            log_error(LOG_LEVEL_FATAL, "Failed to reserve fd 1: %E");
+         }
+         close(fd);
+      }

 
 

-      close( 0 );
-      close( 1 );

       chdir("/");
 
       chdir("/");
 

-   } /* -END- if (!no_daemon) */
+   } /* -END- if (daemon_mode) */

 
    /*
     * As soon as we have written the PID file, we can switch
 
    /*
     * As soon as we have written the PID file, we can switch