Mailing List Archive

jim 98/05/08 18:21:48

Modified: src/main http_main.c
Log:
Fix the order of how the server_version string is built... All extra
components are tacked to the _end_ of the string. The front of the
server_version string is always SERVER_BASEVERSION. So if we have

"Apache/1.3b7-dev (FreeBSD)"

and the code gets ap_add_version_component("PHP/3.0") we'd get:

"Apache/1.3b7-dev (FreeBSD) PHP/3.0"

Revision Changes Path
1.340 +4 -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.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- http_main.c 1998/05/08 23:58:36 1.339
+++ http_main.c 1998/05/09 01:21:47 1.340
@@ -378,7 +378,7 @@
/*
* Prepend the given component identifier to the existing string
*/
- server_version = ap_pstrcat(pconf, component, " ", server_version,
+ server_version = ap_pstrcat(pconf, server_version, " ", component,
NULL);
}
}
@@ -390,15 +390,15 @@
*/
static void ap_set_version()
{
-#ifdef SERVER_SUBVERSION
- ap_add_version_component(SERVER_SUBVERSION);
-#endif
if (ap_note_platform) {
ap_add_version_component(SERVER_BASEVERSION " (" PLATFORM ")");
}
else {
ap_add_version_component(SERVER_BASEVERSION);
}
+#ifdef SERVER_SUBVERSION
+ ap_add_version_component(SERVER_SUBVERSION);
+#endif
version_locked++;
}