From: Nick Kew <niq@apache.org>
Date: Wed, 28 May 2008 20:56:02 +0000 (+0000)
Subject: Switch ftp_directory_charset and interpolate_env in proxy_dir_conf,
X-Git-Tag: 2.3.0~568
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caab5e8b8a117bfc03f0c8fcedeec750f123cd69;p=thirdparty%2Fapache%2Fhttpd.git

Switch ftp_directory_charset and interpolate_env in proxy_dir_conf,
with a major MMN bump.  As suggested by rpluem in r661069 to enable
backport *without* a major bump (ABI breakage) in 2.2.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@661079 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 54fa1c036a4..ffd3f4005d0 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -158,14 +158,17 @@
  * 20080407.0 (2.3.0-dev)  Remove ap_graceful_stop_signalled.
  * 20080407.1              Deprecate ap_cache_cacheable_hdrs_out and add two
  *                         generalized ap_cache_cacheable_headers_(in|out).
+ * 20080528.0 (2.3.0-dev)  Switch order of ftp_directory_charset and
+ *                         interpolate_env in proxy_dir_conf.
+ *                         Rationale: see r661069.
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20080407
+#define MODULE_MAGIC_NUMBER_MAJOR 20080528
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 1                     /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 3c74570a611..44918f4fb94 100644
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -211,8 +211,8 @@ typedef struct {
     apr_array_header_t* cookie_domains;
     const apr_strmatch_pattern* cookie_path_str;
     const apr_strmatch_pattern* cookie_domain_str;
-    int interpolate_env;
     const char *ftp_directory_charset;
+    int interpolate_env;
 } proxy_dir_conf;
 
 /* if we interpolate env vars per-request, we'll need a per-request