coar 98/05/08 21:42:30
Modified: htdocs/manual new_features_1_3.html upgrading_to_1_3.html htdocs/manual/mod core.html src/main http_core.c http_main.c Log: Final touches on removing the AddVersionComponent directive and correcting my BD references to something called "Server-Version." D'oh! Revision Changes Path 1.57 +8 -10 apache-1.3/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html =================================================================== RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- new_features_1_3.html 1998/05/08 12:09:45 1.56 +++ new_features_1_3.html 1998/05/09 04:42:25 1.57 @@ -639,17 +639,15 @@ configuration. </li> <LI><A - HREF="mod/core.html#addversioncomponent" - ><STRONG>New ways to customise the server identity</STRONG></A> + HREF="mod/core.html#addversionplatform" + ><STRONG>Including the operating system in the server + identity</STRONG></A> <BR> - Two new directives, <SAMP>AddVersionComponent</SAMP> and - <SAMP>AddVersionPlatform</SAMP>, allow the Webmaster to change the value of - the <SAMP>Server-Version</SAMP> response header field which is sent back - to clients. <SAMP>AddVersionComponent</SAMP> replaces the - <CODE>-DSERVER_SUBVERSION=\"string\"</CODE> <SAMP>CCFLAGS</SAMP> mechanism - used in earlier versions of the Apache Web server, allowing the string to - be modified without having to recompile the server. And the - <SAMP>AddVersionPlatform</SAMP> directive controls whether the server will + A new directive, <SAMP>AddVersionPlatform</SAMP>, allows the Webmaster + to change the value of + the <SAMP>Server</SAMP> response header field which is sent back + to clients. The <SAMP>AddVersionPlatform</SAMP> directive controls + whether the server will include a non-specific note in the server identity about the type of operating system on which the server is running. As of Apache 1.3, this additional information is included by default. 1.22 +0 -1 apache-1.3/htdocs/manual/upgrading_to_1_3.html Index: upgrading_to_1_3.html =================================================================== RCS file: /export/home/cvs/apache-1.3/htdocs/manual/upgrading_to_1_3.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- upgrading_to_1_3.html 1998/05/07 14:28:42 1.21 +++ upgrading_to_1_3.html 1998/05/09 04:42:25 1.22 @@ -243,4 +243,3 @@ <!--#include virtual="footer.html" --> </BODY> </HTML> - 1.115 +3 -53 apache-1.3/htdocs/manual/mod/core.html Index: core.html =================================================================== RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- core.html 1998/05/08 12:09:46 1.114 +++ core.html 1998/05/09 04:42:27 1.115 @@ -24,7 +24,6 @@ <LI><A HREF="#accessconfig">AccessConfig</A> <LI><A HREF="#accessfilename">AccessFileName</A> <LI><A HREF="#addmodule">AddModule</A> -<LI><A HREF="#addversioncomponent">AddVersionComponent</A> <LI><A HREF="#addversionplatform">AddVersionPlatform</A> <LI><A HREF="#allowoverride">AllowOverride</A> <LI><A HREF="#authname">AuthName</A> @@ -180,55 +179,6 @@ be cleared with the <A HREF="#clearmodulelist">ClearModuleList</A> directive.<P><HR> -<H2><A name="addversioncomponent">AddVersionComponent directive</A></H2> -<!--%plaintext <?INDEX {\tt AddVersionComponent} directive> --> -<A - HREF="directive-dict.html#Syntax" - REL="Help" -><STRONG>Syntax:</STRONG></A> AddVersionComponent <EM>string</EM><BR> -<A - HREF="directive-dict.html#Context" - REL="Help" -><STRONG>Context:</STRONG></A> server config <BR> -<A - HREF="directive-dict.html#Status" - REL="Help" -><STRONG>Status:</STRONG></A> core<BR> -<A - HREF="directive-dict.html#Compatibility" - REL="Help" -><STRONG>Compatibility:</STRONG></A> AddVersionComponent is only available - in Apache 1.3 and later - -<P> -Use this directive to add a string to the <SAMP>Server-Version</SAMP> -response header field which is sent back to clients. This field identifies -the server software as the Apache Web server, and can also list additional -information. This directive may occur multiple times, and the results are -cumulative. In each case the string should take one of the following forms: -</P> -<DL> - <DD><CODE>AddVersionComponent "(some comment within parentheses)"</CODE> - <DL> - <DD><EM>or</EM> - </DD> - </DL> - <CODE>AddVersionComponent "component-name/major.minor"</CODE> - </DD> -</DL> -<P> -that is, the string should either be arbitrary text enclosed in parentheses, -or else a specific component token and version number (such as "mymod/1.0"). -</P> -<P> -This setting applies to the entire server, and cannot be enabled or -disabled on a virtualhost-by-virtualhost basis. -</P> -<P> -This directive replaces the <SAMP>SERVER_SUBVERSION</SAMP> setting -that was available in earlier versions of the Apache Web server. -</P><HR> - <H2><A name="addversionplatform">AddVersionPlatform directive</A></H2> <!--%plaintext <?INDEX {\tt AddVersionPlatform} directive> --> <A @@ -251,18 +201,18 @@ <P> This directive controls whether the server's operating system platform -will be identified in the <SAMP>Server-Version</SAMP> response header +will be identified in the <SAMP>Server</SAMP> response header field which is sent back to clients. If enabled, a non-specific platform designation will be added to the identity string, as shown below: </P> <DL> <DT><CODE>AddVersionPlatform Off</CODE> </DT> - <DD>Server sends: <SAMP>Server-Version: Apache/1.3.0</SAMP> + <DD>Server sends: <SAMP>Server: Apache/1.3.0</SAMP> </DD> <DT><CODE>AddVersionPlatform On</CODE> (or not specified) </DT> - <DD>Server sends: <SAMP>Server-Version: Apache/1.3.0 (UNIX)</SAMP> + <DD>Server sends: <SAMP>Server: Apache/1.3.0 (UNIX)</SAMP> </DD> </DL> <P> 1.198 +1 -1 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.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- http_core.c 1998/05/08 23:41:34 1.197 +++ http_core.c 1998/05/09 04:42:28 1.198 @@ -1872,7 +1872,7 @@ #endif /*_OSD_POSIX*/ /* - * Handle a request to include the server's OS platform in the Server-Version + * Handle a request to include the server's OS platform in the Server * response header field (the AddVersionPlatform directive). Unfortunately * this requires a new global in order to communicate the setting back to * http_main so it can insert the information in the right place in the 1.343 +1 -1 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.342 retrieving revision 1.343 diff -u -r1.342 -r1.343 --- http_main.c 1998/05/09 04:36:38 1.342 +++ http_main.c 1998/05/09 04:42:28 1.343 @@ -337,7 +337,7 @@ scoreboard *ap_scoreboard_image = NULL; /* - * Pieces for managing the contents of the Server-Version response header + * Pieces for managing the contents of the Server response header * field. */ static char *server_version = NULL;