cvs commit: apache-1.3/src/modules/standard mod_status.c

[jim]

jim         98/08/11 17:13:34

  Modified:    src/modules/standard mod_status.c
  Log:
  Cosmetic changes... try to make better use
  of space when printing out the PID key. Also, be consistant with use
  of NO_TIMES
  
  Revision  Changes    Path
  1.97      +15 -8     apache-1.3/src/modules/standard/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- mod_status.c      1998/08/11 20:40:28     1.96
  +++ mod_status.c      1998/08/12 00:13:33     1.97
  @@ -450,14 +450,22 @@
        ap_rputs("\"<B><code>.</code></B>\" Open slot with no current 
process<P>\n", r);
        ap_rputs("<P>\n", r);
        if (!ap_extended_status) {
  +         int j = 0;
            ap_rputs("PID Key: <br>\n", r);
  -         ap_rputs("<UL>\n", r);
  +         ap_rputs("<PRE>\n", r);
            for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
  -             if (stat_buffer[i] != '.')
  -                 ap_rprintf(r, "<LI>%d in state: %c <BR>\n", pid_buffer[i],
  +             if (stat_buffer[i] != '.') {
  +                 ap_rprintf(r, "   %d in state: %c ", pid_buffer[i],
                     stat_buffer[i]);
  +                 if (++j >= 3) {
  +                     ap_rputs("\n", r);
  +                     j = 0;
  +                 } else
  +                     ap_rputs(",", r);
  +             }
            }
  -         ap_rputs("</UL>\n", r);
  +         ap_rputs("\n", r);
  +         ap_rputs("</PRE>\n", r);
        }
       }
   
  @@ -650,7 +658,7 @@
        }                               /* for () */
   
        if (!(short_report || no_table_report)) {
  -#ifdef OS2
  +#ifdef NO_TIMES
            ap_rputs("</table>\n \
   <hr> \
   <table>\n \
  @@ -684,9 +692,8 @@
   
       } else {
   
  -    ap_rputs("<hr>To obtain a full report with current status information 
and", r);
  -    ap_rputs(" DNS and LOGGING status codes \n", r);
  -    ap_rputs("you need to use the <code>ExtendedStatus On</code>directive. 
\n", r);
  +    ap_rputs("<hr>To obtain a full report with current status information", 
r);
  +    ap_rputs("you need to use the <code>ExtendedStatus On</code> directive. 
\n", r);
   
       }