cvs commit: apache/src CHANGES http_main.c

[Dean Gaudet]

dgaudet     97/09/22 14:58:56

  Modified:    src      Tag: APACHE_1_2_X CHANGES http_main.c
  Log:
  inetd mode uses timeouts without setting up the jmpbuf
  
  PR:           1064
  Reviewed by:  Marc Slemko, Roy Fielding
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.286.2.54 +3 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.286.2.53
  retrieving revision 1.286.2.54
  diff -u -r1.286.2.53 -r1.286.2.54
  --- CHANGES   1997/09/22 21:55:23     1.286.2.53
  +++ CHANGES   1997/09/22 21:58:49     1.286.2.54
  @@ -1,5 +1,8 @@
   Changes with Apache 1.2.5
   
  +  *) Inetd mode (which is buggy) uses timeouts without having setup the
  +     jmpbuffer. [Dean Gaudet] PR#1064
  +
     *) Work around problem under Linux where a child will start looping
        reporting a select error over and over.
        [Rick Franchuk <[EMAIL PROTECTED]>] PR#1107
  
  
  
  1.149.2.10 +3 -0      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.9
  retrieving revision 1.149.2.10
  diff -u -r1.149.2.9 -r1.149.2.10
  --- http_main.c       1997/09/22 21:55:25     1.149.2.9
  +++ http_main.c       1997/09/22 21:58:51     1.149.2.10
  @@ -2471,6 +2471,9 @@
             GETUSERMODE();
         }
   #endif
  +        if (ap_setjmp (jmpbuffer)) {
  +         exit (0);
  +        }
   
        c = sizeof(sa_client);
        if ((getpeername(fileno(stdin), &sa_client, &c)) < 0)