costin 01/12/16 15:36:58
Modified: jk/native2/server/apache2 jk_apache2.h jk_logger_apache2.c
jk_map_aprtable.c jk_pool_apr.c
jk_service_apache2.c
Log:
Update to the new method signatures.
Revision Changes Path
1.3 +2 -2 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h
Index: jk_apache2.h
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_apache2.h 2001/12/14 07:14:59 1.2
+++ jk_apache2.h 2001/12/16 23:36:58 1.3
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor <[EMAIL PROTECTED]>
* Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.2 $
+ * Version: $Revision: 1.3 $
*/
#include "jk_global.h"
@@ -87,7 +87,7 @@
char *type, char *name);
/* Temp. - we should use the factory ( we may need few changes ) */
-int jk_pool_apr_create( jk_pool_t **newPool, jk_pool_t *parent,
+int jk_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
apr_pool_t *aprPool);
1.10 +6 -5
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c
Index: jk_logger_apache2.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_logger_apache2.c 2001/12/15 17:25:45 1.9
+++ jk_logger_apache2.c 2001/12/16 23:36:58 1.10
@@ -92,7 +92,7 @@
char *type, char *name);
-static int jk_logger_apache2_log(jk_logger_t *l,
+static int jk_logger_apache2_log(jk_env_t *env, jk_logger_t *l,
int level,
const char *what)
{
@@ -100,18 +100,18 @@
}
-static int jk_logger_apache2_open(jk_logger_t *_this,
+static int jk_logger_apache2_open(jk_env_t *env, jk_logger_t *_this,
jk_map_t *properties )
{
return JK_TRUE;
}
-static int jk_logger_apache2_close(jk_logger_t *_this)
+static int jk_logger_apache2_close(jk_env_t *env, jk_logger_t *_this)
{
return JK_TRUE;
}
-static int jk_logger_apache2_jkLog(jk_logger_t *l,
+static int jk_logger_apache2_jkLog(jk_env_t *env, jk_logger_t *l,
const char *file,
int line,
int level,
@@ -174,7 +174,8 @@
char *type,
char *name)
{
- jk_logger_t *l = (jk_logger_t *)pool->calloc(pool, sizeof(jk_logger_t));
+ jk_logger_t *l = (jk_logger_t *)pool->calloc(env, pool,
+ sizeof(jk_logger_t));
if(l==NULL ) {
return JK_FALSE;
1.3 +1 -1
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_map_aprtable.c 2001/12/15 17:25:45 1.2
+++ jk_map_aprtable.c 2001/12/16 23:36:58 1.3
@@ -152,7 +152,7 @@
void **result,
char *type, char *name)
{
- jk_map_t *_this=(jk_map_t *)pool->calloc( pool, sizeof(jk_map_t));
+ jk_map_t *_this=(jk_map_t *)pool->calloc( env, pool, sizeof(jk_map_t));
*result=_this;
1.7 +15 -14
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_pool_apr.c
Index: jk_pool_apr.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_pool_apr.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_pool_apr.c 2001/12/15 17:27:43 1.6
+++ jk_pool_apr.c 2001/12/16 23:36:58 1.7
@@ -75,7 +75,7 @@
*/
-int jk_pool_apr_create( jk_pool_t **newPool, jk_pool_t *parent,
+int jk_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
apr_pool_t *aprPool );
int JK_METHOD jk_pool_apr_factory(jk_env_t *env,
@@ -85,7 +85,7 @@
/** Nothing - apache will take care ??
*/
-static void jk_pool_apr_close(jk_pool_t *p)
+static void jk_pool_apr_close(jk_env_t *env, jk_pool_t *p)
{
#ifdef JK_APR_POOL_DEBUG
fprintf(stderr, "apr_close %p\n", p);
@@ -96,7 +96,7 @@
XXX with jk pools we can implement 'recycling',
not sure what's the equivalent for apache
*/
-static void jk_pool_apr_reset(jk_pool_t *p)
+static void jk_pool_apr_reset(jk_env_t *env, jk_pool_t *p)
{
#ifdef JK_APR_POOL_DEBUG
fprintf(stderr, "apr_reset %p\n", p);
@@ -104,7 +104,7 @@
apr_pool_clear(p->_private);
}
-static void *jk_pool_apr_calloc(jk_pool_t *p,
+static void *jk_pool_apr_calloc(jk_env_t *env, jk_pool_t *p,
size_t size)
{
#ifdef JK_APR_POOL_DEBUG
@@ -114,7 +114,7 @@
return apr_pcalloc( (apr_pool_t *)p->_private, (apr_size_t)size);
}
-static void *jk_pool_apr_alloc(jk_pool_t *p,
+static void *jk_pool_apr_alloc(jk_env_t *env, jk_pool_t *p,
size_t size)
{
#ifdef JK_APR_POOL_DEBUG
@@ -124,7 +124,7 @@
return apr_palloc( (apr_pool_t *)p->_private, (apr_size_t)size);
}
-static void *jk_pool_apr_realloc(jk_pool_t *p,
+static void *jk_pool_apr_realloc(jk_env_t *env, jk_pool_t *p,
size_t sz,
const void *old,
size_t old_sz)
@@ -138,7 +138,7 @@
return NULL;
}
- rc = jk_pool_apr_alloc(p, sz);
+ rc = jk_pool_apr_alloc(env, p, sz);
if(rc) {
memcpy(rc, old, old_sz);
}
@@ -146,7 +146,7 @@
return rc;
}
-static void *jk_pool_apr_strdup(jk_pool_t *p,
+static void *jk_pool_apr_strdup(jk_env_t *env, jk_pool_t *p,
const char *s)
{
#ifdef JK_APR_POOL_DEBUG
@@ -155,9 +155,10 @@
return apr_pstrdup( (apr_pool_t *)p->_private, s);
}
-static void jk_pool_apr_initMethods( jk_pool_t *_this );
+static void jk_pool_apr_initMethods(jk_env_t *env, jk_pool_t *_this );
-static jk_pool_t *jk_pool_apr_createChild( jk_pool_t *_this, int sizeHint ) {
+static jk_pool_t *jk_pool_apr_createChild( jk_env_t *env, jk_pool_t *_this,
+ int sizeHint ) {
apr_pool_t *parentAprPool=_this->_private;
apr_pool_t *childAprPool;
jk_pool_t *newPool;
@@ -166,14 +167,14 @@
newPool=(jk_pool_t *)apr_palloc(parentAprPool, sizeof( jk_pool_t ));
- jk_pool_apr_initMethods( newPool );
+ jk_pool_apr_initMethods( env, newPool );
newPool->_private=childAprPool;
return newPool;
}
-int jk_pool_apr_create( jk_pool_t **newPool, jk_pool_t *parent,
+int jk_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
apr_pool_t *aprPool)
{
jk_pool_t *_this;
@@ -182,11 +183,11 @@
*newPool = _this;
_this->_private=aprPool;
- jk_pool_apr_initMethods( _this );
+ jk_pool_apr_initMethods( env, _this );
return JK_TRUE;
}
-static void jk_pool_apr_initMethods( jk_pool_t *_this )
+static void jk_pool_apr_initMethods(jk_env_t *env, jk_pool_t *_this )
{
/* methods */
_this->create=jk_pool_apr_createChild;
1.4 +36 -42
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_service_apache2.c 2001/12/15 17:29:35 1.3
+++ jk_service_apache2.c 2001/12/16 23:36:58 1.4
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor <[EMAIL PROTECTED]>
* Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.3 $
+ * Version: $Revision: 1.4 $
*/
#include "apu_compat.h"
@@ -96,7 +96,7 @@
#define NULL_FOR_EMPTY(x) ((x && !strlen(x)) ? NULL : x)
-static int JK_METHOD jk_service_apache2_head(jk_ws_service_t *s )
+static int JK_METHOD jk_service_apache2_head(jk_env_t *env, jk_ws_service_t *s )
{
int h;
request_rec *r;
@@ -116,9 +116,9 @@
headers=s->headers_out;
/* XXX As soon as we switch to jk_map_apache2, this will not be needed ! */
- for(h = 0 ; h < headers->size( NULL, headers ) ; h++) {
- char *name=headers->nameAt( NULL, headers, h );
- char *val=headers->valueAt( NULL, headers, h );
+ for(h = 0 ; h < headers->size( env, headers ) ; h++) {
+ char *name=headers->nameAt( env, headers, h );
+ char *val=headers->valueAt( env, headers, h );
/* the cmp can also be avoided in we do this earlier and use
the header id */
@@ -162,7 +162,7 @@
* the jk_ws_service class. Think of the *s param as a "this" or "self"
* pointer.
*/
-static int JK_METHOD jk_service_apache2_read(jk_ws_service_t *s,
+static int JK_METHOD jk_service_apache2_read(jk_env_t *env, jk_ws_service_t *s,
void *b, unsigned len,
unsigned *actually_read)
{
@@ -202,24 +202,21 @@
#define CHUNK_SIZE 4096
#endif
-static int JK_METHOD jk_service_apache2_write(jk_ws_service_t *s,
- const void *b,
- unsigned len)
+static int JK_METHOD jk_service_apache2_write(jk_env_t *env, jk_ws_service_t *s,
+ const void *b, int len)
{
- jk_logger_t *l=s->workerEnv->l;
-
if(s && s->ws_private && b) {
- if(l) {
+ if(len) {
/* BUFF *bf = p->r->connection->client; */
- size_t w = (size_t)l;
+ /* size_t w = (size_t)l; */
size_t r = 0;
long ll=len;
char *bb=(char *)b;
if(!s->response_started) {
- l->jkLog(l, JK_LOG_DEBUG,
- "Write without start, starting with defaults\n");
- if(!s->head(s)) {
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "Write without start, starting with defaults\n");
+ if(!s->head(env, s)) {
return JK_FALSE;
}
}
@@ -228,8 +225,8 @@
while( ll > 0 ) {
unsigned long toSend=(ll>CHUNK_SIZE) ? CHUNK_SIZE : ll;
r = ap_rwrite((const char *)bb, toSend, s->ws_private );
- l->jkLog(l, JK_LOG_DEBUG,
- "writing %ld (%ld) out of %ld \n",toSend, r, ll );
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "writing %ld (%ld) out of %ld \n",toSend, r, ll );
ll-=CHUNK_SIZE;
bb+=CHUNK_SIZE;
@@ -259,7 +256,7 @@
/* Utility functions */
/* ========================================================================= */
-static int get_content_length(request_rec *r)
+static int get_content_length(jk_env_t *env, request_rec *r)
{
if(r->clength > 0) {
return r->clength;
@@ -277,20 +274,18 @@
return 0;
}
-static int init_ws_service(jk_ws_service_t *s,
- jk_endpoint_t *e,
- void *serverObj)
+static int init_ws_service(jk_env_t *env, jk_ws_service_t *s,
+ jk_endpoint_t *e, void *serverObj)
{
apr_port_t port;
char *ssl_temp = NULL;
jk_workerEnv_t *workerEnv=e->worker->workerEnv;
- jk_logger_t *l=workerEnv->l;
request_rec *r=serverObj;
int need_content_length_header=JK_FALSE;
/* Common initialization */
/* XXX Probably not needed, we're duplicating */
- jk_requtil_initRequest(s);
+ jk_requtil_initRequest(env, s);
s->ws_private = r;
s->pool=e->cPool;
@@ -321,7 +316,7 @@
s->server_software = (char *)ap_get_server_version();
s->method = (char *)r->method;
- s->content_length = get_content_length(r);
+ s->content_length = get_content_length(env, r);
s->is_chunked = r->read_chunked;
s->no_more_chunks = 0;
s->query_string = r->args;
@@ -417,33 +412,33 @@
"map", "aprtable" );
s->attributes->init( NULL, s->attributes, 0, XXX);
*/
- jk_map_default_create(NULL, &s->attributes, s->pool );
+ jk_map_default_create(env, &s->attributes, s->pool );
#else
- jk_map_default_create(NULL, &s->attributes, s->pool );
+ jk_map_default_create(env, &s->attributes, s->pool );
#endif
if(workerEnv->envvars_in_use) {
- int envCnt=workerEnv->envvars->size( NULL, workerEnv->envvars );
+ int envCnt=workerEnv->envvars->size( env, workerEnv->envvars );
int i;
for( i=0; i< envCnt ; i++ ) {
- char *name= workerEnv->envvars->nameAt( NULL, workerEnv->envvars, i
);
+ char *name= workerEnv->envvars->nameAt( env, workerEnv->envvars, i
);
char *val= (char *)apr_table_get(r->subprocess_env, name);
if(val==NULL) {
- val=workerEnv->envvars->valueAt( NULL, workerEnv->envvars, i );
+ val=workerEnv->envvars->valueAt( env, workerEnv->envvars, i );
}
- s->attributes->put( NULL, s->attributes, name, val, NULL );
+ s->attributes->put( env, s->attributes, name, val, NULL );
}
}
}
#ifdef USE_APRTABLES
- jk_map_aprtable_factory( workerEnv->env, s->pool,
+ jk_map_aprtable_factory( env, s->pool,
&s->headers_in,
"map", "aprtable" );
- s->headers_in->init( NULL, s->headers_in, 0, r->headers_in);
+ s->headers_in->init( env, s->headers_in, 0, r->headers_in);
#else
- jk_map_default_create(NULL, &s->headers_in, s->pool );
+ jk_map_default_create(env, &s->headers_in, s->pool );
if(r->headers_in && apr_table_elts(r->headers_in)) {
const apr_array_header_t *t = apr_table_elts(r->headers_in);
@@ -453,7 +448,7 @@
apr_table_entry_t *elts = (apr_table_entry_t *)t->elts;
for(i = 0 ; i < t->nelts ; i++) {
- s->headers_in->add( NULL, s->headers_in,
+ s->headers_in->add( env, s->headers_in,
elts[i].key, elts[i].val);
}
}
@@ -464,16 +459,15 @@
/* XXX if r->contentLength == 0 I assume there's no header
or a header with '0'. In the second case, put will override it
*/
- s->headers_in->put( NULL, s->headers_in, "content-length", "0", NULL );
+ s->headers_in->put( env, s->headers_in, "content-length", "0", NULL );
}
#ifdef USE_APRTABLES
- jk_map_aprtable_factory( workerEnv->env, s->pool,
- &s->headers_out,
+ jk_map_aprtable_factory( env, s->pool, &s->headers_out,
"map", "aprtable" );
- s->headers_in->init( NULL, s->headers_out, 0, r->headers_out);
+ s->headers_in->init( env, s->headers_out, 0, r->headers_out);
#else
- jk_map_default_create(NULL, &s->headers_out, s->pool );
+ jk_map_default_create(env, &s->headers_out, s->pool );
#endif
return JK_TRUE;
@@ -489,7 +483,7 @@
* jk shouldn't do it instead, and the user should get the
* error message !
*/
-static void jk_service_apache2_afterRequest(jk_ws_service_t *s )
+static void jk_service_apache2_afterRequest(jk_env_t *env, jk_ws_service_t *s )
{
if (s->content_read < s->content_length ||
@@ -515,7 +509,7 @@
{
jk_ws_service_t *s = *result;
if( s==NULL ) {
- s=(jk_ws_service_t *)pool->calloc(pool, sizeof(jk_ws_service_t));
+ s=(jk_ws_service_t *)pool->calloc(env, pool, sizeof(jk_ws_service_t));
}
if(s==NULL ) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
