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
parent
903d9f1c
Please register or sign in to comment