From 1d2047b9d5e8ca61765fd4a41ba8ba6a0b5d8f12 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Wed, 11 Aug 2004 21:14:49 +0000 Subject: [PATCH] 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 --- CHANGES | 9 +++++++++ modules/proxy/mod_proxy.c | 6 ++++++ os/win32/BaseAddr.ref | 1 + 3 files changed, 16 insertions(+) diff --git a/CHANGES b/CHANGES index 5240dfb5b7..e657eb6320 100644 --- 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 7f149935f1..26d8c4963d 100644 --- 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 0f62aa17e7..016a143db9 100644 --- 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 -- 2.50.1