Change mod_expire to append Cache-Control instead of overwriting it (fixes #1197)

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2589 152afb58-edef-0310-8abb-c4023f1b3aa9
14 years ago · 099d37ef75
parent 5e91465797
commit 099d37ef75
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -22,6 +22,7 @@ NEWS
  * Fix hanging connection in mod_scgi (fixes #2024)
  * Allow digits in hostnames in more places (fixes #1148)
  * Use connection_reset instead of handle_request_done for cleanup callbacks
+  * Change mod_expire to append Cache-Control instead of overwriting it (fixes #1197)

 - 1.4.23 - 2009-06-19
  * Added some extra warning options in cmake and fix the resulting warnings (unused/static functions)
--- a/src/mod_expire.c
+++ b/src/mod_expire.c
@ -342,7 +342,7 @@ URIHANDLER_FUNC(mod_expire_path_handler) {
 			buffer_copy_string_len(p->expire_tstmp, CONST_STR_LEN("max-age="));
 			buffer_append_long(p->expire_tstmp, expires - srv->cur_ts); /* as expires >= srv->cur_ts the difference is >= 0 */

-			response_header_overwrite(srv, con, CONST_STR_LEN("Cache-Control"), CONST_BUF_LEN(p->expire_tstmp));
+			response_header_insert(srv, con, CONST_STR_LEN("Cache-Control"), CONST_BUF_LEN(p->expire_tstmp));

 			return HANDLER_GO_ON;
 		}