Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 10 Jun 2000 11:46:37 -0000
Message-ID: <20000610114637.50615.qmail@locus.apache.org>
From: trawick@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/main http_main.c

trawick     00/06/10 04:46:37

  Modified:    src      CHANGES
               src/main http_main.c
  Log:
  httpd -V now displays APR's selection of the lock mechanism instead of the
  symbols previously respected by prefork.
  
  Revision  Changes    Path
  1.149     +3 -1      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.148
  retrieving revision 1.149
  diff -u -r1.148 -r1.149
  --- CHANGES	2000/06/10 11:25:25	1.148
  +++ CHANGES	2000/06/10 11:46:36	1.149
  @@ -13,7 +13,9 @@
        instead of continuing as root.  [Jeff Trawick]
   
     *) The prefork MPM now uses an APR lock for the accept() mutex.
  -     It has not been getting a lock at all recently.  [Jeff Trawick]
  +     It has not been getting a lock at all recently.  httpd -V now 
  +     displays APR's selection of the lock mechanism instead of the 
  +     symbols previously respected by prefork.  [Jeff Trawick]
   
     *) Change the mmap() feature test to check only for existence.
        The previous check required features not used by Apache.
  
  
  
  1.57      +10 -10    apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- http_main.c	2000/06/08 00:28:32	1.56
  +++ http_main.c	2000/06/10 11:46:37	1.57
  @@ -117,20 +117,20 @@
   #ifdef NO_LINGCLOSE
       printf(" -D NO_LINGCLOSE\n");
   #endif
  -#ifdef USE_FCNTL_SERIALIZED_ACCEPT
  -    printf(" -D USE_FCNTL_SERIALIZED_ACCEPT\n");
  +#if APR_USE_FLOCK_SERIALIZE
  +    printf(" -D APR_USE_FLOCK_SERIALIZE\n");
   #endif
  -#ifdef USE_FLOCK_SERIALIZED_ACCEPT
  -    printf(" -D USE_FLOCK_SERIALIZED_ACCEPT\n");
  +#if APR_USE_SYSVSEM_SERIALIZE
  +    printf(" -D APR_USE_SYSVSEM_SERIALIZE\n");
   #endif
  -#ifdef USE_USLOCK_SERIALIZED_ACCEPT
  -    printf(" -D USE_USLOCK_SERIALIZED_ACCEPT\n");
  +#if APR_USE_FCNTL_SERIALIZE
  +    printf(" -D APR_USE_FCNTL_SERIALIZE\n");
   #endif
  -#ifdef USE_SYSVSEM_SERIALIZED_ACCEPT
  -    printf(" -D USE_SYSVSEM_SERIALIZED_ACCEPT\n");
  +#if APR_USE_PROC_PTHREAD_SERIALIZE
  +    printf(" -D APR_USE_PROC_PTHREAD_SERIALIZE\n");
   #endif
  -#ifdef USE_PTHREAD_SERIALIZED_ACCEPT
  -    printf(" -D USE_PTHREAD_SERIALIZED_ACCEPT\n");
  +#if APR_USE_PTHREAD_SERIALIZE
  +    printf(" -D APR_USE_PTHREAD_SERIALIZE\n");
   #endif
   #ifdef SINGLE_LISTEN_UNSERIALIZED_ACCEPT
       printf(" -D SINGLE_LISTEN_UNSERIALIZED_ACCEPT\n");