The value emitted by ServerSignature now mimics the Server HTTP header as

controlled by ServerTokens.

Submitted by:	Francis Daly <deva@daoine.org>
Reviewed by:	Justin Erenkrantz

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

diff --git a/CHANGES b/CHANGES
index 022b7e0cdb89106852506c28113921285c9bc3ce..c32a70967e4c1fd37457d35e970276d2a3d75c47 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.44
 
+  *) The value emitted by ServerSignature now mimics the Server HTTP
+     header as controlled by ServerTokens.  [Francis Daly <deva@daoine.org>]
+
   *) Gracefully handly retry situations in the SSL input filter,
      by following the SSL libraries' retry semantics.
      [William Rowe]

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 43e25705fee4103980ce740e5cf5f46a88a96b71..0e44e9065f968d42072aad32c6acacd39bcbccf5 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2163,6 +2163,9 @@ is accessed by an incompatible browser</td></tr><tr><th><a href="directive-dict.
     and the <code>EMail</code> setting additionally creates a
     "mailto:" reference to the <code class="directive"><a href="#serveradmin">ServerAdmin</a></code> of the referenced
     document.</p>
+
+    <p>After version 2.0.44, the details of the server version number
+    presented are controlled by the ServerTokens directive.</p>
 <h3>See also</h3><ul><li><code class="directive"><a href="#servertokens">ServerTokens</a></code></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ServerTokens" id="ServerTokens">ServerTokens</a> <a name="servertokens" id="servertokens">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: 
               </a></th><td>Configures the Server HTTP response header</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
               </a></th><td><code>ServerTokens Major|Minor|Minimal|ProductOnly|OS|Full</code></td></tr><tr><th><a href="directive-dict.html#Default">Default: 
@@ -2209,6 +2212,9 @@ is accessed by an incompatible browser</td></tr><tr><th><a href="directive-dict.
 
     <p>This setting applies to the entire server, and cannot be
     enabled or disabled on a virtualhost-by-virtualhost basis.</p>
+
+    <p>After version 2.0.44, this directive also controls the
+    information presented by the ServerSignature directive.</p>
 <h3>See also</h3><ul><li><code class="directive"><a href="#serversignature">ServerSignature</a></code></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="SetHandler" id="SetHandler">SetHandler</a> <a name="sethandler" id="sethandler">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: 
               </a></th><td>Forces all matching files to be processed by a
 handler</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index b9cec21984dc94bd36dda01c89133b3c0ed8f80a..87a8b6e8c3b5966e948ee161ec016117f07bdebe 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2509,6 +2509,9 @@ is accessed by an incompatible browser</description>
     "mailto:" reference to the <directive
     module="core">ServerAdmin</directive> of the referenced
     document.</p>
+
+    <p>After version 2.0.44, the details of the server version number
+    presented are controlled by the ServerTokens directive.</p>
 </usage>
 <seealso><directive module="core">ServerTokens</directive></seealso>
 </directivesynopsis>
@@ -2560,6 +2563,9 @@ is accessed by an incompatible browser</description>
 
     <p>This setting applies to the entire server, and cannot be
     enabled or disabled on a virtualhost-by-virtualhost basis.</p>
+
+    <p>After version 2.0.44, this directive also controls the
+    information presented by the ServerSignature directive.</p>
 </usage>
 <seealso><directive module="core">ServerSignature</directive></seealso>
 </directivesynopsis>

diff --git a/server/core.c b/server/core.c
index b28b7cf40bb046a13466e1ab8dbf6575d5b38c2a..a59e7d6a1ff03bb921e4320668741a6b0c16fe01 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -2265,7 +2265,8 @@ AP_DECLARE(const char *) ap_psignature(const char *prefix, request_rec *r)
     apr_snprintf(sport, sizeof sport, "%u", (unsigned) ap_get_server_port(r));
 
     if (conf->server_signature == srv_sig_withmail) {
-        return apr_pstrcat(r->pool, prefix, "<address>" AP_SERVER_BASEVERSION
+        return apr_pstrcat(r->pool, prefix, "<address>", 
+                           ap_get_server_version(),
                            " Server at <a href=\"mailto:",
                            r->server->server_admin, "\">",
                            ap_escape_html(r->pool, ap_get_server_name(r)),
@@ -2273,7 +2274,7 @@ AP_DECLARE(const char *) ap_psignature(const char *prefix, request_rec *r)
                            "</address>\n", NULL);
     }
 
-    return apr_pstrcat(r->pool, prefix, "<address>" AP_SERVER_BASEVERSION
+    return apr_pstrcat(r->pool, prefix, "<address>", ap_get_server_version(),
                        " Server at ",
                        ap_escape_html(r->pool, ap_get_server_name(r)),
                        " Port ", sport,