svn commit: r1416746 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS server/core.c

[co...@apache.org]

Author: covener
Date: Tue Dec  4 02:20:17 2012
New Revision: 1416746

URL: http://svn.apache.org/viewvc?rev=1416746&view=rev
Log:
Merge r1415008, r1416150 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

PR54222: catch invalid ServerTokens args

Submitted by: Jackie Zhang  <jackie.qq.zhang gmail.com>
Reviewed/modified by: covener



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

Remove some trailing whitespace.


Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/server/core.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1415008,1416150

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1416746&r1=1416745&r2=1416746&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Dec  4 02:20:17 2012
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.4
 
+  *) core: Fail startup if the argument to ServerTokens is unrecognized.
+     [Jackie Zhang  <jackie.qq.zhang gmail.com>]
+
   *) mod_log_forensic: Don't log a spurious "-" if a request has been rejected
      before mod_log_forensic could attach its id to it. [Stefan Fritsch]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1416746&r1=1416745&r2=1416746&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Dec  4 02:20:17 2012
@@ -97,15 +97,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       2.4.x patch: http://people.apache.org/~jailletc36/backport_mod_dumpio.patch
       +1: jailletc36, sf, druggeri
      
-    * core: fail startup if ServerTokens arg is unrecognized, PR54222
-      trunk patch: http://svn.apache.org/viewvc?rev=1415008&view=rev
-                   http://svn.apache.org/viewvc?rev=1416150&view=rev
-      2.4.x patch: trunk works
-      +1: covener, sf, druggeri
-          Is fail startup okay? What about warn and set to PROD? 
-      sf: I think that's ok. It will be immediately obvious after upgrade and
-          is easy to fix in the configuration.
- 
     * core: Accept "Include /some/dir" without wildcards as documented, 
             regression from 2.2.x.  PR54223
       trunk patch: http://svn.apache.org/viewvc?rev=1415023&view=rev

Modified: httpd/httpd/branches/2.4.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?rev=1416746&r1=1416745&r2=1416746&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core.c (original)
+++ httpd/httpd/branches/2.4.x/server/core.c Tue Dec  4 02:20:17 2012
@@ -3222,9 +3222,12 @@ static const char *set_serv_tokens(cmd_p
     else if (!strcasecmp(arg1, "Prod") || !strcasecmp(arg1, "ProductOnly")) {
         ap_server_tokens = SrvTk_PRODUCT_ONLY;
     }
-    else {
+    else if (!strcasecmp(arg1, "Full")) {
         ap_server_tokens = SrvTk_FULL;
     }
+    else {
+        return "ServerTokens takes 1 argument, 'Prod', 'Major', 'Minor', 'Min', 'OS', or 'Full'";
+    }
 
     return NULL;
 }