cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_map_aprtable.c jk_service_apache2.c mod_jk.c
costin 02/01/25 23:13:47
Modified:jk/native2/server/apache2 jk_map_aprtable.c
jk_service_apache2.c mod_jk.c
Log:
Fixes, updates for the new apis.
Revision ChangesPath
1.5 +4 -4
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_map_aprtable.c
Index: jk_map_aprtable.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_map_aprtable.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_map_aprtable.c 6 Jan 2002 09:06:02 - 1.4
+++ jk_map_aprtable.c 26 Jan 2002 07:13:47 - 1.5
@@ -56,11 +56,11 @@
* = */
/**
- * Implementation of map using apr_table. This avoids copying the headers, env, etc
- * in jk_service - we can just wrap them.
+ * Implementation of map using apr_table. This avoids copying the headers,
+ * env, etc in jk_service - we can just wrap them.
*
- * Note that this _require_ that apr pools are used ( can't be used with jk_pools ),
- * i.e. you must use apr for both pools and maps.
+ * Note that this _require_ that apr pools are used ( can't be used
+ * with jk_pools ), i.e. you must use apr for both pools and maps.
*
* @author Costin Manolache
*/
1.7 +6 -6
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_service_apache2.c 6 Jan 2002 09:06:02 - 1.6
+++ jk_service_apache2.c 26 Jan 2002 07:13:47 - 1.7
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.6 $
+ * Version: $Revision: 1.7 $
*/
#include apu_compat.h
@@ -92,7 +92,7 @@
#include jk_apache2.h
-/* #define USE_APRTABLES */
+#define USE_APRTABLES
#define NULL_FOR_EMPTY(x) ((x !strlen(x)) ? NULL : x)
@@ -116,7 +116,8 @@
headers=s-headers_out;
/* XXX As soon as we switch to jk_map_apache2, this will not be needed ! */
env-l-jkLog(env, env-l, JK_LOG_INFO,
- service.head() %d %d\n, s-status, headers-size(env, headers
));
+ service.head() %d %d\n, s-status,
+ headers-size(env, headers ));
for(h = 0 ; h headers-size( env, headers ) ; h++) {
char *name=headers-nameAt( env, headers, h );
@@ -295,11 +296,11 @@
}
static int init_ws_service(jk_env_t *env, jk_ws_service_t *s,
- jk_endpoint_t *e, void *serverObj)
+ jk_worker_t *worker, void *serverObj)
{
apr_port_t port;
char *ssl_temp = NULL;
-jk_workerEnv_t *workerEnv=e-worker-workerEnv;
+jk_workerEnv_t *workerEnv=worker-workerEnv;
request_rec *r=serverObj;
int need_content_length_header=JK_FALSE;
@@ -308,7 +309,6 @@
jk_requtil_initRequest(env, s);
s-ws_private = r;
-s-pool=e-cPool;
s-response_started = JK_FALSE;
s-read_body_started = JK_FALSE;
s-workerEnv=workerEnv;
1.18 +40 -11jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_jk.c 15 Jan 2002 13:49:11 - 1.17
+++ mod_jk.c 26 Jan 2002 07:13:47 - 1.18
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.17 $ *
+ * Version: $Revision: 1.18 $ *
***/
/*
@@ -283,7 +283,7 @@
jk_map_t *m=workerEnv-init_data;
env=workerEnv-globalEnv;
-
+
value = jk_map_replaceProperties(env, m, m-pool, value);
if(value==NULL)
@@ -705,37 +705,66 @@
r-uri,
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_map_aprtable.c
costin 01/12/13 23:11:42 Added: jk/native2/server/apache2 jk_map_aprtable.c Log: The map implementation using apr_table. One problem is that apr_table supports only string values. We use string values for most of the stuff, but we need void * for uriMap. But in uriMap we should better use hashtable - and maybe we shuld have 2 interfaces ? For now aprtable will be used only for headers/env where we know we only have strings, and the 'original' jk_map will continue to be used. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_map_aprtable.c Index: jk_map_aprtable.c === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation.
