Mailing List Archive

coar 98/05/08 16:58:37

Modified: src/main http_main.c
Log:
- Fix type of cleanup routines being registered (Ben Hyde spotted)
- Make sure that the "(platform)" comment (if enabled) appears at
a known location in the server version (right after the base
version string).

Revision Changes Path
1.339 +7 -4 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.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- http_main.c 1998/05/08 23:08:51 1.338
+++ http_main.c 1998/05/08 23:58:36 1.339
@@ -370,8 +370,8 @@
* pointer on pool destruction.
*/
if (server_version == NULL) {
- ap_register_cleanup(pconf, NULL, reset_version,
- ap_null_cleanup);
+ ap_register_cleanup(pconf, NULL, (void (*)(void *))reset_version,
+ (void (*)(void *))ap_null_cleanup);
server_version = ap_pstrdup(pconf, component);
}
else {
@@ -390,11 +390,14 @@
*/
static void ap_set_version()
{
+#ifdef SERVER_SUBVERSION
+ ap_add_version_component(SERVER_SUBVERSION);
+#endif
if (ap_note_platform) {
- ap_add_version_component(SERVER_VERSION " (" PLATFORM ")");
+ ap_add_version_component(SERVER_BASEVERSION " (" PLATFORM ")");
}
else {
- ap_add_version_component(SERVER_VERSION);
+ ap_add_version_component(SERVER_BASEVERSION);
}
version_locked++;
}