Return-Path: Delivered-To: apache-cvs-archive@hyperreal.org Received: (qmail 15793 invoked by uid 6000); 9 Jun 1999 11:27:57 -0000 Received: (qmail 15784 invoked by alias); 9 Jun 1999 11:27:55 -0000 Delivered-To: apache-1.3-cvs@hyperreal.org Received: (qmail 15782 invoked by uid 168); 9 Jun 1999 11:27:55 -0000 Date: 9 Jun 1999 11:27:55 -0000 Message-ID: <19990609112755.15781.qmail@hyperreal.org> From: rse@hyperreal.org To: apache-1.3-cvs@hyperreal.org Subject: cvs commit: apache-1.3/src/main http_core.c Sender: apache-cvs-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org rse 99/06/09 04:27:54 Modified: src CHANGES src/main http_core.c Log: Added ceiling on file size for memory mapped files. Submitted by: John Giannandrea Reviewed by: Ken, Dean, Randy, Lars, Jim, Ralf PR: 4122 Revision Changes Path 1.1376 +3 -0 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1375 retrieving revision 1.1376 diff -u -r1.1375 -r1.1376 --- CHANGES 1999/06/09 11:15:22 1.1375 +++ CHANGES 1999/06/09 11:27:52 1.1376 @@ -1,5 +1,8 @@ Changes with Apache 1.3.7 + *) Added ceiling on file size for memory mapped files. + [John Giannandrea ] PR#4122 + *) Fix ndbm.h include problems with brain-dead glibc >= 2.1 which has ndbm.h in a non-standard db1/ subdir. PR#4431, PR#4528 [Henri Gomez , Ralf S. Engelschall] 1.262 +4 -0 apache-1.3/src/main/http_core.c Index: http_core.c =================================================================== RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- http_core.c 1999/05/07 00:16:12 1.261 +++ http_core.c 1999/06/09 11:27:54 1.262 @@ -90,6 +90,9 @@ #endif #endif #endif +#ifndef MMAP_LIMIT +#define MMAP_LIMIT (4*1024*1024) +#endif /* Server core module... This module provides support for really basic * server operations, including options and commands which control the @@ -3032,6 +3035,7 @@ #ifdef USE_MMAP_FILES ap_block_alarms(); if ((r->finfo.st_size >= MMAP_THRESHOLD) + && (r->finfo.st_size < MMAP_LIMIT) && (!r->header_only || (d->content_md5 & 1))) { /* we need to protect ourselves in case we die while we've got the * file mmapped */