Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1416150 - /httpd/httpd/trunk/server/core.c
Date: Sun, 02 Dec 2012 10:33:28 -0000
To: cvs@httpd.apache.org
From: sf@apache.org
Message-Id: <20121202103328.EC9E423889FD@eris.apache.org>

Author: sf
Date: Sun Dec  2 10:33:27 2012
New Revision: 1416150

URL: http://svn.apache.org/viewvc?rev=1416150&view=rev
Log:
Sort error message for ServerTokens by increasing verbosity. Add missing 'OS'
variant.

Remove some trailing whitespace.

Modified:
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1416150&r1=1416149&r2=1416150&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Sun Dec  2 10:33:27 2012
@@ -3234,11 +3234,11 @@ static const char *set_serv_tokens(cmd_p
     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;