Re: svn commit: r660576 - in /httpd/httpd/branches/2.2.x: STATUS support/ab.c

[Takashi Sato]

Sorry for pointing out this after backported.


On Tue, 27 May 2008 16:11:40 -0000
[EMAIL PROTECTED] wrote:

> @@ -80,6 +80,10 @@
>     **     Switched to the new abstract pollset API, allowing ab to
>     **     take advantage of future apr_pollset_t scalability improvements.
>     **     Contributed by Brian Pane, August 31, 2002
> +   **
> +   ** Version 2.3
> +   **     SIGINT now triggers output_results().
> +   **     Contributed by colm, March 30, 2006
>     **/
>  
>  /* Note: this version string should start with \d+[\d\.]* and be a valid
> @@ -91,7 +95,7 @@
>   * ab - or to due to a change in the distribution it is compiled with
>   * (such as an APR change in for example blocking).
>   */
> -#define AP_AB_BASEREVISION "2.0.40-dev"
> +#define AP_AB_BASEREVISION "2.3"

This should be 2.2 instead of 2.3.

>  /* ------------------------------------------------------- */
> @@ -1753,16 +1793,16 @@
>  static void copyright(void)
>  {
>      if (!use_html) {
> -        printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " 
> <$Revision: 1.146 $> apache-2.0");
> +        printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " 
> <$Revision: 655654 $>");
>          printf("Copyright 1996 Adam Twiss, Zeus Technology Ltd, 
> http://www.zeustech.net/\n";);
> -        printf("Copyright 2006 The Apache Software Foundation, 
> http://www.apache.org/\n";);
> +        printf("Licensed to 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", AP_AB_BASEREVISION, "$Revision: 1.146 $");
> +        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i><br>\n", 
> AP_AB_BASEREVISION, "$Revision: 655654 $");
>          printf(" Copyright 1996 Adam Twiss, Zeus Technology Ltd, 
> http://www.zeustech.net/<br>\n");
> -        printf(" Copyright 2006 The Apache Software Foundation, 
> http://www.apache.org/<br>\n");
> +        printf(" Licensed to The Apache Software Foundation, 
> http://www.apache.org/<br>\n");
>          printf("</p>\n<p>\n");
>      }

I think we have to use $Revision$ and the LastChangedRevision svn property.
See r390511.