httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm config.m4
Date Wed, 07 Jun 2000 12:36:52 GMT
trawick     00/06/07 05:36:51

  Modified:    src      CHANGES
               src/lib/apr configure.in
               src/modules/mpm config.m4
  Log:
  Change the mmap() feature test to check only for existence.
  The autoconf-provided check used previously fails when the
  platform doesn't support MAP_FIXED.  Apache doesn't use that
  mmap() feature, so we don't want to require it.
  Submitted by:	Greg Ames
  
  Revision  Changes    Path
  1.143     +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.142
  retrieving revision 1.143
  diff -u -r1.142 -r1.143
  --- CHANGES	2000/06/06 22:22:51	1.142
  +++ CHANGES	2000/06/07 12:36:50	1.143
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0a5
  +  *) Change the mmap() feature test to check only for existence.
  +     The previous check required features not used by Apache.
  +     [Greg Ames]
  +
     *) Fix a couple of bugs in mod_cgid:  The cgi arguments were
        sometimes mangled.  The len parm to accept() was not 
        initialized, leading sometimes to an endless loop of failed
  
  
  
  1.101     +5 -13     apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- configure.in	2000/06/06 21:45:10	1.100
  +++ configure.in	2000/06/07 12:36:51	1.101
  @@ -144,6 +144,10 @@
   AC_CHECK_FUNC(_getch)
   AC_CHECK_FUNCS(gmtime_r localtime_r)
   AC_CHECK_FUNCS(iconv, [ iconv="1" ], [ iconv="0" ])
  +AC_CHECK_FUNCS(mmap, [ mmap="1" ], [ mmap="0" ])
  +if test "$native_mmap_emul" = "1"; then
  +    mmap="1"
  +fi
   AC_CHECK_FUNCS(hstrerror)
   AC_SUBST(sendfile)
   AC_SUBST(fork)
  @@ -151,7 +155,7 @@
   AC_SUBST(inet_network)
   AC_SUBST(have_sigaction)
   AC_SUBST(iconv)
  -
  +AC_SUBST(mmap)
   
   dnl #----------------------------- Checks for Any required Headers
   AC_HEADER_STDC
  @@ -418,18 +422,6 @@
       AC_MSG_RESULT(no) ] )
   
   AC_SUBST(struct_rlimit)
  -
  -dnl #----------------------------- Checking for MMAP 
  -echo $ac_n "${nl}Checking for MMAP...${nl}"
  -AC_FUNC_MMAP
  -if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then
  -    mmap="1"
  -elif test "$native_mmap_emul" = "1"; then
  -    mmap="1"
  -else
  -    mmap="0"
  -fi
  -AC_SUBST(mmap)
   
   dnl #----------------------------- Checking for Locking Characteristics 
   echo $ac_n "${nl}Checking for Locking..."
  
  
  
  1.15      +1 -2      apache-2.0/src/modules/mpm/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/config.m4,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- config.m4	2000/04/30 02:31:07	1.14
  +++ config.m4	2000/06/07 12:36:51	1.15
  @@ -42,8 +42,7 @@
   
   dnl All the unix MPMs use shared memory; save a little duplication
   AC_DEFUN(APACHE_MPM_CHECK_SHMEM, [
  -    AC_CHECK_FUNCS(shmget)
  -    AC_FUNC_MMAP
  +    AC_CHECK_FUNCS(shmget mmap)
       
       AC_MSG_CHECKING(which shared memory mechanism to use)
       if test "$ac_cv_func_shmget" = "yes" ; then
  
  
  

Mime
View raw message