cvs commit: apache/src mod_status.c

[Mark J Cox <mj...@hyperreal.com>]

mjc         96/10/01 05:05:49

  Modified:    src       mod_status.c
  Log:
  Fix ?auto report (extra \n's and scoreboard across multiple lines), tidy
  display of Scoreboard key to reduce number of lines output.
  
  Revision  Changes    Path
  1.30      +21 -22    apache/src/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_status.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -C3 -r1.29 -r1.30
  *** mod_status.c	1996/08/20 11:51:20	1.29
  --- mod_status.c	1996/10/01 12:05:48	1.30
  ***************
  *** 50,56 ****
     *
     */
    
  ! /* $Id: mod_status.c,v 1.29 1996/08/20 11:51:20 paul Exp $ */
    
    /* Status Module.  Provide a way of getting at the internal Apache
     * status information without having to worry where the scoreboard is
  --- 50,56 ----
     *
     */
    
  ! /* $Id: mod_status.c,v 1.30 1996/10/01 12:05:48 mjc Exp $ */
    
    /* Status Module.  Provide a way of getting at the internal Apache
     * status information without having to worry where the scoreboard is
  ***************
  *** 365,407 ****
    	    rputs("/request",r);
    	}
    
  ! 	rputs("<p>\n",r);
        } /* short_report */
    #endif /* STATUS */
    
  !     /* send the scoreboard 'table' out */
    
  !     rputs("Scoreboard: \n",r);
    
        if(!short_report)
    	rputs("<PRE>",r);
  ! 
  !     rputs("\n",r);
    
        for (i = 0; i<HARD_SERVER_LIMIT; ++i)
        {
    	rputc(stat_buffer[i], r);
  ! 	if(i%STATUS_MAXLINE == (STATUS_MAXLINE - 1))
    	    rputs("\n",r);
        }
    
        if (short_report)
  !     {
  !         rprintf(r,"\nBusyServers: %d\nIdleServers: %d\n",busy,ready);
  !     }
  !     else 
  !     {
    	rputs("</PRE>\n",r);
  ! 	rputs("Key:<br> \n",r);
  ! 	rputs("\"<code>_</code>\" Waiting for Connection, \n",r);
  ! 	rputs("\"<code>S</code>\" Starting up,<br> \n",r);
  ! 	rputs("\"<code>R</code>\" Reading Request, \n",r);
  ! 	rputs("\"<code>W</code>\" Sending Reply,<br> \n",r);
  ! 	rputs("\"<code>K</code>\" Keepalive (read), \n",r);
  ! 	rputs("\"<code>D</code>\" DNS Lookup, \n",r);
  ! 	rputs("\"<code>L</code>\" Logging<p>\n",r);
  !         rprintf(r,"\n%d requests currently being processed, %d idle servers\n"
  ! 		,busy,ready);
        }
    
    #if defined(STATUS)
  --- 365,406 ----
    	    rputs("/request",r);
    	}
    
  ! 	rputs("<br>\n",r);
        } /* short_report */
    #endif /* STATUS */
    
  !     if (!short_report)
  !         rprintf(r,"\n%d requests currently being processed, %d idle servers\n"
  ! 		,busy,ready);
  !     else
  !         rprintf(r,"BusyServers: %d\nIdleServers: %d\n",busy,ready);
    
  !     /* send the scoreboard 'table' out */
    
        if(!short_report)
    	rputs("<PRE>",r);
  !     else
  !         rputs("Scoreboard: ",r);
    
        for (i = 0; i<HARD_SERVER_LIMIT; ++i)
        {
    	rputc(stat_buffer[i], r);
  ! 	if((i%STATUS_MAXLINE == (STATUS_MAXLINE - 1))&&!short_report)
    	    rputs("\n",r);
        }
    
        if (short_report)
  !         rputs("\n",r);
  !     else {
    	rputs("</PRE>\n",r);
  ! 	rputs("Scoreboard Key: <br>\n",r);
  ! 	rputs("\"<B><code>_</code></B>\" Waiting for Connection, \n",r);
  ! 	rputs("\"<B><code>S</code></B>\" Starting up, \n",r);
  ! 	rputs("\"<B><code>R</code></B>\" Reading Request,<BR>\n",r);
  ! 	rputs("\"<B><code>W</code></B>\" Sending Reply, \n",r);
  ! 	rputs("\"<B><code>K</code></B>\" Keepalive (read), \n",r);
  ! 	rputs("\"<B><code>D</code></B>\" DNS Lookup, \n",r);
  ! 	rputs("\"<B><code>L</code></B>\" Logging<p>\n",r);
        }
    
    #if defined(STATUS)