You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dg...@hyperreal.org on 1998/01/20 02:09:41 UTC

cvs commit: apache/src CHANGES http_main.c

dgaudet     98/01/19 17:09:41

  Modified:    src      Tag: APACHE_1_2_X CHANGES http_main.c
  Log:
  When an error occurs in fcntl() locking suggest the user look up
  the docs for LockFile.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.286.2.74 +4 -1      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.286.2.73
  retrieving revision 1.286.2.74
  diff -u -r1.286.2.73 -r1.286.2.74
  --- CHANGES	1998/01/20 01:06:17	1.286.2.73
  +++ CHANGES	1998/01/20 01:09:38	1.286.2.74
  @@ -1,8 +1,11 @@
   Changes with Apache 1.2.6
   
  +  *) When an error occurs in fcntl() locking suggest the user look up
  +     the docs for LockFile.  [Dean Gaudet]
  +
     *) table_set() and table_unset() did not deal correctly with
        multiple occurrences of the same key. [Stephen Scheck
  -    <ss...@infonex.net>, Ben Laurie] PR#1604
  +     <ss...@infonex.net>, Ben Laurie] PR#1604
     
     *) send_fd_length() did not calculate total_bytes_sent properly in error
        cases.  [Ben Reser <br...@regnow.com>] PR#1366
  
  
  
  1.149.2.11 +6 -4      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.149.2.10
  retrieving revision 1.149.2.11
  diff -u -r1.149.2.10 -r1.149.2.11
  --- http_main.c	1997/09/22 21:58:51	1.149.2.10
  +++ http_main.c	1998/01/20 01:09:39	1.149.2.11
  @@ -236,8 +236,9 @@
   	continue;
   
       if (ret < 0) {
  -	log_unixerr("fcntl", "F_SETLKW", "Error getting accept lock. Exiting!",
  -		    server_conf);
  +	log_unixerr("fcntl", "F_SETLKW", "Error getting accept lock. Exiting!"
  +		    "Perhaps you need to use the LockFile directive to place "
  +		    "your lock file on a local disk!", server_conf);
   	exit(1);
       }
   }
  @@ -246,8 +247,9 @@
   {
       if (fcntl (lock_fd, F_SETLKW, &unlock_it) < 0)
       {
  -	log_unixerr("fcntl", "F_SETLKW", "Error freeing accept lock. Exiting!",
  -		    server_conf);
  +	log_unixerr("fcntl", "F_SETLKW", "Error freeing accept lock. Exiting!"
  +		    "Perhaps you need to use the LockFile directive to place "
  +		    "your lock file on a local disk!", server_conf);
   	exit(1);
       }
   }