You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2008/05/28 22:56:02 UTC
svn commit: r661079 - in /httpd/httpd/trunk: include/ap_mmn.h
modules/proxy/mod_proxy.h
Author: niq
Date: Wed May 28 13:56:02 2008
New Revision: 661079
URL: http://svn.apache.org/viewvc?rev=661079&view=rev
Log:
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.
Modified:
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/modules/proxy/mod_proxy.h
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=661079&r1=661078&r2=661079&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Wed May 28 13:56:02 2008
@@ -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
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=661079&r1=661078&r2=661079&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Wed May 28 13:56:02 2008
@@ -211,8 +211,8 @@
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