fanf 00/01/12 07:55:04
Modified: htdocs/manual/mod core.html
src CHANGES
src/include ap_mmn.h scoreboard.h
src/main http_main.c
src/modules/standard mod_status.c
Log:
Revert the scoreboard change because Jim doesn't like it.
Revision Changes Path
1.161 +1 -1 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===================================================================
RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- core.html 2000/01/12 01:18:07 1.160
+++ core.html 2000/01/12 15:54:46 1.161
@@ -3146,7 +3146,7 @@
that the client connected to in order to work out self-referential URLs.
This can have adverse performance implications, especially if you use
<CODE>%V</CODE> in a <A HREF="mod_log_config.html#customlog">CustomLog</A>
-directive or have <A HREF="mod_status.html">ExtendedStatus</A> on.
+directive.
<P><STRONG>Warning:</STRONG> if CGIs make assumptions about the values of
<CODE>SERVER_NAME</CODE> they may be broken by this option. The client
1.1497 +0 -5 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1496
retrieving revision 1.1497
diff -u -r1.1496 -r1.1497
--- CHANGES 2000/01/12 03:38:14 1.1496
+++ CHANGES 2000/01/12 15:54:51 1.1497
@@ -5,11 +5,6 @@
another 16 seconds beyond the initial SIGTERM waiting period.
[Ed Korthof]
- *) Revert to the 1.3.3 way of getting the server name from the
- scoreboard, with a modification to make it respect the
- UseCanonicalName setting. This makes things work better with
- mass vhosting setups. [Cliff Woolley <[EMAIL PROTECTED]>]
-
*) Add --suexec-umask option to configure, and severity levels
to suexec log messages. Also clarify a couple of those messages,
which were perhaps a bit too cryptic. [Ken Coar] PR#4178
1.43 +2 -4 apache-1.3/src/include/ap_mmn.h
Index: ap_mmn.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ap_mmn.h 2000/01/12 01:13:06 1.42
+++ ap_mmn.h 2000/01/12 15:54:56 1.43
@@ -226,16 +226,14 @@
* ap_base64encode_len(), ap_base64decode(),
* ap_base64decode_binary(), ap_base64decode_len(),
* ap_pbase64decode(), ap_pbase64encode()
- * (1.3.10-dev)
- * 20000112 - put the vhostname back into the scoreboard itself
*/
#define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */
#ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20000112
+#define MODULE_MAGIC_NUMBER_MAJOR 19990320
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR /* backward
compat */
/* Useful for testing for features. */
1.50 +0 -1 apache-1.3/src/include/scoreboard.h
Index: scoreboard.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/scoreboard.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- scoreboard.h 2000/01/12 01:13:09 1.49
+++ scoreboard.h 2000/01/12 15:54:56 1.50
@@ -160,7 +160,6 @@
char request[64]; /* We just want an idea... */
server_rec *vhostrec; /* What virtual host is being accessed? */
/* SEE ABOVE FOR SAFE USAGE! */
- char vhostname[32]; /* more useful status with mass vhosting */
} short_score;
typedef struct {
1.489 +0 -2 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- http_main.c 2000/01/12 03:38:19 1.488
+++ http_main.c 2000/01/12 15:54:58 1.489
@@ -2256,8 +2256,6 @@
sizeof(ss->request));
}
ss->vhostrec = r->server;
- ap_cpystrn(ss->vhostname, ap_get_server_name(r),
- sizeof(ss->vhostname));
}
}
if (status == SERVER_STARTING && r == NULL) {
1.110 +2 -2 apache-1.3/src/modules/standard/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mod_status.c 2000/01/12 01:13:34 1.109
+++ mod_status.c 2000/01/12 15:55:02 1.110
@@ -599,7 +599,7 @@
ap_rprintf(r, " <i>%s {%s}</i> <b>[%s]</b><br>\n\n",
score_record.client,
ap_escape_html(r->pool, score_record.request),
- vhost ? score_record.vhostname : "(unavailable)");
+ vhost ? vhost->server_hostname : "(unavailable)");
}
else { /* !no_table_report */
if (score_record.status == SERVER_DEAD)
@@ -672,7 +672,7 @@
ap_rprintf(r,
"<td>%s<td nowrap>%s<td nowrap>%s</tr>\n\n",
score_record.client,
- vhost ? score_record.vhostname : "(unavailable)",
+ vhost ? vhost->server_hostname : "(unavailable)",
ap_escape_html(r->pool, score_record.request));
} /* no_table_report */
} /* !short_report */
