Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 1 Jan 2001 00:34:25 -0000
Message-ID: <20010101003425.74799.qmail@daedelus.apache.org>
From: rbb@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/http http_protocol.c

rbb         00/12/31 16:34:25

  Modified:    modules/http http_protocol.c
  Log:
  We never use MMAP_SEGMENT_SIZE, and we are better off determining if we
  have MMAP, by just checking with APR, instead of using an Apache
  definition which doesn't really control anything anymore.
  
  Revision  Changes    Path
  1.264     +2 -16     httpd-2.0/modules/http/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
  retrieving revision 1.263
  retrieving revision 1.264
  diff -u -r1.263 -r1.264
  --- http_protocol.c	2000/12/29 13:59:19	1.263
  +++ http_protocol.c	2001/01/01 00:34:25	1.264
  @@ -2975,21 +2975,7 @@
       return rv;
   }
   
  -#ifdef AP_USE_MMAP_FILES
  -
  -/* The code writes MMAP_SEGMENT_SIZE bytes at a time.  This is due to Apache's
  - * timeout model, which is a timeout per-write rather than a time for the
  - * entire transaction to complete.  Essentially this should be small enough
  - * so that in one Timeout period, your slowest clients should be reasonably
  - * able to receive this many bytes.
  - *
  - * To take advantage of zero-copy TCP under Solaris 2.6 this should be a
  - * multiple of 16k.  (And you need a SunATM2.0 network card.)
  - */
  -#ifndef MMAP_SEGMENT_SIZE
  -#define MMAP_SEGMENT_SIZE       32768
  -#endif
  -
  +#if APR_HAS_MMAP
   /* send data from an in-memory buffer */
   AP_DECLARE(size_t) ap_send_mmap(apr_mmap_t *mm, request_rec *r, size_t offset,
                                size_t length)
  @@ -3004,7 +2990,7 @@
   
       return mm->size; /* XXX - change API to report apr_status_t? */
   }
  -#endif /* AP_USE_MMAP_FILES */
  +#endif /* APR_HAS_MMAP */
   
   AP_DECLARE(int) ap_rputc(int c, request_rec *r)
   {