You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Raymond S Brand <rs...@rsbx.net> on 1999/04/27 21:22:33 UTC
[PATCH] Fix ServerSignature to work as documented.
The following patch fixes the ServerSignature directive to work as documented.
The problem was that merge_core_dir_configs() was not merging the signature
state variable, (core_dir_config *)->server_signature.
Now permitted in .htaccess files as documented.
PR#s affected:
4248
Raymond S Brand
Re: [PATCH] Fix ServerSignature to work as documented.
Posted by Tony Finch <do...@dotat.at>.
Jim Jagielski <ji...@devsys.jaguNET.com> wrote:
>This is reversed, no?
Oops, yes, but patch will ask and then do the right thing :-)
I agree with Martin that it's a somewhat questionable change, which is
why I'm not actually using it on my servers (I was going to wait and
see what AG chose to do with the patch). I brought it up again because
the reaction last time was vaguely positive but it wasn't committed.
Tony.
--
f.a.n.finch dot@dotat.at fanf@demon.net
Arthur: "Oh, that sounds better, have you worked out the controls?"
Ford: "No, we just stopped playing with them."
Re: [PATCH] Fix ServerSignature to work as documented.
Posted by Martin Kraemer <Ma...@mch.sni.de>.
On Wed, Apr 28, 1999 at 02:17:17PM +0100, Tony Finch wrote:
>
> That reminds me -- ap_psignature still doesn't use ap_get_server_version().
> With any luck the patch below will apply cleanly :-)
>
That's still intentional. I don't want the client (browser) to see the
whole list of compiled-in extra features (apache, mod_ssl, openssl,
mod_php, mod_perl) at the base of all server generated pages. The user
has absolutely enough info if she knows that an apache server was
involved.
Honestly, I don't want to sound picky (or overemphasize the importance
of apache over the extra modules), but I tried it and it looks terrible.
Plus it makes it hard to find the *important* information (server XX at port YY)
Therefore, I still am -1 for this change.
Martin
--
<Ma...@MchP.Siemens.De> | Siemens Information and
Phone: +49-89-636-46021 | Communication Products
FAX: +49-89-636-47816 | 81730 Munich, Germany
Re: [PATCH] Fix ServerSignature to work as documented.
Posted by Tony Finch <do...@dotat.at>.
Martin Kraemer <Ma...@mch.sni.de> wrote:
>Raymond S Brand wrote:
>>
>> The following patch fixes the ServerSignature directive to work as
>> documented.
>
>Thanks a lot. Committed.
That reminds me -- ap_psignature still doesn't use ap_get_server_version().
With any luck the patch below will apply cleanly :-)
Tony.
--
f.a.n.finch dot@dotat.at fanf@demon.net
Arthur: "Oh, that sounds better, have you worked out the controls?"
Ford: "No, we just stopped playing with them."
Index: src/www/apache_1-3_fanf/src/main/http_core.c
diff -u src/www/apache_1-3_fanf/src/main/http_core.c:1.25.2.1 src/www/apache_1-3_fanf/src/main/http_core.c:1.25
--- src/www/apache_1-3_fanf/src/main/http_core.c:1.25.2.1 Fri Mar 26 14:14:54 1999
+++ src/www/apache_1-3_fanf/src/main/http_core.c Fri Mar 26 13:25:45 1999
@@ -2513,13 +2513,13 @@
ap_snprintf(sport, sizeof sport, "%u", (unsigned) ap_get_server_port(r));
if (conf->server_signature == srv_sig_withmail) {
- return ap_pstrcat(r->pool, prefix, "<ADDRESS>", ap_get_server_version(),
+ return ap_pstrcat(r->pool, prefix, "<ADDRESS>" SERVER_BASEVERSION
" Server at <A HREF=\"mailto:",
r->server->server_admin, "\">",
ap_get_server_name(r), "</A> Port ", sport,
"</ADDRESS>\n", NULL);
}
- return ap_pstrcat(r->pool, prefix, "<ADDRESS>", ap_get_server_version(),
+ return ap_pstrcat(r->pool, prefix, "<ADDRESS>" SERVER_BASEVERSION
" Server at ", ap_get_server_name(r), " Port ", sport,
"</ADDRESS>\n", NULL);
}
Re: [PATCH] Fix ServerSignature to work as documented.
Posted by Martin Kraemer <Ma...@mch.sni.de>.
On Tue, Apr 27, 1999 at 03:22:33PM -0400, Raymond S Brand wrote:
> The following patch fixes the ServerSignature directive to work as documented.
Thanks a lot. Committed.
Martin
--
<Ma...@MchP.Siemens.De> | Siemens Information and
Phone: +49-89-636-46021 | Communication Products
FAX: +49-89-636-47816 | 81730 Munich, Germany