You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2013/08/15 15:18:51 UTC
svn commit: r1514255 - /httpd/httpd/trunk/server/core.c
Author: trawick
Date: Thu Aug 15 13:18:50 2013
New Revision: 1514255
URL: http://svn.apache.org/r1514255
Log:
follow-up to r813376:
finish reverting r808965 (ServerTokens set foo)
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=1514255&r1=1514254&r2=1514255&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Thu Aug 15 13:18:50 2013
@@ -3304,7 +3304,7 @@ static void set_banner(apr_pool_t *pconf
}
static const char *set_serv_tokens(cmd_parms *cmd, void *dummy,
- const char *arg1, const char *arg2)
+ const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -3312,22 +3312,22 @@ static const char *set_serv_tokens(cmd_p
return err;
}
- if (!strcasecmp(arg1, "OS")) {
+ if (!strcasecmp(arg, "OS")) {
ap_server_tokens = SrvTk_OS;
}
- else if (!strcasecmp(arg1, "Min") || !strcasecmp(arg1, "Minimal")) {
+ else if (!strcasecmp(arg, "Min") || !strcasecmp(arg, "Minimal")) {
ap_server_tokens = SrvTk_MINIMAL;
}
- else if (!strcasecmp(arg1, "Major")) {
+ else if (!strcasecmp(arg, "Major")) {
ap_server_tokens = SrvTk_MAJOR;
}
- else if (!strcasecmp(arg1, "Minor") ) {
+ else if (!strcasecmp(arg, "Minor") ) {
ap_server_tokens = SrvTk_MINOR;
}
- else if (!strcasecmp(arg1, "Prod") || !strcasecmp(arg1, "ProductOnly")) {
+ else if (!strcasecmp(arg, "Prod") || !strcasecmp(arg, "ProductOnly")) {
ap_server_tokens = SrvTk_PRODUCT_ONLY;
}
- else if (!strcasecmp(arg1, "Full")) {
+ else if (!strcasecmp(arg, "Full")) {
ap_server_tokens = SrvTk_FULL;
}
else {
@@ -4153,7 +4153,7 @@ AP_INIT_TAKE_ARGV("LogLevelOverride", se
"Override LogLevel for clients with certain IPs"),
AP_INIT_TAKE1("NameVirtualHost", ap_set_name_virtual_host, NULL, RSRC_CONF,
"A numeric IP address:port, or the name of a host"),
-AP_INIT_TAKE12("ServerTokens", set_serv_tokens, NULL, RSRC_CONF,
+AP_INIT_TAKE1("ServerTokens", set_serv_tokens, NULL, RSRC_CONF,
"Determine tokens displayed in the Server: header - Min(imal), "
"Major, Minor, Prod, OS or Full"),
AP_INIT_TAKE1("LimitRequestLine", set_limit_req_line, NULL, RSRC_CONF,
Re: svn commit: r1514255 - /httpd/httpd/trunk/server/core.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Thu, Aug 15, 2013 at 11:02 AM, Igor Galić <i....@brainsware.org> wrote:
>
>
> ----- Original Message -----
> > Author: trawick
> > Date: Thu Aug 15 13:18:50 2013
> > New Revision: 1514255
> >
> > URL: http://svn.apache.org/r1514255
> > Log:
> > follow-up to r813376:
> >
> > finish reverting r808965 (ServerTokens set foo)
>
>
> huh? You're reverting the most sought after feature in httpd?
>
ha :)
Actually, when privately patching the feature back *in* I noticed that when
Jim left a few stray bits when he removed the feature many moons ago.
> --
> Igor Galić
>
> Tel: +43 (0) 664 886 22 883
> Mail: i.galic@brainsware.org
> URL: http://brainsware.org/
> GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE
>
>
--
Born in Roswell... married an alien...
http://emptyhammock.com/
Re: svn commit: r1514255 - /httpd/httpd/trunk/server/core.c
Posted by Igor Galić <i....@brainsware.org>.
----- Original Message -----
> Author: trawick
> Date: Thu Aug 15 13:18:50 2013
> New Revision: 1514255
>
> URL: http://svn.apache.org/r1514255
> Log:
> follow-up to r813376:
>
> finish reverting r808965 (ServerTokens set foo)
huh? You're reverting the most sought after feature in httpd?
--
Igor Galić
Tel: +43 (0) 664 886 22 883
Mail: i.galic@brainsware.org
URL: http://brainsware.org/
GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE