Commit e01505da authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1774018 from trunk: 

html elements

Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1774019 13f79535-47bb-0310-9956-ffa450edef68
parent 90f8cb99

modules/cache/mod_socache_memcache.c

+9 −9
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static void socache_mc_status(ap_socache_instance_t *ctx, request_rec *r, int fl 
        apr_memcache_server_t *ms;

        apr_memcache_stats_t *stats;

        apr_status_t rv;

        char *br = (!(flags & AP_STATUS_SHORT) ? "</br>" : "");

        char *br = (!(flags & AP_STATUS_SHORT) ? "<br />" : "");



        ms = rc->live_servers[i];
@@ -314,21 +314,21 @@ static void socache_mc_status(ap_socache_instance_t *ctx, request_rec *r, int fl 
        if (rv != APR_SUCCESS)

            continue;

        if (!(flags & AP_STATUS_SHORT)) {

            ap_rprintf(r, "<b>Version:</b> <i>%s</i> [%u bits], PID: <i>%u</i>, Uptime: <i>%u hrs</i> </br>\n",

            ap_rprintf(r, "<b>Version:</b> <i>%s</i> [%u bits], PID: <i>%u</i>, Uptime: <i>%u hrs</i> <br />\n",

                    stats->version , stats->pointer_size, stats->pid, stats->uptime/3600);

            ap_rprintf(r, "<b>Clients::</b> Structures: <i>%u</i>, Total: <i>%u</i>, Current: <i>%u</i> </br>\n",

            ap_rprintf(r, "<b>Clients::</b> Structures: <i>%u</i>, Total: <i>%u</i>, Current: <i>%u</i> <br />\n",

                    stats->connection_structures, stats->total_connections, stats->curr_connections);

            ap_rprintf(r, "<b>Storage::</b> Total Items: <i>%u</i>, Current Items: <i>%u</i>, Bytes: <i>%lu</i> </br>\n",

            ap_rprintf(r, "<b>Storage::</b> Total Items: <i>%u</i>, Current Items: <i>%u</i>, Bytes: <i>%lu</i> <br />\n",

                    stats->total_items, stats->curr_items, stats->bytes);

            ap_rprintf(r, "<b>CPU::</b> System: <i>%u</i>, User: <i>%u</i> </br>\n",

            ap_rprintf(r, "<b>CPU::</b> System: <i>%u</i>, User: <i>%u</i> <br />\n",

                    (unsigned)stats->rusage_system, (unsigned)stats->rusage_user );

            ap_rprintf(r, "<b>Cache::</b> Gets: <i>%u</i>, Sets: <i>%u</i>, Hits: <i>%u</i>, Misses: <i>%u</i> </br>\n",

            ap_rprintf(r, "<b>Cache::</b> Gets: <i>%u</i>, Sets: <i>%u</i>, Hits: <i>%u</i>, Misses: <i>%u</i> <br />\n",

                    stats->cmd_get, stats->cmd_set, stats->get_hits, stats->get_misses);

            ap_rprintf(r, "<b>Net::</b> Input bytes: <i>%lu</i>, Output bytes: <i>%lu</i> </br>\n",

            ap_rprintf(r, "<b>Net::</b> Input bytes: <i>%lu</i>, Output bytes: <i>%lu</i> <br />\n",

                    stats->bytes_read, stats->bytes_written);

            ap_rprintf(r, "<b>Misc::</b> Evictions: <i>%lu</i>, MaxMem: <i>%u</i>, Threads: <i>%u</i> </br>\n",

            ap_rprintf(r, "<b>Misc::</b> Evictions: <i>%lu</i>, MaxMem: <i>%u</i>, Threads: <i>%u</i> <br />\n",

                    stats->evictions, stats->limit_maxbytes, stats->threads);

            ap_rputs("<hr></br>\n", r);

            ap_rputs("<hr><br />\n", r);

        }

        else {

            ap_rprintf(r, "Version: %s [%u bits], PID: %u, Uptime: %u hrs %s\n",