VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-01 16:41:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Major/Minor/Min[imal]

Browse Source 
now working as one (with a sane mind) would thing it should


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96501 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ian Holsman
2002-08-23 18:05:38 +00:00
parent df6a0c3e94
commit a525e2a5ad
4 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/conf/httpd-std.conf.in
View File

@ -506,7 +506,7 @@ CustomLog @rel_logfiledir@/access_log common
# This directive configures what you return as the Server HTTP response
# Header. The default is 'Full' which sends information about the OS-Type
# and compiled in modules.
# Set to one of: Full | OS | Minor | Major | Prod
# Set to one of: Full | OS | Minor | Minimal | Major | Prod
# where Full conveys the most information, and Prod the least.
ServerTokens Full
#

9
docs/manual/mod/core.xml
View File

@ -2288,7 +2288,7 @@ is accessed by an incompatible browser</description>
<directivesynopsis>
<name>ServerTokens</name>
<description>Configures the Server HTTP response header</description>
<syntax>ServerTokens Major|Minimal|ProductOnly|OS|Full</syntax>
<syntax>ServerTokens Major|Minor|Minimal|ProductOnly|OS|Full</syntax>
<default>ServerTokens Full</default>
<contextlist><context>server config</context></contextlist>
@ -2304,7 +2304,12 @@ is accessed by an incompatible browser</description>
<dd>Server sends (<em>e.g.</em>): <code>Server:
Apache</code></dd>
<dt><code>ServerTokens Maj[or]</code></dt>
<dt><code>ServerTokens Major</code></dt>
<dd>Server sends (<em>e.g.</em>): <code>Server:
Apache/2</code></dd>
<dt><code>ServerTokens Minor</code></dt>
<dd>Server sends (<em>e.g.</em>): <code>Server:
Apache/2.0</code></dd>

8
include/ap_release.h
View File

@ -73,9 +73,11 @@
*/
#define AP_SERVER_BASEVENDOR "Apache Software Foundation"
#define AP_SERVER_BASEPRODUCT "Apache"
#define AP_SERVER_MAJORVERSION "2.0"
#define AP_SERVER_MINORVERSION "41-dev"
#define AP_SERVER_BASEREVISION AP_SERVER_MAJORVERSION "." AP_SERVER_MINORVERSION
#define AP_SERVER_MAJORVERSION "2"
#define AP_SERVER_MINORVERSION "0"
#define AP_SERVER_PATCHLEVEL "41-dev"
#define AP_SERVER_MINORREVISION AP_SERVER_MAJORVERSION "." AP_SERVER_MINORVERSION
#define AP_SERVER_BASEREVISION AP_SERVER_MINORREVISION "." AP_SERVER_PATCHLEVEL
#define AP_SERVER_BASEVERSION AP_SERVER_BASEPRODUCT "/" AP_SERVER_BASEREVISION
#define AP_SERVER_VERSION AP_SERVER_BASEVERSION

21
server/core.c
View File

@ -2286,8 +2286,9 @@ static char *server_version = NULL;
static int version_locked = 0;
enum server_token_type {
SrvTk_MAJ, /* eg: Apache/2.0 */
SrvTk_MIN, /* eg: Apache/2.0.41 */
SrvTk_MAJOR, /* eg: Apache/2 */
SrvTk_MINOR, /* eg. Apache/2.0 */
SrvTk_MINIMAL, /* eg: Apache/2.0.41 */
SrvTk_OS, /* eg: Apache/2.0.41 (UNIX) */
SrvTk_FULL, /* eg: Apache/2.0.41 (UNIX) PHP/4.2.2 FooBar/1.2b */
SrvTk_PRODUCT_ONLY /* eg: Apache */
@ -2340,10 +2341,13 @@ static void ap_set_version(apr_pool_t *pconf)
if (ap_server_tokens == SrvTk_PRODUCT_ONLY) {
ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT);
}
else if (ap_server_tokens == SrvTk_MIN) {
else if (ap_server_tokens == SrvTk_MINIMAL) {
ap_add_version_component(pconf, AP_SERVER_BASEVERSION);
}
else if (ap_server_tokens == SrvTk_MAJ) {
else if (ap_server_tokens == SrvTk_MINOR) {
ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT "/" AP_SERVER_MINORREVISION);
}
else if (ap_server_tokens == SrvTk_MAJOR) {
ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT "/" AP_SERVER_MAJORVERSION);
}
else {
@ -2372,10 +2376,13 @@ static const char *set_serv_tokens(cmd_parms *cmd, void *dummy,
ap_server_tokens = SrvTk_OS;
}
else if (!strcasecmp(arg, "Min") || !strcasecmp(arg, "Minimal")) {
ap_server_tokens = SrvTk_MIN;
ap_server_tokens = SrvTk_MINIMAL;
}
else if (!strcasecmp(arg, "Maj") || !strcasecmp(arg, "Major")) {
ap_server_tokens = SrvTk_MAJ;
else if (!strcasecmp(arg, "Major")) {
ap_server_tokens = SrvTk_MAJOR;
}
else if (!strcasecmp(arg, "Minor") ) {
ap_server_tokens = SrvTk_MINOR;
}
else if (!strcasecmp(arg, "Prod") || !strcasecmp(arg, "ProductOnly")) {
ap_server_tokens = SrvTk_PRODUCT_ONLY;