jim 98/10/28 05:02:40
Modified: . STATUS
src CHANGES
src/include scoreboard.h
src/main http_main.c
src/modules/standard mod_status.c
Log:
Submitted by: Harrie Hazewinkel <[EMAIL PROTECTED]>
Reviewed by: Ralf S. Engelschall, Dean Gaudet, Jim Jagielski
Remove the vhost name string copy in the scoreboard information. Instead
of copying the string, copy a pointer to the server_rec for this vhost
and request.
Revision Changes Path
1.524 +0 -4 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- STATUS 1998/10/28 01:06:08 1.523
+++ STATUS 1998/10/28 13:02:35 1.524
@@ -74,10 +74,6 @@
Message-ID: <[EMAIL PROTECTED]>
Status:
- * Harrie Hazewinkle's PATCH scoreboard to include server_rec *
- Message-ID: <[EMAIL PROTECTED]>
- Status: Ralf +1, Dean +1, Jim +1 (with variable name change)
-
* Ron Record's patch to port Apache to UnixWare 7 (forwarded by
Randy).
Message-ID: <[EMAIL PROTECTED]>
1.1126 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1125
retrieving revision 1.1126
diff -u -r1.1125 -r1.1126
--- CHANGES 1998/10/27 10:20:00 1.1125
+++ CHANGES 1998/10/28 13:02:35 1.1126
@@ -1,5 +1,10 @@
Changes with Apache 1.3.4
+ *) Add the actual server_rec structure of the specific Vhost to the
+ scoreboard file and avoid a string copy (as well as allow some
+ further future enhancements). [Harrie Hazewinkel
+ <[EMAIL PROTECTED]>]
+
*) Add APACI --permute-module=foo:bar option which can be used to
on-the-fly/batch permute the order of two modules (mod_foo and mod_bar)
in the Configuration[.apaci] file. Two special and important variants
are
1.42 +1 -1 apache-1.3/src/include/scoreboard.h
Index: scoreboard.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/scoreboard.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- scoreboard.h 1998/08/11 00:09:43 1.41
+++ scoreboard.h 1998/10/28 13:02:37 1.42
@@ -130,7 +130,7 @@
#endif
char client[32]; /* Keep 'em small... */
char request[64]; /* We just want an idea... */
- char vhost[32]; /* What virtual host is being accessed? */
+ server_rec *vhostrec; /* What virtual host is being accessed? */
} short_score;
typedef struct {
1.403 +1 -1 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.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- http_main.c 1998/10/26 21:27:40 1.402
+++ http_main.c 1998/10/28 13:02:38 1.403
@@ -2055,7 +2055,7 @@
r->assbackwards ? NULL : " ",
r->protocol, NULL),
sizeof(ss->request));
}
- ap_cpystrn(ss->vhost, r->server->server_hostname,
sizeof(ss->vhost));
+ ss->vhostrec = r->server;
}
}
put_scoreboard_info(child_num, ss);
1.100 +2 -1 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.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- mod_status.c 1998/10/03 15:24:51 1.99
+++ mod_status.c 1998/10/28 13:02:39 1.100
@@ -652,7 +652,8 @@
else
ap_rprintf(r,
"<td>%s<td nowrap>%s<td nowrap>%s</tr>\n\n",
- score_record.client, score_record.vhost,
+ score_record.client,
+ score_record.vhostrec->server_hostname,
ap_escape_html(r->pool, score_record.request));
} /* no_table_report */
} /* !short_report */
