X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jcc.c;h=b5aaf98144c7124f5dee52b1b92e799eef089ccb;hb=cd0ce8c4a9fbab86a37deb7a430f70d5ba5a4d17;hp=fdcd69b83c154385cac0354d26fa5c07219e384a;hpb=06d47abf41187eb7eb31f821a1a83cc98aa464b8;p=privoxy.git

diff --git a/jcc.c b/jcc.c
index fdcd69b8..b5aaf981 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,3 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.469 2017/08/12 09:36:42 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -128,9 +127,6 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.469 2017/08/12 09:36:42 fabiankeil Exp $"
 #include "client-tags.h"
 #endif
 
-const char jcc_h_rcs[] = JCC_H_VERSION;
-const char project_h_rcs[] = PROJECT_H_VERSION;
-
 int daemon_mode = 1;
 struct client_states clients[1];
 struct file_list     files[1];
@@ -1069,7 +1065,7 @@ static void wait_for_alive_connections(void)
  *          1  :  sfd  = Open socket to remember.
  *          2  :  http = The destination for the connection.
  *          3  :  fwd  = The forwarder settings used.
- *          3  :  server_connection  = storage.
+ *          4  :  server_connection  = storage.
  *
  * Returns     : void
  *
@@ -2173,7 +2169,7 @@ static void handle_established_connection(struct client_state *csp)
                 */
                watch_client_socket = 0;
                log_error(LOG_LEVEL_CONNECT,
-                  "Stopping to watch the client socket %d. "
+                  "Stop watching client socket %d. "
                   "There's already another request waiting.",
                   csp->cfd);
                continue;
@@ -3985,8 +3981,10 @@ int main(int argc, char **argv)
     * As soon as we have written the PID file, we can switch
     * to the user and group ID indicated by the --user option
     */
-   write_pid_file();
-
+   if (pidfile != NULL)
+   {
+      write_pid_file(pidfile);
+   }
    if (NULL != pw)
    {
       if (setgid((NULL != grp) ? grp->gr_gid : pw->pw_gid))