cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 jk_service_apache13.c mod_jk2.c
costin 02/05/16 13:56:08
Modified:jk/native2/server/apache13 jk_service_apache13.c mod_jk2.c
Log:
Filter debugging, fix head, add support for the shm.
It should work now reasonably well.
Revision ChangesPath
1.5 +75 -76
jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c
Index: jk_service_apache13.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_service_apache13.c 25 Apr 2002 19:25:10 - 1.4
+++ jk_service_apache13.c 16 May 2002 20:56:08 - 1.5
@@ -105,33 +105,36 @@
headers=s-headers_out;
numheaders = headers-size(env, headers);
/* XXX As soon as we switch to jk_map_apache13, this will not be needed ! */
-env-l-jkLog(env, env-l, JK_LOG_INFO,
- service.head() %d %d\n, s-status,
- numheaders);
+if( s-uriEnv-mbean-debug 0 )
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ service.head() %d %d\n, s-status,
+ numheaders);
for(h = 0 ; h numheaders; h++) {
char *name=headers-nameAt( env, headers, h );
char *val=headers-valueAt( env, headers, h );
-env-l-jkLog(env, env-l, JK_LOG_INFO,
- service.head() %s: %s %d %d\n, name, val, h, headers-size(
env, headers ));
+if( s-uriEnv-mbean-debug 0 )
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ service.head() %s: %s %d %d\n,
+ name, val, h, headers-size( env, headers ));
/* the cmp can also be avoided in we do this earlier and use
the header id */
-if(!strcasecmp(name, Content-type)) {
+if( strcasecmp(name, Content-type) == 0 ) {
/* XXX should be done in handler ! */
char *tmp = ap_pstrdup(r-pool, val);
ap_content_type_tolower(tmp);
r-content_type = tmp;
ap_table_set(r-headers_out, name, val);
-} else if(!strcasecmp(name, Location)) {
+} else if(strcasecmp(name, Location) == 0 ) {
/* XXX setn */
ap_table_set(r-headers_out, name, val);
-} else if(!strcasecmp(name, Content-Length)) {
+} else if(strcasecmp(name, Content-Length) == 0) {
ap_table_set(r-headers_out, name, val );
-} else if(!strcasecmp(name, Transfer-Encoding)) {
+} else if(strcasecmp(name, Transfer-Encoding) == 0 ) {
ap_table_set(r-headers_out,name, val);
-} else if(!strcasecmp(name, Last-Modified)) {
+} else if(strcasecmp(name, Last-Modified) == 0 ) {
/*
* If the script gave us a Last-Modified header, we can't just
* pass it on blindly because of restrictions on future values.
@@ -140,13 +143,12 @@
ap_set_last_modified(r);
ap_table_set(r-headers_out, name, val);
} else {
-/* ap_table_add(r-headers_out, name, val); */
- ap_table_set(r-headers_out, name, val);
+ap_table_add(r-headers_out, name, val);
+/* ap_table_set(r-headers_out, name, val); */
}
}
-/* this NOP function was removed in apache 2.0 alpha14 */
-/* ap_send_http_header(r); */
+ap_send_http_header(r);
s-response_started = JK_TRUE;
return JK_OK;
@@ -165,25 +167,26 @@
void *b, unsigned len,
unsigned *actually_read)
{
-if(s s-ws_private b actually_read) {
-if(!s-read_body_started) {
- if(ap_should_client_block(s-ws_private)) {
-s-read_body_started = JK_TRUE;
-}
-}
+long rv;
-if(s-read_body_started) {
-long rv;
-if ((rv = ap_get_client_block(s-ws_private, b, len)) 0) {
-*actually_read = 0;
-} else {
-*actually_read = (unsigned) rv;
-}
-return JK_OK;
+if(s==NULL || s-ws_private==NULL || b==NULL || actually_read==NULL ) {
+return JK_ERR;
+}
+
+if(!s-read_body_started) {
+if(ap_should_client_block(s-ws_private)) {
+s-read_body_started = JK_TRUE;
}
}
-return JK_ERR;
-}
+rv = ap_get_client_block(s-ws_private, b, len);
+
+if( rv 0) {
+*actually_read = 0;
+} else {
+*actually_read = (unsigned) rv;
+}
+return JK_OK;
+}
/*
* Write a chunk of response data back to
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 jk_service_apache13.c mod_jk2.c
costin 02/02/25 14:44:36
Modified:jk/native2/server/apache13 mod_jk2.c
Added: jk/native2/server/apache13 jk_service_apache13.c
Log:
Added the service impl. for apache1.3
Few more fixes.
It now compiles and load fine.
Revision ChangesPath
1.2 +11 -44jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_jk2.c 23 Feb 2002 19:01:05 - 1.1
+++ mod_jk2.c 25 Feb 2002 22:44:36 - 1.2
@@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***/
/*
@@ -231,17 +231,13 @@
ap_get_module_config(s-module_config, jk2_module);
jk_workerEnv_t *workerEnv = serverEnv-workerEnv;
-jk_map_t *m=workerEnv-init_data;
-
env=workerEnv-globalEnv;
-value = jk2_map_replaceProperties(env, m, m-pool, value);
-
if( cmd-info != NULL ) {
-m-add(env, m, (char *)cmd-info, (char *)value );
+workerEnv-setProperty( env, workerEnv, (char *)cmd-info, (char *)value );
} else {
/* ??? Maybe this is a single-option */
-m-add(env, m, value, On );
+workerEnv-setProperty( env, workerEnv, value, On );
}
return NULL;
@@ -268,20 +264,11 @@
ap_get_module_config(s-module_config, jk2_module);
jk_workerEnv_t *workerEnv = serverEnv-workerEnv;
-jk_map_t *initData=workerEnv-init_data;
-
env=workerEnv-globalEnv;
-value = jk2_map_replaceProperties(env, initData, initData-pool, value);
-
-if(value==NULL)
-return NULL;
-
if( type==NULL || type[0]=='\0') {
/* Generic Jk2Set foo bar */
-initData-add(env, initData, ap_pstrdup( cmd-pool, name),
- ap_pstrdup( cmd-pool, value));
-/* fprintf( stderr, set2.init_data: %s %s\n, name, value ); */
+workerEnv-setProperty(env, workerEnv, name, value);
} else if( strcmp(type, env)==0) {
workerEnv-envvars_in_use = JK_TRUE;
workerEnv-envvars-put(env, workerEnv-envvars,
@@ -291,10 +278,7 @@
fprintf( stderr, set2.env %s %s\n, name, value );
} else if( strcmp(type, mount)==0) {
if (name[0] !='/') return Context must start with /;
-initData-put( env, initData,ap_pstrdup(cmd-pool,name),
-ap_pstrdup(cmd-pool,value), NULL );
-
-fprintf( stderr, set2.mount %s %s\n, name, value );
+workerEnv-setProperty( env, workerEnv, name, value );
} else {
fprintf( stderr, set2 error %s %s %s , type, name, value );
}
@@ -368,7 +352,7 @@
static void *jk2_create_dir_config(ap_pool *p, char *path)
{
jk_uriEnv_t *new =
-(jk_uriEnv_t *)apr_pcalloc(p, sizeof(jk_uriEnv_t));
+(jk_uriEnv_t *)ap_pcalloc(p, sizeof(jk_uriEnv_t));
fprintf(stderr, XXX Create dir config %s %p\n, path, new);
new-uri = path;
@@ -382,7 +366,7 @@
{
jk_uriEnv_t *base =(jk_uriEnv_t *)basev;
jk_uriEnv_t *add = (jk_uriEnv_t *)addv;
-jk_uriEnv_t *new = (jk_uriEnv_t *)apr_pcalloc(p,sizeof(jk_uriEnv_t));
+jk_uriEnv_t *new = (jk_uriEnv_t *)ap_pcalloc(p,sizeof(jk_uriEnv_t));
if( add-webapp == NULL ) {
add-webapp=base-webapp;
@@ -449,7 +433,7 @@
}
-newUri=(jk_uriEnv_t *)apr_pcalloc(p, sizeof(jk_uriEnv_t));
+newUri=(jk_uriEnv_t *)ap_pcalloc(p, sizeof(jk_uriEnv_t));
newUri-workerEnv=workerEnv;
@@ -526,6 +510,7 @@
int rc;
jk_env_t *env;
+
if(s-is_virtual)
return OK;
@@ -537,7 +522,7 @@
/* This is the first step */
env-l-jkLog(env, env-l, JK_LOG_INFO,
mod_jk.post_config() first invocation\n);
-apr_pool_userdata_set( INITOK, mod_jk_init, NULL, gPool );
+/* ap_pool_userdata_set( INITOK, mod_jk_init, NULL, gPool ); */
return OK;
}
@@ -636,7 +621,7 @@
}
/* XXX we should reuse the request itself !!! */
-jk2_service_apache2_factory( env, rPool, (void *)s,
+jk2_service_apache13_factory( env, rPool, (void *)s,
