Mailing List Archive

coar 98/05/08 16:41:34

Modified: src CHANGES
src/main http_core.c
Log:
Back out the AddVersionComponent run-time configuration
directive.

Revision Changes Path
1.835 +7 -7 apache-1.3/src/CHANGES

Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.834
retrieving revision 1.835
diff -u -r1.834 -r1.835
--- CHANGES 1998/05/08 07:50:19 1.834
+++ CHANGES 1998/05/08 23:41:32 1.835
@@ -28,13 +28,13 @@
Makefille.<gnutriple> and directories src.<gnutriple>
[Ralf S. Engelschall]

- *) Added the AddVersionComponent and AddVersionPlatform core directives.
- The first allows the addition of arbitrary text to the Server-Version
- response header field value, augmenting the SERVER_SUBVERSION define in
- the Configuration file with run-time settings (more useful in
- a loadable-module environment). AddVersionPlatform inserts a comment
- such as "(UNIX)" or "(Win32)" into the server version string.
- [Ken Coar] PR#2056
+ *) Added the ap_add_version_component() API routine and the
+ AddVersionPlatform core directive. The first allows modules to
+ declare themselves in the Server response header field value,
+ augmenting the SERVER_SUBVERSION define in the Configuration file
+ with run-time settings (more useful in a loadable-module environment).
+ AddVersionPlatform inserts a comment such as "(UNIX)" or "(Win32)"
+ into the server version string. [Ken Coar] PR#2056

*) Minor stability tweaks to avoid core dumps in ap_snprintf.
[Martin Kraemer]



1.197 +1 -15 apache-1.3/src/main/http_core.c

Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- http_core.c 1998/05/08 11:27:51 1.196
+++ http_core.c 1998/05/08 23:41:34 1.197
@@ -1872,18 +1872,6 @@
#endif /*_OSD_POSIX*/

/*
- * Handle a request to add an arbitrary string to the Server-Version response
- * header field (the AddVersionComponent directive).
- */
-
-static const char *add_version_component(cmd_parms *cmd, void *mconfig,
- char *word1)
-{
- ap_add_version_component((const char *)word1);
- return NULL;
-}
-
-/*
* Handle a request to include the server's OS platform in the Server-Version
* response header field (the AddVersionPlatform directive). Unfortunately
* this requires a new global in order to communicate the setting back to
@@ -2038,10 +2026,8 @@
{ "BS2000AuthFile", set_bs2000_authfile, NULL, RSRC_CONF, TAKE1,
"server User's bs2000 logon password file (read-protected)" },
#endif
-{ "AddVersionComponent", add_version_component, NULL, RSRC_CONF, TAKE1,
- "String to be added to the Server-Version text" },
{ "AddVersionPlatform", enable_platform_announcement, NULL, RSRC_CONF, FLAG,
- "Set to 'on' to include server OS platform in Server-Version text" },
+ "Set to 'off' to not include server OS platform in Server identity text" },
{ NULL },
};