Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 37194 invoked from network); 24 Sep 2004 14:27:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 24 Sep 2004 14:27:13 -0000 Received: (qmail 27159 invoked by uid 500); 24 Sep 2004 14:29:14 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 26962 invoked by uid 500); 24 Sep 2004 14:29:11 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 26945 invoked by uid 500); 24 Sep 2004 14:29:11 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 26941 invoked by uid 99); 24 Sep 2004 14:29:10 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 24 Sep 2004 07:29:10 -0700 Received: (qmail 37110 invoked by uid 1088); 24 Sep 2004 14:27:08 -0000 Date: 24 Sep 2004 14:27:08 -0000 Message-ID: <20040924142708.37109.qmail@minotaur.apache.org> From: stoddard@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/metadata mod_expires.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N stoddard 2004/09/24 07:27:08 Modified: modules/metadata Tag: APACHE_2_0_BRANCH mod_expires.c Log: In order for mod_expires to work with mod_cache, mod_expires has to go first. Otherwise, mod_cache has no clue that the response has a limited lifetime. Revision Changes Path No revision No revision 1.39.2.13 +4 -1 httpd-2.0/modules/metadata/mod_expires.c Index: mod_expires.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_expires.c,v retrieving revision 1.39.2.12 retrieving revision 1.39.2.13 diff -u -r1.39.2.12 -r1.39.2.13 --- mod_expires.c 24 Apr 2004 11:43:02 -0000 1.39.2.12 +++ mod_expires.c 24 Sep 2004 14:27:08 -0000 1.39.2.13 @@ -541,8 +541,11 @@ } static void register_hooks(apr_pool_t *p) { + /* mod_expires needs to run *before* the cache save filter which is + * AP_FTYPE_CONTENT_SET-1. Otherwise, our expires won't be honored. + */ ap_register_output_filter("MOD_EXPIRES", expires_filter, NULL, - AP_FTYPE_CONTENT_SET); + AP_FTYPE_CONTENT_SET-2); ap_hook_insert_error_filter(expires_insert_filter, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_insert_filter(expires_insert_filter, NULL, NULL, APR_HOOK_MIDDLE); }