diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2015-08-02 00:19:16 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2015-08-02 00:19:16 +0200 |
| commit | 48802c25dc82a8b13ac351c0c2137ef748256bbd (patch) | |
| tree | dcaa03f7f34153303fe5afbc9c99dbb8c44b22b3 /modules/ssl/ssl_scache.c | |
| parent | 080d5e16db802902200a9ce5b6c40f8f1fdc1f73 (diff) | |
| download | apache2-48802c25dc82a8b13ac351c0c2137ef748256bbd.tar.gz | |
Imported Upstream version 2.4.16
Diffstat (limited to 'modules/ssl/ssl_scache.c')
| -rw-r--r-- | modules/ssl/ssl_scache.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/modules/ssl/ssl_scache.c b/modules/ssl/ssl_scache.c index 01f72546..2d365b22 100644 --- a/modules/ssl/ssl_scache.c +++ b/modules/ssl/ssl_scache.c @@ -198,15 +198,20 @@ static int ssl_ext_status_hook(request_rec *r, int flags) { SSLModConfigRec *mc = myModConfig(r->server); - if (mc == NULL || flags & AP_STATUS_SHORT || mc->sesscache == NULL) + if (mc == NULL || mc->sesscache == NULL) return OK; - ap_rputs("<hr>\n", r); - ap_rputs("<table cellspacing=0 cellpadding=0>\n", r); - ap_rputs("<tr><td bgcolor=\"#000000\">\n", r); - ap_rputs("<b><font color=\"#ffffff\" face=\"Arial,Helvetica\">SSL/TLS Session Cache Status:</font></b>\r", r); - ap_rputs("</td></tr>\n", r); - ap_rputs("<tr><td bgcolor=\"#ffffff\">\n", r); + if (!(flags & AP_STATUS_SHORT)) { + ap_rputs("<hr>\n", r); + ap_rputs("<table cellspacing=0 cellpadding=0>\n", r); + ap_rputs("<tr><td bgcolor=\"#000000\">\n", r); + ap_rputs("<b><font color=\"#ffffff\" face=\"Arial,Helvetica\">SSL/TLS Session Cache Status:</font></b>\r", r); + ap_rputs("</td></tr>\n", r); + ap_rputs("<tr><td bgcolor=\"#ffffff\">\n", r); + } + else { + ap_rputs("TLSSessionCacheStatus\n", r); + } if (mc->sesscache->flags & AP_SOCACHE_FLAG_NOTMPSAFE) { ssl_mutex_on(r->server); @@ -218,8 +223,11 @@ static int ssl_ext_status_hook(request_rec *r, int flags) ssl_mutex_off(r->server); } - ap_rputs("</td></tr>\n", r); - ap_rputs("</table>\n", r); + if (!(flags & AP_STATUS_SHORT)) { + ap_rputs("</td></tr>\n", r); + ap_rputs("</table>\n", r); + } + return OK; } |