]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r239381, r240092, r240096, r240349 from trunk:
authorJoe Orton <jorton@apache.org>
Wed, 31 Aug 2005 09:46:17 +0000 (09:46 +0000)
committerJoe Orton <jorton@apache.org>
Wed, 31 Aug 2005 09:46:17 +0000 (09:46 +0000)
commitc6cab4e12f28241c8f8cdf427925e5586068544b
tree6246fdb3402ab4f79905c145dd3330205d0d0fa8
parent499c939b01bc94b65a46109201ddfd038d63d6a6
Merge r239381, r240092, r240096, r240349 from trunk:

* support/htcacheclean.c: Update htcacheclean defines to match
mod_disk_cache.c.

* server/listen.c (IS_INADDR_ANY, IS_IN6ADDR_ANY): New macros.
(open_listeners): Simplify using the new macros; no functional change.

* server/listen.c (open_listeners): If 0.0.0.0 is found before [::]
for the same port, switch them so that the bind to [::] is attempted
first.

* build/rpm/httpd.spec.in: Fix the RPM spec file: XML versions of the
doc files are no longer removed. Added httxt2dbm to the sbin
directory.

Submitted by: colm, jorton, minfrin
Reviewed by: colm, jorton, trawick, jerenkrantz

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@264990 13f79535-47bb-0310-9956-ffa450edef68
build/rpm/httpd.spec.in
server/listen.c
support/htcacheclean.c