You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Greg Stein <gs...@lyra.org> on 2000/11/08 04:16:19 UTC
Re: cvs commit: apache-2.0/src/modules/experimental mod_mmap_static.c
When does mod_mmap_static go away? Hasn't that been fully replaced by
mod_file_cache now?
Cheers,
-g
On Wed, Nov 08, 2000 at 03:13:03AM -0000, gstein@locus.apache.org wrote:
> gstein 00/11/07 19:13:02
>
> Modified: src/modules/standard mod_file_cache.c
> src/modules/experimental mod_mmap_static.c
> Log:
> ap_set_content_length() now has a void return.
>
> Revision Changes Path
> 1.30 +3 -3 apache-2.0/src/modules/standard/mod_file_cache.c
>
> Index: mod_file_cache.c
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_file_cache.c,v
> retrieving revision 1.29
> retrieving revision 1.30
> diff -u -r1.29 -r1.30
> --- mod_file_cache.c 2000/11/07 22:12:36 1.29
> +++ mod_file_cache.c 2000/11/08 03:12:58 1.30
> @@ -457,10 +457,10 @@
> ap_update_mtime(r, match->finfo.mtime);
> ap_set_last_modified(r);
> ap_set_etag(r);
> - if (((errstatus = ap_meets_conditions(r)) != OK)
> - || (errstatus = ap_set_content_length (r, match->finfo.size))) {
> - return errstatus;
> + if ((errstatus = ap_meets_conditions(r)) != OK) {
> + return errstatus;
> }
> + ap_set_content_length(r, match->finfo.size);
>
> rangestatus = ap_set_byterange(r);
> ap_send_http_header(r);
>
>
>
> 1.23 +3 -3 apache-2.0/src/modules/experimental/mod_mmap_static.c
>
> Index: mod_mmap_static.c
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/modules/experimental/mod_mmap_static.c,v
> retrieving revision 1.22
> retrieving revision 1.23
> diff -u -r1.22 -r1.23
> --- mod_mmap_static.c 2000/10/16 06:04:56 1.22
> +++ mod_mmap_static.c 2000/11/08 03:13:00 1.23
> @@ -300,10 +300,10 @@
> ap_update_mtime(r, match->finfo.mtime);
> ap_set_last_modified(r);
> ap_set_etag(r);
> - if (((errstatus = ap_meets_conditions(r)) != OK)
> - || (errstatus = ap_set_content_length (r, match->finfo.size))) {
> - return errstatus;
> + if ((errstatus = ap_meets_conditions(r)) != OK) {
> + return errstatus;
> }
> + ap_set_content_length(r, match->finfo.size);
>
> rangestatus = ap_set_byterange(r);
> ap_send_http_header(r);
>
>
>
--
Greg Stein, http://www.lyra.org/
Re: cvs commit: apache-2.0/src/modules/experimental mod_mmap_static.c
Posted by rb...@covalent.net.
On Tue, 7 Nov 2000, Greg Stein wrote:
> When does mod_mmap_static go away? Hasn't that been fully replaced by
> mod_file_cache now?
YES! Unfortunately, mod_file_cache should also go away. It should go
away in favor of a vy extensible cache that uses filters. But, since that
isn't written yet, mod_file_cache will do for now. :-)
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------