Commit 798e5011 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

Merge r704726, r704845 from trunk: 

Export and install the mod_rewrite.h header to ensure the optional
rewrite_mapfunc_t and ap_register_rewrite_mapfunc functions are
available to third party modules.

Minor bump when exporting mod_rewrite.h

Reviewed by: minfrin, niq, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@720590 13f79535-47bb-0310-9956-ffa450edef68
parent e427baa6

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.11



  *) Export and install the mod_rewrite.h header to ensure the optional

     rewrite_mapfunc_t and ap_register_rewrite_mapfunc functions are

     available to third party modules. [Graham Leggett]



  *) mod_cache: Convert age of cached object to seconds before comparing it to

     age supplied by the request when checking whether to send a Warning

     header for a stale response. PR 39713. [Owen Taylor <otaylor redhat.com>]

Makefile.in

+1 −0
Changes for Makefile.in: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ INSTALL_HEADERS = \ 
	$(srcdir)/modules/generators/mod_status.h \

	$(srcdir)/modules/loggers/mod_log_config.h \

	$(srcdir)/modules/http/mod_core.h \

	$(srcdir)/modules/mappers/mod_rewrite.h \

	$(srcdir)/modules/proxy/mod_proxy.h \

	$(srcdir)/modules/ssl/mod_ssl.h \

	$(srcdir)/os/$(OS_DIR)/*.h

STATUS

+0 −13
Changes for STATUS: 0 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -86,19 +86,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   * mod_rewrite: Export and install the mod_rewrite.h header to ensure the

     optional rewrite_mapfunc_t and ap_register_rewrite_mapfunc functions are

     available to third party modules.

     Trunk version of patch:

         http://svn.apache.org/viewvc?rev=704726&view=rev

         http://svn.apache.org/viewvc?rev=704845&view=rev

     Backport version to 2.2:

         http://people.apache.org/~minfrin/httpd-mod-rewrite.diff

     +1: minfrin, niq

     rpluem says: The patch to ap_mmn.h does only contain the comment, but does

     not change the #define. Once this is fixed I am +1.

     niq notes: the patch appears to have been updated to secure rpluem +1;

     promoting on that basis.



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

include/ap_mmn.h

+2 −1
Changes for include/ap_mmn.h: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ 
 * 20051115.18 (2.2.10) Add chroot support to unixd_config

 * 20051115.19 (2.2.11) Added ap_timeout_parameter_parse to util.c / httpd.h

 * 20051115.20 (2.2.11) Add ap_proxy_buckets_lifetime_transform to mod_proxy.h

 * 20051115.21 (2.2.11) Export mod_rewrite.h in the public API

 */



#define MODULE_MAGIC_COOKIE 0x41503232UL /* "AP22" */
@@ -141,7 +142,7 @@ 
#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20051115

#endif

#define MODULE_MAGIC_NUMBER_MINOR 20                    /* 0...n */

#define MODULE_MAGIC_NUMBER_MINOR 21                    /* 0...n */



/**

 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a