mturk 2004/08/03 05:08:23
Modified: ajp/proxy JAKARTA mod_proxy.c mod_proxy.h proxy_util.c
Log:
Initial diffs to current source to be able to build on WIN32, and
to be able to build on 2.0-HEAD
Revision Changes Path
1.2 +10 -1 jakarta-tomcat-connectors/ajp/proxy/JAKARTA
Index: JAKARTA
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/JAKARTA,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JAKARTA 3 Aug 2004 10:12:21 -0000 1.1
+++ JAKARTA 3 Aug 2004 12:08:22 -0000 1.2
@@ -2,6 +2,15 @@
Last modified at [$Date$]
Changes in AJP HEAD:
+ * proxy_util.c: Enable compiling on 2.0-HEAD
+ Use apr_socket_create_ex for 0.9.x
+ [Mladen Turk]
+ * mod_proxy.c: Enable compiling on 2.0-HEAD
+ mod_ssl is not included in 2.0-HEAD
+ [Mladen Turk]
+ * mod_proxy.h: Change the proxy_module declaration so that we
+ can compile on WIN32
+ [Mladen Turk]
* Imported proxy sources from 2.1-HEAD
Date: 2004/08/03 10:05:52
[Mladen Turk]
1.2 +8 -0 jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_proxy.c 3 Aug 2004 10:01:18 -0000 1.1
+++ mod_proxy.c 3 Aug 2004 12:08:22 -0000 1.2
@@ -20,7 +20,15 @@
#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
+
+module AP_MODULE_DECLARE_DATA proxy_module;
#ifndef MAX
#define MAX(x,y) ((x) >= (y) ? (x) : (y))
1.2 +1 -1 jakarta-tomcat-connectors/ajp/proxy/mod_proxy.h
Index: mod_proxy.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_proxy.h 3 Aug 2004 10:01:18 -0000 1.1
+++ mod_proxy.h 3 Aug 2004 12:08:22 -0000 1.2
@@ -256,6 +256,6 @@
PROXY_DECLARE(int) ap_proxy_ssl_disable(conn_rec *c);
/* For proxy_util */
-extern module AP_MODULE_DECLARE_DATA proxy_module;
+extern module PROXY_DECLARE_DATA proxy_module;
#endif /*MOD_PROXY_H*/
1.2 +4 -0 jakarta-tomcat-connectors/ajp/proxy/proxy_util.c
Index: proxy_util.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/proxy_util.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proxy_util.c 3 Aug 2004 10:01:18 -0000 1.1
+++ proxy_util.c 3 Aug 2004 12:08:22 -0000 1.2
@@ -16,6 +16,10 @@
/* Utility routines for Apache proxy */
#include "mod_proxy.h"
+#if (APR_MAJOR_VERSION < 1)
+#undef apr_socket_create
+#define apr_socket_create apr_socket_create_ex
+#endif
static int proxy_match_ipaddr(struct dirconn_entry *This, request_rec *r);
static int proxy_match_domainname(struct dirconn_entry *This, request_rec *r);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
