mjc 96/10/23 06:15:29
Modified: src scoreboard.h mod_status.c http_main.c
Log:
Put missing virtual host name into status information - request field isn't
much use without it.
Revision Changes Path
1.16 +2 -1 apache/src/scoreboard.h
Index: scoreboard.h
===================================================================
RCS file: /export/home/cvs/apache/src/scoreboard.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C3 -r1.15 -r1.16
*** scoreboard.h 1996/08/20 11:51:22 1.15
--- scoreboard.h 1996/10/23 13:15:25 1.16
***************
*** 50,56 ****
*
*/
! /* $Id: scoreboard.h,v 1.15 1996/08/20 11:51:22 paul Exp $ */
#include <sys/times.h>
--- 50,56 ----
*
*/
! /* $Id: scoreboard.h,v 1.16 1996/10/23 13:15:25 mjc Exp $ */
#include <sys/times.h>
***************
*** 89,94 ****
--- 89,95 ----
time_t last_used;
char client[32]; /* Keep 'em small... */
char request[64]; /* We just want an idea... */
+ char vhost[32]; /* What virtual host is being accessed? */
#endif
} short_score;
1.32 +4 -3 apache/src/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_status.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C3 -r1.31 -r1.32
*** mod_status.c 1996/10/21 12:26:41 1.31
--- mod_status.c 1996/10/23 13:15:26 1.32
***************
*** 406,412 ****
if(no_table_report)
rputs("<p><hr><h2>Server Details</h2>\n\n",r);
else
! rputs("<p>\n\n<table
border=0><tr><th>Srv<th>PID<th>Acc<th>M<th>CPU\n<th>SS<th>Ptime<th>Conn<th>Child<th>Slot<th>Host<th>Request</tr>\n\n",r);
for (i = 0; i<HARD_SERVER_LIMIT; ++i)
--- 406,412 ----
if(no_table_report)
rputs("<p><hr><h2>Server Details</h2>\n\n",r);
else
! rputs("<p>\n\n<table
border=0><tr><th>Srv<th>PID<th>Acc<th>M<th>CPU\n<th>SS<th>Ptime<th>Conn<th>Child<th>Slot<th>Host<th>VHost<th>Request</tr>\n\n",r);
for (i = 0; i<HARD_SERVER_LIMIT; ++i)
***************
*** 513,520 ****
rprintf(r,"<td>%-1.1f<td>%-2.2f<td>%-2.2f\n",
(float)conn_bytes/KBYTE, (float)my_bytes/MBYTE,
(float)bytes/MBYTE);
! rprintf(r,"<td>%s<td nowrap>%s</tr>\n\n",
! score_record.client, score_record.request);
} /* no_table_report */
} /* !short_report */
} /* if (<active child>) */
--- 513,521 ----
rprintf(r,"<td>%-1.1f<td>%-2.2f<td>%-2.2f\n",
(float)conn_bytes/KBYTE, (float)my_bytes/MBYTE,
(float)bytes/MBYTE);
! rprintf(r,"<td>%s<td nowrap>%s<td nowrap>%s</tr>\n\n",
! score_record.client, score_record.vhost,
! score_record.request);
} /* no_table_report */
} /* !short_report */
} /* if (<active child>) */
1.78 +4 -1 apache/src/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -C3 -r1.77 -r1.78
*** http_main.c 1996/10/22 18:54:03 1.77
--- http_main.c 1996/10/23 13:15:26 1.78
***************
*** 50,56 ****
*
*/
! /* $Id: http_main.c,v 1.77 1996/10/22 18:54:03 brian Exp $ */
/*
* httpd.c: simple http daemon for answering WWW file requests
--- 50,56 ----
*
*/
! /* $Id: http_main.c,v 1.78 1996/10/23 13:15:26 mjc Exp $ */
/*
* httpd.c: simple http daemon for answering WWW file requests
***************
*** 789,794 ****
--- 789,797 ----
slot_size = sizeof(new_score_rec.request) - 1;
strncpy(new_score_rec.request, (r->the_request ? r->the_request :
"NULL"), slot_size);
+ new_score_rec.request[slot_size] = '\0';
+ slot_size = sizeof(new_score_rec.vhost) - 1;
+ strncpy(new_score_rec.vhost,r->server->server_hostname, slot_size);
new_score_rec.request[slot_size] = '\0';
}
#endif
