From df97e149c0c8c0d07feea93c7e014e29946071c7 Mon Sep 17 00:00:00 2001
From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 3 Apr 2014 22:20:15 +0000
Subject: [PATCH] mod_expires: don't add Expires header to error responses
 (4xx/5xx),              be they generated or forwarded. PR 55669.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1584430 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/metadata/mod_expires.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
index 049cfc2250..8f8a777693 100644
--- a/modules/metadata/mod_expires.c
+++ b/modules/metadata/mod_expires.c
@@ -451,6 +451,12 @@ static apr_status_t expires_filter(ap_filter_t *f,
     const char *expiry;
     apr_table_t *t;
 
+    /* Don't add Expires headers to errors */
+    if (ap_is_HTTP_ERROR(f->r->status)) {
+        ap_remove_output_filter(f);
+        return ap_pass_brigade(f->next, b);
+    }
+
     r = f->r;
     conf = (expires_dir_config *) ap_get_module_config(r->per_dir_config,
                                                        &expires_module);
-- 
2.50.1