Enable backwards compatibility with 2.0-HEAD, define ajp module base,

and note CHANGES so far to proxy

Submitted by:	mturk

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

diff --git a/CHANGES b/CHANGES
index 5240dfb5b76aa79267db5d99f98316f7d4cc6c52..e657eb6320e0103159f50fc069b1742b30b8526e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,15 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_proxy.c and proxy_util.c: Enable compiling on 2.0-HEAD 
+     (for backwards compatibility):
+     Avoids mod_ssl.h (not included in 2.0-HEAD) and
+     use apr_socket_create_ex for 0.9.x 
+     [Mladen Turk]
+
+  *) Added proxy_ajp.c module for proxy support to ajp:// backends.
+     [Jean Frederic Clere]
+
   *) SECURITY: CAN-2004-0748 (cve.mitre.org)
      mod_ssl: Fix a potential infinite loop.  PR 29964.  [Joe Orton]
 

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 7f149935f17d15e19c81579c551b3b4feb3d441c..26d8c4963dcda441fb726f062728ff27b8b4c469 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -20,7 +20,13 @@
 #include "mod_core.h"
 
 #include "apr_optional.h"
+
+#if (MODULE_MAGIC_NUMBER_MAJOR > 20020903)
 #include "mod_ssl.h"
+#else
+APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *));
+APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));
+#endif
 
 #ifndef MAX
 #define MAX(x,y) ((x) >= (y) ? (x) : (y))

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 0f62aa17e7178e1b65dd6b43f3d96719b39dd286..016a143db967428b55d4cd6e627203c19afa8e9a 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -64,3 +64,4 @@ mod_logio.so            0x6FAE0000    0x00010000
 util_ldap.so            0x6FAD0000    0x00010000
 mod_auth_ldap.so        0x6FAC0000    0x00010000
 mod_ident.so            0x6FAB0000    0x00010000
+mod_proxy_ajp.so        0x6FAA0000    0x00010000