cvs commit: apache/src http_main.c httpd.h

[Ben Laurie]

ben         96/05/15 05:57:47

  Modified:    src       http_main.c httpd.h
  Log:
  Update version number to 1.1b3-dev. [Note: http_main.c is not really modified,
  this is a result of a merge conflict].
  
  Revision  Changes    Path
  1.27      +2 -1      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -C3 -r1.26 -r1.27
  *** http_main.c       1996/05/12 22:30:54     1.26
  --- http_main.c       1996/05/15 12:57:44     1.27
  ***************
  *** 969,975 ****
        if(!one_process) {
        signal(SIGSEGV,(void (*)())seg_fault);
                signal(SIGBUS,(void (*)())bus_error);
  !     }
    #ifdef NO_USE_SIGACTION
        signal(SIGTERM,(void (*)())sig_term);
        signal(SIGHUP,(void (*)())restart);
  --- 969,976 ----
        if(!one_process) {
        signal(SIGSEGV,(void (*)())seg_fault);
                signal(SIGBUS,(void (*)())bus_error);
  !     }
  ! 
    #ifdef NO_USE_SIGACTION
        signal(SIGTERM,(void (*)())sig_term);
        signal(SIGHUP,(void (*)())restart);
  
  
  
  1.19      +1 -1      apache/src/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -C3 -r1.18 -r1.19
  *** httpd.h   1996/04/24 02:45:35     1.18
  --- httpd.h   1996/05/15 12:57:45     1.19
  ***************
  *** 219,225 ****
    
    /* ------------------------------ error types 
------------------------------ */
    
  ! #define SERVER_VERSION "Apache/1.1b2"
    #define SERVER_PROTOCOL "HTTP/1.0"
    #define SERVER_SUPPORT "http://www.apache.org/";
    
  --- 219,225 ----
    
    /* ------------------------------ error types 
------------------------------ */
    
  ! #define SERVER_VERSION "Apache/1.1b3-dev"
    #define SERVER_PROTOCOL "HTTP/1.0"
    #define SERVER_SUPPORT "http://www.apache.org/";