From: Stefan Fritsch <sf@apache.org>
Date: Sun, 2 Dec 2012 10:33:27 +0000 (+0000)
Subject: Sort error message for ServerTokens by increasing verbosity. Add missing 'OS'
X-Git-Tag: 2.5.0-alpha~6072
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a6add5f37b843cd67a6624ef452c6e7f5a10462;p=thirdparty%2Fapache%2Fhttpd.git

Sort error message for ServerTokens by increasing verbosity. Add missing 'OS'
variant.

Remove some trailing whitespace.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1416150 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/core.c b/server/core.c
index 65bdff0de86..279e3e3bd4e 100644
--- a/server/core.c
+++ b/server/core.c
@@ -3234,11 +3234,11 @@ static const char *set_serv_tokens(cmd_parms *cmd, void *dummy,
     else if (!strcasecmp(arg1, "Prod") || !strcasecmp(arg1, "ProductOnly")) {
         ap_server_tokens = SrvTk_PRODUCT_ONLY;
     }
-    else if (!strcasecmp(arg1, "Full")) { 
+    else if (!strcasecmp(arg1, "Full")) {
         ap_server_tokens = SrvTk_FULL;
     }
-    else { 
-        return "ServerTokens takes 1 argument, 'Min', 'Major', 'Minor', 'Prod', or 'Full'";
+    else {
+        return "ServerTokens takes 1 argument, 'Prod', 'Major', 'Minor', 'Min', 'OS', or 'Full'";
     }
 
     return NULL;