httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apachen/src/main http_core.c
Date Sat, 08 Nov 1997 21:42:37 GMT
dgaudet     97/11/08 13:42:37

  Modified:    src      CHANGES
               src/main http_core.c
  Log:
  Fix a logic error when issuing a mmap error with non-zero MMAP_THRESHOLD.
  
  PR:		1294
  Submitted by:	David Chambers <davidc@flosun.salk.edu>
  Reviewed by:	Dean Gaudet, Jim Jagielski
  
  Revision  Changes    Path
  1.498     +4 -0      apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.497
  retrieving revision 1.498
  diff -u -r1.497 -r1.498
  --- CHANGES	1997/11/08 21:39:07	1.497
  +++ CHANGES	1997/11/08 21:42:33	1.498
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3b3
   
  +  *) Fix logic error when issuing a mmap() failed message
  +     with a non-zero MMAP_THRESHOLD.
  +     [David Chambers <davidc@flosun.salk.edu>] PR#1294
  +
     *) Preserve handler value on ProxyPass'ed requests by not
        calling find_types on a proxy'd request; fixes problems
        where some ProxyPass'ed URLs weren't actually passed
  
  
  
  1.135     +4 -2      apachen/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- http_core.c	1997/11/05 12:48:16	1.134
  +++ http_core.c	1997/11/08 21:42:36	1.135
  @@ -1756,8 +1756,10 @@
       if (mm == (caddr_t)-1) {
   	unblock_alarms();
   
  -	aplog_error(APLOG_MARK, APLOG_CRIT, r->server,
  -		    "mmap_handler: mmap failed: %s", r->filename);
  +	if (r->finfo.st_size >= MMAP_THRESHOLD) {
  +	    aplog_error(APLOG_MARK, APLOG_CRIT, r->server,
  +			"mmap_handler: mmap failed: %s", r->filename);
  +	}
   #endif
   
   	if (d->content_md5 & 1) {
  
  
  

Mime
View raw message