mirror of
https://github.com/apache/httpd.git
synced 2025-11-05 05:30:39 +03:00
new option to ServerTokens. "Maj[or]" which displays a server response
similar to Apache/2.0 Also surfaced the directive in the standard config, defaulting to FULL git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96500 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -2286,9 +2286,10 @@ static char *server_version = NULL;
|
||||
static int version_locked = 0;
|
||||
|
||||
enum server_token_type {
|
||||
SrvTk_MIN, /* eg: Apache/1.3.0 */
|
||||
SrvTk_OS, /* eg: Apache/1.3.0 (UNIX) */
|
||||
SrvTk_FULL, /* eg: Apache/1.3.0 (UNIX) PHP/3.0 FooBar/1.2b */
|
||||
SrvTk_MAJ, /* eg: Apache/2.0 */
|
||||
SrvTk_MIN, /* 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 */
|
||||
};
|
||||
static enum server_token_type ap_server_tokens = SrvTk_FULL;
|
||||
@@ -2342,6 +2343,9 @@ static void ap_set_version(apr_pool_t *pconf)
|
||||
else if (ap_server_tokens == SrvTk_MIN) {
|
||||
ap_add_version_component(pconf, AP_SERVER_BASEVERSION);
|
||||
}
|
||||
else if (ap_server_tokens == SrvTk_MAJ) {
|
||||
ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT "/" AP_SERVER_MAJORVERSION);
|
||||
}
|
||||
else {
|
||||
ap_add_version_component(pconf, AP_SERVER_BASEVERSION " (" PLATFORM ")");
|
||||
}
|
||||
@@ -2370,6 +2374,9 @@ static const char *set_serv_tokens(cmd_parms *cmd, void *dummy,
|
||||
else if (!strcasecmp(arg, "Min") || !strcasecmp(arg, "Minimal")) {
|
||||
ap_server_tokens = SrvTk_MIN;
|
||||
}
|
||||
else if (!strcasecmp(arg, "Maj") || !strcasecmp(arg, "Major")) {
|
||||
ap_server_tokens = SrvTk_MAJ;
|
||||
}
|
||||
else if (!strcasecmp(arg, "Prod") || !strcasecmp(arg, "ProductOnly")) {
|
||||
ap_server_tokens = SrvTk_PRODUCT_ONLY;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user