jim 98/08/11 13:28:27
Modified: src CHANGES
src/main http_main.c
src/modules/standard mod_status.c
Log:
Following rude orders
Revision Changes Path
1.1020 +1 -1 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1019
retrieving revision 1.1020
diff -u -r1.1019 -r1.1020
--- CHANGES 1998/08/11 18:08:25 1.1019
+++ CHANGES 1998/08/11 20:28:17 1.1020
@@ -1,7 +1,7 @@
Changes with Apache 1.3.2
*) When READing a request in ExtendedStatus mode, the "old"
- vhost, request and client information is cleared out.
+ vhost, request and client information is not displayed.
[Jim Jagielski]
*) STATUS is no longer available. Full status information now
1.384 +0 -7 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- http_main.c 1998/08/11 18:08:27 1.383
+++ http_main.c 1998/08/11 20:28:22 1.384
@@ -1993,13 +1993,6 @@
sizeof(ss->request));
}
ap_cpystrn(ss->vhost, r->server->server_hostname,
sizeof(ss->vhost));
- } else if (status == SERVER_BUSY_READ) {
- /*
- * When reading a "new" request, we don't want to show the old
- * info since that's confusing... so NULL it out quickly since
- * we want to hurry up and read the request.
- */
- *ss->vhost = *ss->request = *ss->client = '\0';
}
}
put_scoreboard_info(child_num, ss);
1.95 +8 -3 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.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- mod_status.c 1998/08/11 15:37:53 1.94
+++ mod_status.c 1998/08/11 20:28:26 1.95
@@ -636,9 +636,14 @@
ap_rprintf(r, "<td>%-1.1f<td>%-2.2f<td>%-2.2f\n",
(float) conn_bytes / KBYTE, (float) my_bytes / MBYTE,
(float) bytes / MBYTE);
- ap_rprintf(r, "<td>%s<td nowrap>%s<td
nowrap>%s</tr>\n\n",
- score_record.client, score_record.vhost,
- ap_escape_html(r->pool, score_record.request));
+ if (score_record.status == SERVER_BUSY_READ)
+ ap_rprintf(r,
+ "<td>?<td nowrap>?<td nowrap>..reading..
</tr>\n\n");
+ else
+ ap_rprintf(r,
+ "<td>%s<td nowrap>%s<td nowrap>%s</tr>\n\n",
+ score_record.client, score_record.vhost,
+ ap_escape_html(r->pool, score_record.request));
} /* no_table_report */
} /* !short_report */
} /* if (<active child>) */
