This patch contains minor fixes for mod_jk for Apache 2.0;
Most important is the change in prototype of jk_post_config
which used to be void but now needs to return success code,
also changes to types of some variables to better confirm to
Apache 2.0 types.
Let me know if you have any comments.
Julius
Index: mod_jk.c
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.37
diff -u -r1.37 mod_jk.c
--- mod_jk.c 2001/11/21 00:09:21 1.37
+++ mod_jk.c 2001/11/30 23:58:13
@@ -110,9 +110,8 @@
#define ADD_SSL_INFO
/* module MODULE_VAR_EXPORT jk_module; */
-AP_DECLARE_DATA module jk_module;
+AP_MODULE_DECLARE_DATA module jk_module;
-
typedef struct {
/*
@@ -326,7 +325,7 @@
/* Debug - try to get around rwrite */
while( ll > 0 ) {
- long toSend=(ll>CHUNK_SIZE) ? CHUNK_SIZE : ll;
+ size_t toSend=(ll>CHUNK_SIZE) ? CHUNK_SIZE : ll;
r = ap_rwrite((const char *)bb, toSend, p->r );
jk_log(main_log, JK_LOG_DEBUG,
"writing %ld (%ld) out of %ld \n",toSend, r, ll );
@@ -535,7 +534,7 @@
}
if(conf->envvars_in_use) {
- apr_array_header_t *t = apr_table_elts(conf->envvars);
+ const apr_array_header_t *t = apr_table_elts(conf->envvars);
if(t && t->nelts) {
int i;
apr_table_entry_t *elts = (apr_table_entry_t *)t->elts;
@@ -563,7 +562,7 @@
s->num_headers = 0;
if(r->headers_in && apr_table_elts(r->headers_in)) {
int need_content_length_header = (!s->is_chunked &&
s->content_length == 0) ? JK_TRUE : JK_FALSE;
- apr_array_header_t *t = apr_table_elts(r->headers_in);
+ const apr_array_header_t *t = apr_table_elts(r->headers_in);
if(t && t->nelts) {
int i;
apr_table_entry_t *elts = (apr_table_entry_t *)t->elts;
@@ -1514,7 +1513,7 @@
return;
}
-static void jk_post_config(apr_pool_t *pconf,
+static int jk_post_config(apr_pool_t *pconf,
apr_pool_t *plog,
apr_pool_t *ptemp,
server_rec *s)
@@ -1528,6 +1527,7 @@
init_jk( pconf, conf, s );
}
}
+ return OK;
}
/** Use the internal mod_jk mappings to find if this is a request for
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
