]> granicus.if.org Git - apache/commit
Backport 1201331:
authorGraham Leggett <minfrin@apache.org>
Sat, 12 Nov 2011 21:34:40 +0000 (21:34 +0000)
committerGraham Leggett <minfrin@apache.org>
Sat, 12 Nov 2011 21:34:40 +0000 (21:34 +0000)
commit3dfd1b4944596f118b9061b6766940ad738496ad
tree97a5da196074d5c87afebd1ac636518d8554960d
parentbebe010bb1dac016e6d7f3e9b573116b531c3ed1
Backport 1201331:
mod_cache: Make sure we merge headers correctly when we handle a
non cacheable conditional response. PR52120.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201332 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
modules/cache/mod_cache.c