Return-Path: <new-httpd-owner-new-httpd-archive=hyperreal.org@apache.org>
Delivered-To: new-httpd-archive@hyperreal.org
Received: (qmail 28400 invoked by uid 6000); 28 Apr 1999 13:53:13 -0000
Received: (qmail 28371 invoked from network); 28 Apr 1999 13:52:58 -0000
Received: from devsys.jagunet.com (206.156.208.6)
  by taz.hyperreal.org with SMTP; 28 Apr 1999 13:52:58 -0000
Received: (from jim@localhost)
	by devsys.jaguNET.com (8.9.3/jag-2.6) id JAA01493
	for new-httpd@apache.org; Wed, 28 Apr 1999 09:52:32 -0400 (EDT)
From: Jim Jagielski <jim@devsys.jaguNET.com>
Message-Id: <199904281352.JAA01493@devsys.jaguNET.com>
Subject: Re: [PATCH] Fix ServerSignature to work as documented.
To: new-httpd@apache.org
Date: Wed, 28 Apr 1999 09:52:32 -0400 (EDT)
In-Reply-To: <E10cUDF-0007ai-00@fanf.noc.demon.net> from "Tony Finch" at Apr
 28, 99 02:17:17 pm
X-Mailer: ELM [version 2.4 PL25]
Content-Type: text
Sender: new-httpd-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

This is reversed, no?

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 :-)
> 
> 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);
>  }
> 


-- 
===========================================================================
   Jim Jagielski   |||   jim@jaguNET.com   |||   http://www.jaguNET.com/
            "That's no ordinary rabbit... that's the most foul,
            cruel and bad-tempered rodent you ever laid eyes on"