httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@lnd.com>
Subject RE: cvs commit: apache-2.0/src/support ab.c
Date Sun, 28 May 2000 01:11:20 GMT
The patch below made sense until I read this...

/* XXX - The PHP4 comments say -D_HPUX_SOURCE is obsolete. */

/* TODO - none of the dynamic linking defines are in yet, but that's because
 * Manoj needs to learn what the exact ramifications of libtool on DSOs are */

#undef PACKAGE
#undef VERSION

Ok... is the VERSION tag in ab.c used externally by libtool?  If this is
so, I need to throw in a different patch instead.

> -----Original Message-----
> From: wrowe@locus.apache.org [mailto:wrowe@locus.apache.org]
> Sent: Saturday, May 27, 2000 6:49 PM
> To: apache-2.0-cvs@apache.org
> Subject: cvs commit: apache-2.0/src/support ab.c
> 
> 
> wrowe       00/05/27 16:49:08
> 
>   Modified:    src/support ab.c
>   Log:
>     One reason ap_config.h can be a problem.  Change 
> VERSION->AB_VERSION to
>     avoid ap_config.h #undef.
>   
>   Revision  Changes    Path
>   1.17      +5 -5      apache-2.0/src/support/ab.c
>   
>   Index: ab.c
>   ===================================================================
>   RCS file: /home/cvs/apache-2.0/src/support/ab.c,v
>   retrieving revision 1.16
>   retrieving revision 1.17
>   diff -u -r1.16 -r1.17
>   --- ab.c	2000/05/19 22:39:40	1.16
>   +++ ab.c	2000/05/27 23:49:07	1.17
>   @@ -98,7 +98,7 @@
>     *   only an issue for loopback usage
>     */
>    
>   -#define VERSION "1.3c"
>   +#define AB_VERSION "1.3c"
>    
>    /*  
> --------------------------------------------------------------
> ------ */
>    
>   @@ -740,7 +740,7 @@
>            	"%s" "\r\n",
>            	(posting == 0) ? "GET" : "HEAD",
>            	path,
>   -        	VERSION,
>   +        	AB_VERSION,
>            	keepalive ? "Connection: Keep-Alive\r\n" : "",
>            	cookie, auth, hostname, hdrs);
>        }
>   @@ -755,7 +755,7 @@
>            	"%s"
>            	"\r\n",
>            	path,
>   -        	VERSION,
>   +        	AB_VERSION,
>            	keepalive ? "Connection: Keep-Alive\r\n" : "",
>            	cookie, auth,
>            	hostname, postlen,
>   @@ -840,14 +840,14 @@
>    static void copyright(void)
>    {
>        if (!use_html) {
>   -        printf("This is ApacheBench, Version %s\n", 
> VERSION " <$Revision: 1.16 $> apache-2.0");
>   +        printf("This is ApacheBench, Version %s\n", 
> AB_VERSION " <$Revision: 1.17 $> apache-2.0");
>            printf("Copyright (c) 1996 Adam Twiss, Zeus 
> Technology Ltd, http://www.zeustech.net/\n");
>            printf("Copyright (c) 1998-2000 The Apache 
> Software Foundation, http://www.apache.org/\n");
>            printf("\n");
>        }
>        else {
>            printf("<p>\n");
>   -        printf(" This is ApacheBench, Version %s 
> <i>&lt;%s&gt;</i> apache-2.0<br>\n", VERSION, "$Revision: 1.16
$");
>   +        printf(" This is ApacheBench, Version %s 
> <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision:
1.17 $");
>            printf(" Copyright (c) 1996 Adam Twiss, Zeus 
> Technology Ltd, http://www.zeustech.net/<br>\n");
>            printf(" Copyright (c) 1998-2000 The Apache 
> Software Foundation, http://www.apache.org/<br>\n");
>            printf("</p>\n<p>\n");
>   
>   
>   
> 

Mime
View raw message