]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1671397, r1672466, r1672564 from trunk:
authorJim Jagielski <jim@apache.org>
Sun, 19 Apr 2015 18:05:15 +0000 (18:05 +0000)
committerJim Jagielski <jim@apache.org>
Sun, 19 Apr 2015 18:05:15 +0000 (18:05 +0000)
commitfd41c4978eecede136fd2e254e04318de8e1d88d
tree3aa12c5ea7bae67a8e910017f609aef3291cd766
parent520ec878e13bbb15a535aa963db9d2bca7806d9d
Merge r1671397, r1672466, r1672564 from trunk:

Add output for "?auto" version of server-status
to proxy status, mod_ssl session cache info,
mod_cache_socache and the status hook of the
individual socache implementations.

Followon to r1671397 for proxy server-status
in auto mode:
- don't show HTML legend
- Show correct worker name

More followon to r1671397 for proxy server-status
in auto mode:
- remove remaining HTML markup

Submitted by: rjung
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1674660 13f79535-47bb-0310-9956-ffa450edef68
STATUS
modules/cache/mod_cache_socache.c
modules/cache/mod_socache_dbm.c
modules/cache/mod_socache_dc.c
modules/cache/mod_socache_shmcb.c
modules/proxy/mod_proxy.c
modules/ssl/ssl_scache.c