jim 98/05/08 15:06:10
Modified: src/main http_main.c
Log:
Keep SERVER_SUBVERSION available
Revision Changes Path
1.337 +3 -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.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- http_main.c 1998/05/08 15:57:28 1.336
+++ http_main.c 1998/05/08 22:06:08 1.337
@@ -391,10 +391,10 @@
static void ap_set_version()
{
if (ap_note_platform) {
- ap_add_version_component(SERVER_BASEVERSION " (" PLATFORM ")");
+ ap_add_version_component(SERVER_VERSION " (" PLATFORM ")");
}
else {
- ap_add_version_component(SERVER_BASEVERSION);
+ ap_add_version_component(SERVER_VERSION);
}
version_locked++;
}
@@ -3012,14 +3012,10 @@
static void show_compile_settings(void)
{
-#ifdef SERVER_SUBVERSION
printf("Server base version: %s\n", SERVER_BASEVERSION);
printf("Server sub-version: %s\n", SERVER_SUBVERSION);
+ printf("Server Full version: %s\n", ap_get_server_version());
printf("Server built: %s\n", ap_get_server_built());
-#else
- printf("Server version: %s\n", ap_get_server_version());
- printf("Server built: %s\n", ap_get_server_built());
-#endif
printf("Server's Module Magic Number: %u\n", MODULE_MAGIC_NUMBER);
printf("Server compiled with....\n");
#ifdef BIG_SECURITY_HOLE
