Mailing List Archive

ben 98/05/09 08:54:40

Modified: src/main http_main.c
Log:
Report server version correctly on Win32.

Revision Changes Path
1.347 +10 -8 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.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- http_main.c 1998/05/09 15:49:34 1.346
+++ http_main.c 1998/05/09 15:54:38 1.347
@@ -5259,6 +5259,7 @@
ap_cpystrn(ap_server_confname, ap_os_canonical_filename(pconf, optarg), sizeof(ap_server_confname));
break;
case 'v':
+ ap_set_version();
printf("Server version: %s\n", ap_get_server_version());
printf("Server built: %s\n", ap_get_server_built());
exit(0);
@@ -5279,14 +5280,6 @@
}
}

-#ifdef __EMX__
- printf("%s \n", ap_get_server_version());
-#endif
-#ifdef WIN32
- if (!child) {
- printf("%s \n", ap_get_server_version());
- }
-#endif
if (!child && run_as_service) {
service_cd();
}
@@ -5298,6 +5291,15 @@
ap_set_version();
ap_open_logs(server_conf, pconf);
set_group_privs();
+
+#ifdef __EMX__
+ printf("%s \n", ap_get_server_version());
+#endif
+#ifdef WIN32
+ if (!child) {
+ printf("%s \n", ap_get_server_version());
+ }
+#endif

if (one_process && !exit_event)
exit_event = create_event(0, 0, NULL);