]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
projects / thirdparty / apache / httpd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5688505) | patch
Merge r1514255, r1514267 from trunk:
authorJim Jagielski <jim@apache.org>
Fri, 18 Apr 2014 15:26:01 +0000 (15:26 +0000)
committerJim Jagielski <jim@apache.org>
Fri, 18 Apr 2014 15:26:01 +0000 (15:26 +0000)
commit392daaff68414532cbdebc69c5968cc7736ebfc9
tree132b367a6b337d7c4885be609dcad8b172753a3ftree
parent5688505d984766f78a19f78de5cd56b0fe21539fcommit | diff
Merge r1514255, r1514267 from trunk:

follow-up to r813376:

finish reverting r808965 (ServerTokens set foo)

tweak syntax strings for ServerTokens
Submitted by: trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1588492 13f79535-47bb-0310-9956-ffa450edef68
STATUS diff | blob | blame | history
server/core.c diff | blob | blame | history
Mirror of https://github.com/apache/httpd.git