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

diff --git a/CHANGES b/CHANGES
index d653b31fbb956f75b2d564c31c8c83c61532e193..2c744f9d92e863d4ea65560946a0a3cd024d6fac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- 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>]

diff --git a/Makefile.in b/Makefile.in
index 3f09eebfdd03889c766ea3e97f5cb246b316529d..c2346c32396f50a480ed3af97becf0cbca34514a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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

diff --git a/STATUS b/STATUS
index 6a22ab72f41f6e3cfaf272d6fd05f54acafc0511..19b66c4ccf54c55ac5f15262b949cfad1eb87fde 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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 ]

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 7eaff838248ab1dc3d54c39a3cacc7ee97c8be76..fbdd336d1111f113919a12da56ff722cab98c60a 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -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