]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
merge from trunk (but preserve ap_get_server_version()):
authorJeff Trawick <trawick@apache.org>
Fri, 15 Sep 2006 13:19:25 +0000 (13:19 +0000)
committerJeff Trawick <trawick@apache.org>
Fri, 15 Sep 2006 13:19:25 +0000 (13:19 +0000)
commit492e695c40e714d1973a7bb0569a584f4f2373dc
tree9d8dd1b5c2c836c3ff0fba663221cb910f28753b
parent59b399bf7870f0c0e8048f6b810bc557627c66d7
merge from trunk (but preserve ap_get_server_version()):

  *) The full server version information is now included in the error log at
     startup as well as server status reports, irrespective of the setting
     of the ServerTokens directive.  ap_get_server_version() is now
     deprecated, and is replaced by ap_get_server_banner() and
     ap_get_server_description().

Reviewed by: rpluem, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@446606 13f79535-47bb-0310-9956-ffa450edef68
26 files changed:
CHANGES
STATUS
include/ap_mmn.h
include/httpd.h
modules/arch/netware/mod_nw_ssl.c
modules/experimental/mod_example.c
modules/generators/mod_info.c
modules/generators/mod_status.c
modules/http/http_filters.c
modules/mappers/mod_rewrite.c
modules/proxy/mod_proxy_balancer.c
modules/proxy/mod_proxy_connect.c
modules/proxy/mod_proxy_ftp.c
modules/ssl/ssl_engine_vars.c
server/core.c
server/main.c
server/mpm/beos/beos.c
server/mpm/experimental/event/event.c
server/mpm/mpmt_os2/mpmt_os2.c
server/mpm/netware/mpm_netware.c
server/mpm/prefork/prefork.c
server/mpm/winnt/mpm_winnt.c
server/mpm/winnt/service.c
server/mpm/worker/worker.c
server/mpm_common.c
server/util_script.c