httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Orton <jor...@redhat.com>
Subject Re: svn commit: r307031 - in /httpd/httpd/branches/2.2.x: CHANGES include/ap_mmn.h include/http_core.h modules/http/http_core.c server/core.c server/core_filters.c server/protocol.c
Date Sat, 08 Oct 2005 21:17:20 GMT
On Fri, Oct 07, 2005 at 06:41:28AM -0000, William Rowe wrote:
> Author: wrowe
> Date: Thu Oct  6 23:41:23 2005
> New Revision: 307031
> 
> URL: http://svn.apache.org/viewcvs?rev=307031&view=rev
> Log:
> Backport Revision: 306495
> 
> Modified: httpd/httpd/branches/2.2.x/include/ap_mmn.h
> URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/include/ap_mmn.h?rev=307031&r1=307030&r2=307031&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.2.x/include/ap_mmn.h (original)
> +++ httpd/httpd/branches/2.2.x/include/ap_mmn.h Thu Oct  6 23:41:23 2005
> @@ -105,14 +105,15 @@
>   * 20050701.1 (2.1.7-dev) trace_enable member added to core server_config
>   * 20050708.0 (2.1.7-dev) Bump MODULE_MAGIC_COOKIE to "AP22"!
>   * 20050708.1 (2.1.7-dev) add proxy request_status hook (minor)
> -  */
> + * 20051006.0 (2.1.8-dev) NET_TIME filter eliminated
> + */
>  
>  #define MODULE_MAGIC_COOKIE 0x41503232UL /* "AP22" */
>  
>  #ifndef MODULE_MAGIC_NUMBER_MAJOR
> -#define MODULE_MAGIC_NUMBER_MAJOR 20050708
> +#define MODULE_MAGIC_NUMBER_MAJOR 20051006

The MMN major is now higher on the 2.2.x branch than on the trunk, which 
makes little sense; there are features present on the trunk which are 
missing from the branch.

I'd suggest just incrementing the MMN by one rather than bumping it by 
date on the branch unless and until the API is the same as the trunk.

joe

Mime
View raw message