|
 |
bdaebd |
diff --git a/server/core.c b/server/core.c
|
|
|
bdaebd |
index cb8e463..daf76b3 100644
|
|
|
bdaebd |
--- a/server/core.c
|
|
|
bdaebd |
+++ b/server/core.c
|
|
|
bdaebd |
@@ -3430,6 +3430,7 @@ enum server_token_type {
|
|
|
bdaebd |
SrvTk_MINIMAL, /* eg: Apache/2.0.41 */
|
|
|
bdaebd |
SrvTk_OS, /* eg: Apache/2.0.41 (UNIX) */
|
|
|
bdaebd |
SrvTk_FULL, /* eg: Apache/2.0.41 (UNIX) PHP/4.2.2 FooBar/1.2b */
|
|
|
bdaebd |
+ SrvTk_FULL_RELEASE, /* eg: Apache/2.0.41 (UNIX) (Release 32.el7) PHP/4.2.2 FooBar/1.2b */
|
|
|
bdaebd |
SrvTk_PRODUCT_ONLY /* eg: Apache */
|
|
|
bdaebd |
};
|
|
|
bdaebd |
static enum server_token_type ap_server_tokens = SrvTk_FULL;
|
|
|
bdaebd |
@@ -3506,7 +3507,10 @@ static void set_banner(apr_pool_t *pconf)
|
|
|
bdaebd |
else if (ap_server_tokens == SrvTk_MAJOR) {
|
|
|
bdaebd |
ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT "/" AP_SERVER_MAJORVERSION);
|
|
|
bdaebd |
}
|
|
|
bdaebd |
- else {
|
|
|
bdaebd |
+ else if (ap_server_tokens == SrvTk_FULL_RELEASE) {
|
|
|
bdaebd |
+ ap_add_version_component(pconf, AP_SERVER_BASEVERSION " (" PLATFORM ") (Release @RELEASE@)");
|
|
|
bdaebd |
+ }
|
|
|
bdaebd |
+ else {
|
|
|
bdaebd |
ap_add_version_component(pconf, AP_SERVER_BASEVERSION " (" PLATFORM ")");
|
|
|
bdaebd |
}
|
|
|
bdaebd |
|
|
|
bdaebd |
@@ -3514,7 +3518,7 @@ static void set_banner(apr_pool_t *pconf)
|
|
|
bdaebd |
* Lock the server_banner string if we're not displaying
|
|
|
bdaebd |
* the full set of tokens
|
|
|
bdaebd |
*/
|
|
|
bdaebd |
- if (ap_server_tokens != SrvTk_FULL) {
|
|
|
bdaebd |
+ if (ap_server_tokens != SrvTk_FULL && ap_server_tokens != SrvTk_FULL_RELEASE) {
|
|
|
bdaebd |
banner_locked++;
|
|
|
bdaebd |
}
|
|
|
bdaebd |
server_description = AP_SERVER_BASEVERSION " (" PLATFORM ")";
|
|
|
bdaebd |
@@ -3547,8 +3551,11 @@ static const char *set_serv_tokens(cmd_parms *cmd, void *dummy,
|
|
|
bdaebd |
else if (!strcasecmp(arg, "Full")) {
|
|
|
bdaebd |
ap_server_tokens = SrvTk_FULL;
|
|
|
bdaebd |
}
|
|
|
bdaebd |
+ else if (!strcasecmp(arg, "Full-Release")) {
|
|
|
bdaebd |
+ ap_server_tokens = SrvTk_FULL_RELEASE;
|
|
|
bdaebd |
+ }
|
|
|
bdaebd |
else {
|
|
|
bdaebd |
- return "ServerTokens takes 1 argument: 'Prod(uctOnly)', 'Major', 'Minor', 'Min(imal)', 'OS', or 'Full'";
|
|
|
bdaebd |
+ return "ServerTokens takes 1 argument: 'Prod(uctOnly)', 'Major', 'Minor', 'Min(imal)', 'OS', 'Full' or 'Full-Release'";
|
|
|
bdaebd |
}
|
|
|
bdaebd |
|
|
|
bdaebd |
return NULL;
|