httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/cache mod_file_cache.c
Date Sat, 31 Mar 2001 11:51:19 GMT
trawick     01/03/31 03:51:19

  Modified:    modules/cache mod_file_cache.c
  Log:
  Get mod_file_cache to refuse to compile on systems with neither
  sendfile nor mmap.
  
  Get mod_file_cache to compile on systems with sendfile but !mmap.
  
  Submitted by:	Greg Stein
  
  Revision  Changes    Path
  1.53      +9 -2      httpd-2.0/modules/cache/mod_file_cache.c
  
  Index: mod_file_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/cache/mod_file_cache.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- mod_file_cache.c	2001/03/26 23:40:41	1.52
  +++ mod_file_cache.c	2001/03/31 11:51:16	1.53
  @@ -107,6 +107,11 @@
   */
   
   #include "apr.h"
  +
  +#if !(APR_HAS_SENDFILE || APR_HAS_MMAP)
  +#error mod_file_cache only works on systems with APR_HAS_SENDFILE or APR_HAS_MMAP
  +#endif
  +
   #include "apr_mmap.h"
   #include "apr_strings.h"
   #include "apr_hash.h"
  @@ -212,6 +217,7 @@
       new_file = apr_pcalloc(cmd->pool, sizeof(a_file));
       new_file->finfo = tmp.finfo;
   
  +#if APR_HAS_MMAP
       if (mmap) {
            /* MMAPFile directive. MMAP'ing the file */
           if ((rc = apr_mmap_create(&new_file->mm, fd, 0, new_file->finfo.size,
  @@ -224,8 +230,9 @@
           apr_file_close(fd);
           new_file->is_mmapped = TRUE;
       }
  +#endif
   #if APR_HAS_SENDFILE
  -    else {
  +    if (!mmap) {
           /* CacheFile directive. Caching the file handle */
           new_file->is_mmapped = FALSE;
           new_file->file = fd;
  @@ -263,7 +270,7 @@
   #else
       /* MMAP not supported by this OS */
       ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, cmd->server,
  -                 "mod_file_cache: unable to cache file: %s. MMAP is not supported by this
OS", fspec);
  +                 "mod_file_cache: unable to cache file: %s. MMAP is not supported by this
OS", filename);
   #endif
       return NULL;
   }
  
  
  

Mime
View raw message