httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Greg Stein <gst...@lyra.org>
Subject RE: 1.3.13 moving targets
Date Sun, 04 Jun 2000 13:18:10 GMT
Close, but registry.c refers to AP_SERVER_*, but the definitions have no
AP_ prefix.

IMO, for the *new* symbols that you introduce, I'd recommend inserting the
prefix.

Otherwise, +1 for the 1.3 branch change here.

Cheers,
-g

On Sat, 3 Jun 2000, William A. Rowe, Jr. wrote:
> First Proposed Patch:  Without objections, I will apply this patch 
> on Monday evening will clean up the requirement to fix up registry.c 
> every time we roll a release - before we roll 1.3.13.
> 
> Index: src/include/httpd.h
> ===================================================================
> RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
> retrieving revision 1.312
> diff -u -r1.312 httpd.h
> --- src/include/httpd.h	2000/03/20 16:50:14	1.312
> +++ src/include/httpd.h	2000/06/03 23:59:29
> @@ -427,9 +427,14 @@
>   * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
>   */
>  
> -#define SERVER_PRODUCT "Apache"
> -#define SERVER_BASEVERSION SERVER_PRODUCT "/1.3.13-dev"	/* SEE COMMENTS ABOVE */
> -#define SERVER_VERSION  SERVER_BASEVERSION
> +#define SERVER_BASEVENDOR   "Apache Group"
> +#define SERVER_BASEPRODUCT  "Apache"
> +#define SERVER_BASEREVISION "1.3.13-dev"
> +#define SERVER_BASEVERSION  SERVER_BASEPRODUCT "/" SERVER_BASEREVISION
> +
> +#define SERVER_PRODUCT  SERVER_BASEPRODUCT
> +#define SERVER_REVISION SERVER_BASEREVISION
> +#define SERVER_VERSION  SERVER_PRODUCT "/" SERVER_REVISION
>  enum server_token_type {
>      SrvTk_MIN,		/* eg: Apache/1.3.0 */
>      SrvTk_OS,		/* eg: Apache/1.3.0 (UNIX) */
> 
> Index: src/os/win32/registry.c
> ===================================================================
> RCS file: /home/cvs/apache-1.3/src/os/win32/registry.c,v
> retrieving revision 1.33
> diff -u -r1.33 registry.c
> --- src/os/win32/registry.c	2000/03/13 21:00:41	1.33
> +++ src/os/win32/registry.c	2000/06/03 23:59:49
> @@ -36,11 +36,13 @@
>   * major release, but will change when the final release is made.
>   */
>  
> -#define VENDOR   "Apache Group"
> -#define SOFTWARE "Apache"
> -#define VERSION  "1.3.13 dev"
> +/* Define where the Apache values are stored in the registry. 
> + *
> + * If you are looking here to roll the tarball, you didn't need to visit.
> + * registry.c now picks up the version from include/httpd.h
> + */
>  
> -#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
> +#define REGKEY "SOFTWARE\\" AP_SERVER_BASEVENDOR "\\" AP_SERVER_BASEPRODUCT "\\" AP_SERVER_BASEREVISION
>  
>  #define SERVICEKEYPRE  "System\\CurrentControlSet\\Services\\"
>  #define SERVICEKEYPOST "\\Parameters"
> 
> 

-- 
Greg Stein, http://www.lyra.org/


Mime
View raw message