cvs commit: apache-1.3 STATUS
manoj 98/10/27 16:13:31 Modified:.STATUS Log: Add Win32 strftime patch, and remove old scoreboard patch which has been replaced. Revision ChangesPath 1.522 +5 -13 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.521 retrieving revision 1.522 diff -u -u -r1.521 -r1.522 --- STATUS1998/10/27 15:19:11 1.521 +++ STATUS1998/10/28 00:13:30 1.522 @@ -69,6 +69,11 @@ Available Patches: +* Manoj and Ken Parzygnat's PATCH to support %-expandos from Unix + on Win32 +Message-ID: [EMAIL PROTECTED] +Status: + * Harrie Hazewinkle's PATCH scoreboard to include server_rec * Message-ID: [EMAIL PROTECTED] Status: Ralf +1 @@ -93,19 +98,6 @@ Mesage-ID: PR#3246, also available at http://www.physics.mcgill.ca/~juan/mod_include.patch Status: Ken -0 for 1.3/+0 for 2.0 - -* Harrie Hazewinkel's PATCH scoreboard - This is a patch that changes the 'vhost'-name (type char [32]) - in the scoreboard into a 'vhost'-number (type int), and then uses a - lookup table to display the server name. -Message-ID: [EMAIL PROTECTED] -Status: Roy (untested +1) - Dean -1: I see no need to add a new virtual host number to the - server guts... although I can understand why it's nice for - SNMP. However I'd be totally for a patch which places - server_rec * into the scoreboard in place of the name - -- because the pointers are valid across parent and - children... why waste the time doing number lookups and such. * Manoj's [PATCH] mime.types update Message-ID: [EMAIL PROTECTED]
cvs commit: apache-1.3 STATUS
jim 98/10/27 17:06:12 Modified:.STATUS Log: Looks like enough votes... who wants to commit? Revision ChangesPath 1.523 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.522 retrieving revision 1.523 diff -u -r1.522 -r1.523 --- STATUS1998/10/28 00:13:30 1.522 +++ STATUS1998/10/28 01:06:08 1.523 @@ -76,7 +76,7 @@ * Harrie Hazewinkle's PATCH scoreboard to include server_rec * Message-ID: [EMAIL PROTECTED] - Status: Ralf +1 + Status: Ralf +1, Dean +1, Jim +1 (with variable name change) * Ron Record's patch to port Apache to UnixWare 7 (forwarded by Randy).
cvs commit: apache-1.3/src/modules/standard mod_status.c
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 ChangesPath
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
--- STATUS1998/10/28 01:06:08 1.523
+++ STATUS1998/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%std nowrap%std 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 */
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 98/10/28 07:01:19 Modified:src/support apxs.pl src/modules/standard mod_rewrite.c Log: Fix hook order in mod_rewrite's and apxs's module structure _comments_. The poor man who discovered this bug after he was already totally confused was Lincoln Stein [EMAIL PROTECTED]. Thanks for sharing your confusion, Lincoln. Revision ChangesPath 1.11 +2 -2 apache-1.3/src/support/apxs.pl Index: apxs.pl === RCS file: /export/home/cvs/apache-1.3/src/support/apxs.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- apxs.pl 1998/08/03 08:44:08 1.10 +++ apxs.pl 1998/10/28 15:01:17 1.11 @@ -599,11 +599,11 @@ NULL, /* [#1] URI to filename translation*/ NULL, /* [#4] validate user id from request */ NULL, /* [#5] check if the user is ok _here_ */ -NULL, /* [#2] check access by host address */ +NULL, /* [#3] check access by host address */ NULL, /* [#6] determine MIME type*/ NULL, /* [#7] pre-run fixups */ NULL, /* [#9] log a transaction */ -NULL, /* [#3] header parser */ +NULL, /* [#2] header parser */ NULL, /* child_init */ NULL, /* child_exit */ NULL /* [#0] post read-request */ 1.131 +2 -2 apache-1.3/src/modules/standard/mod_rewrite.c Index: mod_rewrite.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- mod_rewrite.c 1998/08/25 09:15:39 1.130 +++ mod_rewrite.c 1998/10/28 15:01:18 1.131 @@ -192,11 +192,11 @@ hook_uri2file, /* [#1] URI to filename translation*/ NULL,/* [#4] validate user id from request */ NULL,/* [#5] check if the user is ok _here_ */ - NULL,/* [#2] check access by host address */ + NULL,/* [#3] check access by host address */ hook_mimetype, /* [#6] determine MIME type*/ hook_fixup, /* [#7] pre-run fixups */ NULL,/* [#9] log a transaction */ - NULL,/* [#3] header parser */ + NULL,/* [#2] header parser */ init_child, /* child_init */ NULL,/* child_exit */ NULL /* [#0] post read-request */
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
martin 98/10/28 11:34:00
Modified:src CHANGES
src/modules/standard mod_autoindex.c
Log:
For files where the last modified time stamp was unavailable (e.g., broken
symlinks), an empty string was printed which was 2 bytes short.
The size and description columns were therefore not aligned correctly.
(This is a remainder of the %y to %Y fix: the two missing spaces are
for the century)
Revision ChangesPath
1.1128+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1127
retrieving revision 1.1128
diff -u -r1.1127 -r1.1128
--- CHANGES 1998/10/28 19:26:29 1.1127
+++ CHANGES 1998/10/28 19:33:52 1.1128
@@ -1,5 +1,10 @@
Changes with Apache 1.3.4
+ *) Fix in mod_autoindex: for files where the last modified time stamp was
+ unavailable, an empty string was printed which was 2 bytes short.
+ The size and description columns were therefore not aligned correctly.
+ [Martin Kraemer] (no PR#)
+
*) Update BS2000 OS code to work with recent versions. Starting with
release A17, the child fork() must be replaced by a _rfork().
(BS2000 only) [Martin Kraemer]
1.98 +2 -1 apache-1.3/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- mod_autoindex.c 1998/10/17 14:17:10 1.97
+++ mod_autoindex.c 1998/10/28 19:33:57 1.98
@@ -1176,7 +1176,8 @@
ap_rputs(time_str, r);
}
else {
- ap_rputs( , r);
+ /*Length=22-Feb-1998 23:42 (see 4 lines above) */
+ ap_rputs( , r);
}
}
if (!(autoindex_opts SUPPRESS_SIZE)) {
cvs commit: apache-1.3/conf httpd.conf-dist
manoj 98/10/28 14:04:10 Modified:conf httpd.conf-dist Log: ExtendedStatus cannot be enabled until the status module is loaded, so move the commented directive after DSO modules are loaded. Revision ChangesPath 1.33 +7 -7 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.32 retrieving revision 1.33 diff -u -u -r1.32 -r1.33 --- httpd.conf-dist 1998/10/22 20:56:51 1.32 +++ httpd.conf-dist 1998/10/28 22:04:09 1.33 @@ -98,13 +98,6 @@ #AccessConfig conf/access.conf # -# ExtendedStatus controls whether Apache will generate full status -# information (ExtendedStatus On) or just basic information (ExtendedStatus -# Off) when the server-status handler is called. The default is Off. -# -#ExtendedStatus On - -# # Timeout: The number of seconds before receives and sends time out. # Timeout 300 @@ -202,6 +195,13 @@ # # Example: # LoadModule foo_module libexec/mod_foo.so + +# +# ExtendedStatus controls whether Apache will generate full status +# information (ExtendedStatus On) or just basic information (ExtendedStatus +# Off) when the server-status handler is called. The default is Off. +# +#ExtendedStatus On ### Section 2: 'Main' server configuration #
