You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2004/03/21 10:44:30 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c jk_service_apache2.c jk_map_aprtable.c jk_logger_apache2.c jk_apache2.h
mturk 2004/03/21 01:44:30
Modified: jk/native2/server/apache2 mod_jk2.c jk_service_apache2.c
jk_map_aprtable.c jk_logger_apache2.c jk_apache2.h
Log:
Apply the Apache-wide conding style.
See http://www.apache.org/dev/styleguide.html for details.
Revision Changes Path
1.81 +359 -334 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- mod_jk2.c 17 Mar 2004 16:47:48 -0000 1.80
+++ mod_jk2.c 21 Mar 2004 09:44:30 -0000 1.81
@@ -33,14 +33,14 @@
#include "util_script.h"
#ifdef WIN32
-static char file_name[_MAX_PATH];
+static char file_name[_MAX_PATH];
#endif
/* This is used to ensure that jk2_create_dir_config creates unique
* dir mappings. This prevents vhost configs as configured through
* httpd.conf from getting crossed.
*/
-static int dirCounter=0;
+static int dirCounter = 0;
#define JK_HANDLER ("jakarta-servlet2")
#define JK_MAGIC_TYPE ("application/x-jakarta-servlet2")
@@ -87,15 +87,16 @@
* Set jk options. Same as using workers.properties.
* Common properties: see workers.properties documentation
*/
-static const char *jk2_set2(cmd_parms *cmd,void *per_dir,
- const char *name, char *value)
+static const char *jk2_set2(cmd_parms * cmd, void *per_dir,
+ const char *name, char *value)
{
server_rec *s = cmd->server;
- jk_env_t *env=workerEnv->globalEnv;
+ jk_env_t *env = workerEnv->globalEnv;
int rc;
-
- rc=workerEnv->config->setPropertyString( env, workerEnv->config, (char *)name, value );
- if (rc!=JK_OK) {
+
+ rc = workerEnv->config->setPropertyString(env, workerEnv->config,
+ (char *)name, value);
+ if (rc != JK_OK) {
ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, cmd->temp_pool,
"mod_jk2: Unrecognized option %s %s", name, value);
}
@@ -108,41 +109,46 @@
*
* Set jk options.
*/
-static const char *jk2_set3(cmd_parms *cmd,void *per_dir,
+static const char *jk2_set3(cmd_parms * cmd, void *per_dir,
const char *name, char *property, char *value)
{
server_rec *s = cmd->server;
- jk_env_t *env=workerEnv->globalEnv;
+ jk_env_t *env = workerEnv->globalEnv;
int rc;
jk_bean_t *mbean;
- if( name == NULL || property==NULL || value==NULL ) {
+ if (name == NULL || property == NULL || value == NULL) {
ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, cmd->temp_pool,
"mod_jk2: Null option in JkSet2");
return NULL;
}
-
- mbean=env->getBean( env, name );
- if( mbean==NULL ) {
+
+ mbean = env->getBean(env, name);
+ if (mbean == NULL) {
ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, cmd->temp_pool,
- "mod_jk2: Creating object %s", name );
- mbean=env->createBean( env, workerEnv->config->pool, (char *)name );
+ "mod_jk2: Creating object %s", name);
+ mbean = env->createBean(env, workerEnv->config->pool, (char *)name);
}
- if( mbean == NULL ) {
+ if (mbean == NULL) {
/* Can't create it, save the value in our map */
- workerEnv->config->setProperty( env, workerEnv->config, workerEnv->config->mbean, (char *)name, value );
+ workerEnv->config->setProperty(env, workerEnv->config,
+ workerEnv->config->mbean, (char *)name,
+ value);
return NULL;
}
- if( mbean->settings == NULL )
- jk2_map_default_create(env, &mbean->settings, workerEnv->config->pool);
-
- rc=workerEnv->config->setProperty( env, workerEnv->config, mbean, property, value );
+ if (mbean->settings == NULL)
+ jk2_map_default_create(env, &mbean->settings,
+ workerEnv->config->pool);
+
+ rc = workerEnv->config->setProperty(env, workerEnv->config, mbean,
+ property, value);
- if (rc!=JK_OK) {
+ if (rc != JK_OK) {
ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, cmd->temp_pool,
- "mod_jk2: Unrecognized option %s %s %s", name, property, value);
+ "mod_jk2: Unrecognized option %s %s %s", name, property,
+ value);
}
return NULL;
@@ -172,16 +178,17 @@
* XXX This is a special configuration, for most users just use
* the properties files.
*/
-static const char *jk2_uriSet(cmd_parms *cmd, void *per_dir,
+static const char *jk2_uriSet(cmd_parms * cmd, void *per_dir,
const char *name, const char *val)
{
- jk_uriEnv_t *uriEnv=(jk_uriEnv_t *)per_dir;
+ jk_uriEnv_t *uriEnv = (jk_uriEnv_t *)per_dir;
- char *tmp_virtual=NULL;
- char *tmp_full_url=NULL;
+ char *tmp_virtual = NULL;
+ char *tmp_full_url = NULL;
server_rec *s = cmd->server;
- uriEnv->mbean->setAttribute( workerEnv->globalEnv, uriEnv->mbean, (char *)name, (void *)val );
+ uriEnv->mbean->setAttribute(workerEnv->globalEnv, uriEnv->mbean,
+ (char *)name, (void *)val);
/*
* all of the objects that get passed in now are unique. create_dir adds a incrementing counter to the
@@ -194,193 +201,204 @@
/* if applicable we will set the hostname etc variables. */
if (s->is_virtual && s->server_hostname != NULL &&
- (uriEnv->virtual==NULL || !strchr(uriEnv->virtual, ':') ||
- uriEnv->port != s->port)) {
- tmp_virtual = (char *) apr_pcalloc(cmd->pool,
- sizeof(char *) * (strlen(s->server_hostname) + 8 )) ;
- tmp_full_url = (char *) apr_pcalloc(cmd->pool,
- sizeof(char *) * (strlen(s->server_hostname) +
- strlen(uriEnv->uri)+8 )) ;
+ (uriEnv->virtual == NULL || !strchr(uriEnv->virtual, ':') ||
+ uriEnv->port != s->port)) {
+ tmp_virtual = (char *)apr_pcalloc(cmd->pool,
+ sizeof(char *) *
+ (strlen(s->server_hostname) + 8));
+ tmp_full_url =
+ (char *)apr_pcalloc(cmd->pool,
+ sizeof(char *) * (strlen(s->server_hostname) +
+ strlen(uriEnv->uri) + 8));
/* do not pass the hostname:0/ scheme */
if (s->port) {
- sprintf(tmp_virtual, "%s:%d", s->server_hostname, s->port);
- sprintf(tmp_full_url, "%s:%d%s", s->server_hostname, s->port, uriEnv->uri );
+ sprintf(tmp_virtual, "%s:%d", s->server_hostname, s->port);
+ sprintf(tmp_full_url, "%s:%d%s", s->server_hostname, s->port,
+ uriEnv->uri);
}
else {
strcpy(tmp_virtual, s->server_hostname);
strcpy(tmp_full_url, s->server_hostname);
strcat(tmp_full_url, uriEnv->uri);
}
- uriEnv->mbean->setAttribute( workerEnv->globalEnv, uriEnv->mbean, "uri", tmp_full_url);
- uriEnv->mbean->setAttribute( workerEnv->globalEnv, uriEnv->mbean, "path", cmd->path);
- uriEnv->name=tmp_virtual;
- uriEnv->virtual=tmp_virtual;
+ uriEnv->mbean->setAttribute(workerEnv->globalEnv, uriEnv->mbean,
+ "uri", tmp_full_url);
+ uriEnv->mbean->setAttribute(workerEnv->globalEnv, uriEnv->mbean,
+ "path", cmd->path);
+ uriEnv->name = tmp_virtual;
+ uriEnv->virtual = tmp_virtual;
}
/* now lets actually add the parameter set in the <Location> block */
- uriEnv->mbean->setAttribute( workerEnv->globalEnv, uriEnv->mbean, (char *)name, (void *)val );
+ uriEnv->mbean->setAttribute(workerEnv->globalEnv, uriEnv->mbean,
+ (char *)name, (void *)val);
return NULL;
}
/* Command table.
*/
-static const command_rec jk2_cmds[] =
- {
- /* This is the 'main' directive for tunning jk2. It takes 2 parameters,
- and it behaves _identically_ as a setting in workers.properties.
- */
- AP_INIT_TAKE2(
- "JkSet", jk2_set2, NULL, RSRC_CONF,
- "Set a jk property, 2 parameters - objectName.property value"),
- AP_INIT_TAKE3(
- "JkSet2", jk2_set3, NULL, RSRC_CONF,
- "Set a jk property, 3 parameters - objectName property value"),
- AP_INIT_TAKE2(
- "JkUriSet", jk2_uriSet, NULL, ACCESS_CONF,
- "Defines a jk property associated with a Location"),
+static const command_rec jk2_cmds[] = {
+ /* This is the 'main' directive for tunning jk2. It takes 2 parameters,
+ and it behaves _identically_ as a setting in workers.properties.
+ */
+ AP_INIT_TAKE2("JkSet", jk2_set2, NULL, RSRC_CONF,
+ "Set a jk property, 2 parameters - objectName.property value"),
+ AP_INIT_TAKE3("JkSet2", jk2_set3, NULL, RSRC_CONF,
+ "Set a jk property, 3 parameters - objectName property value"),
+ AP_INIT_TAKE2("JkUriSet", jk2_uriSet, NULL, ACCESS_CONF,
+ "Defines a jk property associated with a Location"),
NULL
- };
+};
-static void *jk2_create_dir_config(apr_pool_t *p, char *path)
+static void *jk2_create_dir_config(apr_pool_t * p, char *path)
{
/* We don't know the vhost yet - so path is not
* unique. We'll have to generate a unique name
*/
- char *tmp=NULL;
- int a=10;
+ char *tmp = NULL;
+ int a = 10;
jk_bean_t *jkb;
jk_uriEnv_t *newUri;
if (!path)
return NULL;
- a = strlen(path)+10;
+ a = strlen(path) + 10;
/* Original patch: a * sizeof( char * ) - that's weird, we only use a chars, not char*
Maybe I wrote too much java...
- */
- tmp = (char *) apr_pcalloc(p, a);
+ */
+ tmp = (char *)apr_pcalloc(p, a);
sprintf(tmp, "%s-%d", path, dirCounter++);
/* I changed the default to /, otherwise it complains */
- jkb=workerEnv->globalEnv->createBean2( workerEnv->globalEnv,
- workerEnv->pool, "uri",
- tmp );
+ jkb = workerEnv->globalEnv->createBean2(workerEnv->globalEnv,
+ workerEnv->pool, "uri", tmp);
newUri = jkb->object;
- newUri->workerEnv=workerEnv;
- newUri->mbean->setAttribute( workerEnv->globalEnv, newUri->mbean, "path", tmp );
+ newUri->workerEnv = workerEnv;
+ newUri->mbean->setAttribute(workerEnv->globalEnv, newUri->mbean, "path",
+ tmp);
/* I'm hoping that setting the id won't break anything. I havn't noticed it breaking anything. */
- newUri->mbean->id=(dirCounter -1);
+ newUri->mbean->id = (dirCounter - 1);
/* this makes the display in the status display make more sense */
- newUri->mbean->localName=path;
+ newUri->mbean->localName = path;
return newUri;
}
-static void *jk2_merge_dir_config(apr_pool_t *p, void *childv, void *parentv)
+static void *jk2_merge_dir_config(apr_pool_t * p, void *childv, void *parentv)
{
- jk_uriEnv_t *child =(jk_uriEnv_t *)childv;
- jk_uriEnv_t *parent = (jk_uriEnv_t *)parentv;
- jk_uriEnv_t *winner=NULL;
- jk_uriEnv_t *loser=NULL;
-
- if ( child == NULL || child->uri==NULL || child->workerName==NULL ) {
- winner=parent;
- loser=child;
- } else if ( parent == NULL || parent->uri ==NULL || parent->workerName==NULL ) {
- winner=child;
- loser=parent;
- /* interresting bit... so far they are equal ... */
- } else if ( strlen(parent->uri) > strlen(child->uri) ) {
- winner=parent;
- loser=child;
- } else {
- winner=child;
- loser=parent;
+ jk_uriEnv_t *child = (jk_uriEnv_t *)childv;
+ jk_uriEnv_t *parent = (jk_uriEnv_t *)parentv;
+ jk_uriEnv_t *winner = NULL;
+ jk_uriEnv_t *loser = NULL;
+
+ if (child == NULL || child->uri == NULL || child->workerName == NULL) {
+ winner = parent;
+ loser = child;
+ }
+ else if (parent == NULL || parent->uri == NULL
+ || parent->workerName == NULL) {
+ winner = child;
+ loser = parent;
+ /* interresting bit... so far they are equal ... */
+ }
+ else if (strlen(parent->uri) > strlen(child->uri)) {
+ winner = parent;
+ loser = child;
+ }
+ else {
+ winner = child;
+ loser = parent;
}
/* Do we merge loser into winner - i.e. inherit properties ? */
/*if ( winner == child )
- fprintf(stderr, "Going with the child\n");
- else if ( winner == parent )
- fprintf(stderr, "Going with the parent\n");
- else
- fprintf(stderr, "Going with NULL\n");
- */
+ fprintf(stderr, "Going with the child\n");
+ else if ( winner == parent )
+ fprintf(stderr, "Going with the parent\n");
+ else
+ fprintf(stderr, "Going with NULL\n");
+ */
fprintf(stderr, "Merging %s %s %s\n",
- (winner==NULL || winner->uri==NULL) ? "" : winner->uri,
- (child==NULL || child->uri==NULL) ? "" : child->uri,
- (parent==NULL || parent->uri==NULL) ? "" : parent->uri);
-
+ (winner == NULL || winner->uri == NULL) ? "" : winner->uri,
+ (child == NULL || child->uri == NULL) ? "" : child->uri,
+ (parent == NULL || parent->uri == NULL) ? "" : parent->uri);
+
- return (void *) winner;
+ return (void *)winner;
}
/** Basic initialization for jk2.
*/
-static void jk2_create_workerEnv(apr_pool_t *p, server_rec *s) {
+static void jk2_create_workerEnv(apr_pool_t * p, server_rec * s)
+{
jk_env_t *env;
jk_logger_t *l;
jk_pool_t *globalPool;
jk_bean_t *jkb;
-
- jk2_pool_apr_create( NULL, &globalPool, NULL, p );
+
+ jk2_pool_apr_create(NULL, &globalPool, NULL, p);
/** Create the global environment. This will register the default
factories
*/
- env=jk2_env_getEnv( NULL, globalPool );
+ env = jk2_env_getEnv(NULL, globalPool);
/* Optional. Register more factories ( or replace existing ones ) */
/* Init the environment. */
-
+
/* Create the logger */
#ifdef NO_APACHE_LOGGER
- jkb=env->createBean2( env, env->globalPool, "logger.file", "");
- env->alias( env, "logger.file:", "logger");
- env->alias( env, "logger.file:", "logger:");
+ jkb = env->createBean2(env, env->globalPool, "logger.file", "");
+ env->alias(env, "logger.file:", "logger");
+ env->alias(env, "logger.file:", "logger:");
l = jkb->object;
#else
- env->registerFactory( env, "logger.apache2", jk2_logger_apache2_factory );
- jkb=env->createBean2( env, env->globalPool, "logger.apache2", "");
- env->alias( env, "logger.apache2:", "logger");
+ env->registerFactory(env, "logger.apache2", jk2_logger_apache2_factory);
+ jkb = env->createBean2(env, env->globalPool, "logger.apache2", "");
+ env->alias(env, "logger.apache2:", "logger");
l = jkb->object;
- l->logger_private=s;
+ l->logger_private = s;
#endif
-
- env->l=l;
-
+
+ env->l = l;
+
#ifdef WIN32
- env->soName=env->globalPool->pstrdup(env, env->globalPool, file_name);
-
- if( env->soName == NULL ){
- env->l->jkLog(env, env->l, JK_LOG_ERROR, "Error creating env->soName\n");
+ env->soName = env->globalPool->pstrdup(env, env->globalPool, file_name);
+
+ if (env->soName == NULL) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "Error creating env->soName\n");
return;
}
-#else
- env->soName=NULL;
+#else
+ env->soName = NULL;
#endif
/* We should make it relative to JK_HOME or absolute path.
ap_server_root_relative(cmd->pool,opt); */
-
+
/* Create the workerEnv */
- jkb=env->createBean2( env, env->globalPool,"workerEnv", "");
- workerEnv= jkb->object;
+ jkb = env->createBean2(env, env->globalPool, "workerEnv", "");
+ workerEnv = jkb->object;
/* workerEnv->logger_name= "logger.apache2"; */
- env->alias( env, "workerEnv:" , "workerEnv");
-
- if( workerEnv==NULL ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR, "Error creating workerEnv\n");
+ env->alias(env, "workerEnv:", "workerEnv");
+
+ if (workerEnv == NULL) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "Error creating workerEnv\n");
return;
}
- workerEnv->initData->add( env, workerEnv->initData, "serverRoot",
- workerEnv->pool->pstrdup( env, workerEnv->pool, ap_server_root));
- env->l->jkLog(env, env->l, JK_LOG_INFO, "Set serverRoot %s\n", ap_server_root);
-
+ workerEnv->initData->add(env, workerEnv->initData, "serverRoot",
+ workerEnv->pool->pstrdup(env, workerEnv->pool,
+ ap_server_root));
+ env->l->jkLog(env, env->l, JK_LOG_INFO, "Set serverRoot %s\n",
+ ap_server_root);
+
/* Local initialization */
workerEnv->_private = s;
}
@@ -390,33 +408,33 @@
This is the first thing called ( or should be )
*/
-static void *jk2_create_config(apr_pool_t *p, server_rec *s)
+static void *jk2_create_config(apr_pool_t * p, server_rec * s)
{
jk_uriEnv_t *newUri;
jk_bean_t *jkb;
-
- if( workerEnv==NULL ) {
- jk2_create_workerEnv(p, s );
+
+ if (workerEnv == NULL) {
+ jk2_create_workerEnv(p, s);
}
- if( s->is_virtual ) {
+ if (s->is_virtual) {
/* Virtual host */
ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, p,
"mod_jk2 Create config for virtual host %s",
- s->server_hostname );
- } else {
+ s->server_hostname);
+ }
+ else {
ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, p,
"mod_jk2 Create config for default server %s",
- s->server_hostname );
+ s->server_hostname);
}
- jkb = workerEnv->globalEnv->createBean2( workerEnv->globalEnv,
- workerEnv->pool,
- "uri", "" );
- newUri=jkb->object;
-
- newUri->workerEnv=workerEnv;
-
- return newUri;
+ jkb = workerEnv->globalEnv->createBean2(workerEnv->globalEnv,
+ workerEnv->pool, "uri", "");
+ newUri = jkb->object;
+
+ newUri->workerEnv = workerEnv;
+
+ return newUri;
}
@@ -424,16 +442,13 @@
/** Standard apache callback, merge jk options specified in
<Host> context. Used to set per virtual host configs
*/
-static void *jk2_merge_config(apr_pool_t *p,
- void *basev,
- void *overridesv)
+static void *jk2_merge_config(apr_pool_t * p, void *basev, void *overridesv)
{
jk_uriEnv_t *overrides = (jk_uriEnv_t *)overridesv;
-
- ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, p,
- "mod_jk2 Merging workerEnv");
-
+ ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, p, "mod_jk2 Merging workerEnv");
+
+
/* The 'mountcopy' option should be implemented in common.
*/
return overrides;
@@ -443,7 +458,7 @@
{
jk_env_t *env;
if (workerEnv) {
- env=workerEnv->globalEnv;
+ env = workerEnv->globalEnv;
/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
/* "mod_jk2 Shutting down\n"); */
@@ -463,16 +478,17 @@
SetHandler and normal apache directives ( but minimal jk-specific
stuff )
*/
-static char * jk2_init(jk_env_t *env, apr_pool_t *pconf,
- jk_workerEnv_t *workerEnv, server_rec *s )
+static char *jk2_init(jk_env_t *env, apr_pool_t * pconf,
+ jk_workerEnv_t *workerEnv, server_rec * s)
{
ap_mpm_query(AP_MPMQ_MAX_DAEMONS, &workerEnv->maxDaemons);
- workerEnv->init(env, workerEnv );
- workerEnv->server_name = (char *)ap_get_server_version();
+ workerEnv->init(env, workerEnv);
+ workerEnv->server_name = (char *)ap_get_server_version();
- apr_pool_cleanup_register(pconf, NULL, jk2_shutdown, apr_pool_cleanup_null);
+ apr_pool_cleanup_register(pconf, NULL, jk2_shutdown,
+ apr_pool_cleanup_null);
return NULL;
}
@@ -481,138 +497,142 @@
Keeping 'was_initialized' in workerEnv is pointless, since both
will disapear.
*/
-static int jk2_apache2_isValidating(apr_pool_t *gPool, apr_pool_t **mainPool) {
- apr_pool_t *tmpPool=NULL;
- void *data=NULL;
+static int jk2_apache2_isValidating(apr_pool_t * gPool,
+ apr_pool_t ** mainPool)
+{
+ apr_pool_t *tmpPool = NULL;
+ void *data = NULL;
int i;
-
- for( i=0; i<10; i++ ) {
- tmpPool=apr_pool_parent_get( gPool );
- if( tmpPool == NULL ) {
+
+ for (i = 0; i < 10; i++) {
+ tmpPool = apr_pool_parent_get(gPool);
+ if (tmpPool == NULL) {
/* fprintf(stderr, "XXX Found Root pool %#lx\n", gPool ); */
break;
}
- gPool=tmpPool;
+ gPool = tmpPool;
}
- if( tmpPool != NULL ) {
+ if (tmpPool != NULL) {
/* We can't detect the root pool */
/* fprintf(stderr, "XXX Can't find root pool\n" ); */
return JK_ERR;
}
- if(mainPool != NULL )
- *mainPool=gPool;
-
+ if (mainPool != NULL)
+ *mainPool = gPool;
+
/* We have a global pool ! */
- apr_pool_userdata_get( &data, "mod_jk2_init", gPool );
- if( data==NULL ) {
+ apr_pool_userdata_get(&data, "mod_jk2_init", gPool);
+ if (data == NULL) {
return JK_OK;
- } else {
+ }
+ else {
return JK_ERR;
}
}
-static int jk2_post_config(apr_pool_t *pconf,
- apr_pool_t *plog,
- apr_pool_t *ptemp,
- server_rec *s)
+static int jk2_post_config(apr_pool_t * pconf,
+ apr_pool_t * plog,
+ apr_pool_t * ptemp, server_rec * s)
{
- apr_pool_t *gPool=NULL;
+ apr_pool_t *gPool = NULL;
int rc;
jk_env_t *env;
-
- if(s->is_virtual)
+
+ if (s->is_virtual)
return OK;
/* Other apache 2.0 modules add version info at post_config */
ap_add_version_component(pconf, JK_EXPOSED_VERSION);
- env=workerEnv->globalEnv;
-
- rc=jk2_apache2_isValidating( plog, &gPool );
+ env = workerEnv->globalEnv;
+
+ rc = jk2_apache2_isValidating(plog, &gPool);
env->setAprPool(env, gPool);
- if( rc == JK_OK && gPool != NULL ) {
+ if (rc == JK_OK && gPool != NULL) {
/* This is the first step */
env->l->jkLog(env, env->l, JK_LOG_INFO,
"mod_jk2.post_config() first invocation\n");
-
- apr_pool_userdata_set( "INITOK", "mod_jk2_init", NULL, gPool );
+
+ apr_pool_userdata_set("INITOK", "mod_jk2_init", NULL, gPool);
return OK;
}
-
+
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "mod_jk2.post_config() second invocation\n" );
- workerEnv->parentInit( env, workerEnv);
+ "mod_jk2.post_config() second invocation\n");
+ workerEnv->parentInit(env, workerEnv);
return OK;
}
/** Standard apache callback, initialize jk.
*/
-static void jk2_child_init(apr_pool_t *pconf,
- server_rec *s)
+static void jk2_child_init(apr_pool_t * pconf, server_rec * s)
{
- apr_proc_t proc;
- jk_uriEnv_t *serverEnv=(jk_uriEnv_t *)
+ apr_proc_t proc;
+ jk_uriEnv_t *serverEnv = (jk_uriEnv_t *)
ap_get_module_config(s->module_config, &jk2_module);
jk_env_t *env;
-
- if( workerEnv==NULL )
+
+ if (workerEnv == NULL)
workerEnv = serverEnv->workerEnv;
- env=workerEnv->globalEnv;
-
+ env = workerEnv->globalEnv;
+
if (!workerEnv->childProcessId)
workerEnv->childProcessId = getpid();
proc.pid = workerEnv->childProcessId;
/* detect if scoreboard exists
- */
+ */
if (!ap_exists_scoreboard_image()) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "jk2_init() Scoreboard image does not exists %d\n", proc.pid);
- workerEnv->childId=-2;
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "jk2_init() Scoreboard image does not exists %d\n",
+ proc.pid);
+ workerEnv->childId = -2;
}
else
workerEnv->childId = find_child_by_pid(&proc);
/* Avoid looking again
- * and fix the mpm_winnt reporting 0 daemons.
- */
+ * and fix the mpm_winnt reporting 0 daemons.
+ */
if (workerEnv->childId == -1) {
/* If the server max daemons are less then 2
* this is the single child mpm.
* the WINNT mpm has a bug returning 0 instead 1
*/
if (workerEnv->maxDaemons < 2) {
- workerEnv->childId = proc.pid;
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "jk2_init() Setting scoreboard slot 0 for child %d\n",
- proc.pid);
+ workerEnv->childId = proc.pid;
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "jk2_init() Setting scoreboard slot 0 for child %d\n",
+ proc.pid);
}
else {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "jk2_init() Can't find child %d in none of the %d scoreboard slots\n",
- proc.pid, workerEnv->maxDaemons);
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "jk2_init() Can't find child %d in none of the %d scoreboard slots\n",
+ proc.pid, workerEnv->maxDaemons);
workerEnv->childId = -2;
}
- } else {
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "jk2_init() Found child %d in scoreboard slot %d\n",
- proc.pid, workerEnv->childId);
+ }
+ else {
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "jk2_init() Found child %d in scoreboard slot %d\n",
+ proc.pid, workerEnv->childId);
}
- if(!workerEnv->was_initialized) {
- workerEnv->was_initialized = JK_TRUE;
-
- jk2_init( env, pconf, workerEnv, s );
+ if (!workerEnv->was_initialized) {
+ workerEnv->was_initialized = JK_TRUE;
- if (workerEnv->childId > 0)
- env->l->jkLog(env, env->l, JK_LOG_INFO, "mod_jk2 child %d initialized\n",
+ jk2_init(env, pconf, workerEnv, s);
+
+ if (workerEnv->childId > 0)
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "mod_jk2 child %d initialized\n",
workerEnv->childId);
- }
+ }
}
@@ -622,157 +642,164 @@
/** Main service method, called to forward a request to tomcat
*/
-static int jk2_handler(request_rec *r)
-{
- int rc;
- jk_worker_t *worker=NULL;
+static int jk2_handler(request_rec * r)
+{
+ int rc;
+ jk_worker_t *worker = NULL;
jk_uriEnv_t *uriEnv;
jk_env_t *env;
- jk_ws_service_t *s=NULL;
- jk_pool_t *rPool=NULL;
+ jk_ws_service_t *s = NULL;
+ jk_pool_t *rPool = NULL;
int rc1;
- uriEnv=ap_get_module_config( r->request_config, &jk2_module );
- if (uriEnv==NULL)
- uriEnv=ap_get_module_config( r->per_dir_config, &jk2_module );
+ uriEnv = ap_get_module_config(r->request_config, &jk2_module);
+ if (uriEnv == NULL)
+ uriEnv = ap_get_module_config(r->per_dir_config, &jk2_module);
/* not for me, try next handler */
- if(uriEnv==NULL || strcmp(r->handler,JK_HANDLER)!=0)
- return DECLINED;
-
+ if (uriEnv == NULL || strcmp(r->handler, JK_HANDLER) != 0)
+ return DECLINED;
+
/* If this is a proxy request, we'll notify an error */
- if(r->proxyreq) {
+ if (r->proxyreq) {
return HTTP_INTERNAL_SERVER_ERROR;
}
/* Get an env instance */
- env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
+ env = workerEnv->globalEnv->getEnv(workerEnv->globalEnv);
/* Set up r->read_chunked flags for chunked encoding, if present */
- if(rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) {
+ if (rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) {
env->l->jkLog(env, env->l, JK_LOG_INFO,
"mod_jk2.handler() Can't setup client block %d\n", rc);
- workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
+ workerEnv->globalEnv->releaseEnv(workerEnv->globalEnv, env);
return rc;
}
- worker=uriEnv->worker;
-
- if( worker==NULL && uriEnv->workerName != NULL ) {
- worker=env->getByName( env, uriEnv->workerName);
- env->l->jkLog(env, env->l, JK_LOG_INFO,
+ worker = uriEnv->worker;
+
+ if (worker == NULL && uriEnv->workerName != NULL) {
+ worker = env->getByName(env, uriEnv->workerName);
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
"mod_jk2.handler() finding worker for %#lx %#lx %s\n",
worker, uriEnv, uriEnv->workerName);
- uriEnv->worker=worker;
+ uriEnv->worker = worker;
}
- if(worker==NULL || worker->mbean == NULL || worker->mbean->localName==NULL ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "mod_jk2.handle() No worker for %s\n", r->uri);
- workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
+ if (worker == NULL || worker->mbean == NULL
+ || worker->mbean->localName == NULL) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "mod_jk2.handle() No worker for %s\n", r->uri);
+ workerEnv->globalEnv->releaseEnv(workerEnv->globalEnv, env);
return HTTP_INTERNAL_SERVER_ERROR;
}
- if( uriEnv->mbean->debug > 0 )
- env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ if (uriEnv->mbean->debug > 0)
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"mod_jk2.handler() serving %s with %#lx %#lx %s\n",
- uriEnv->mbean->localName, worker, worker->mbean, worker->mbean->localName );
+ uriEnv->mbean->localName, worker, worker->mbean,
+ worker->mbean->localName);
/* Get a pool for the request XXX move it in workerEnv to
be shared with other server adapters */
- rPool= worker->rPoolCache->get( env, worker->rPoolCache );
- if( rPool == NULL ) {
- rPool=worker->mbean->pool->create( env, worker->mbean->pool, HUGE_POOL_SIZE );
- if( uriEnv->mbean->debug > 0 )
+ rPool = worker->rPoolCache->get(env, worker->rPoolCache);
+ if (rPool == NULL) {
+ rPool =
+ worker->mbean->pool->create(env, worker->mbean->pool,
+ HUGE_POOL_SIZE);
+ if (uriEnv->mbean->debug > 0)
env->l->jkLog(env, env->l, JK_LOG_DEBUG,
- "mod_jk2.handler(): new rpool %#lx\n", rPool );
+ "mod_jk2.handler(): new rpool %#lx\n", rPool);
}
-
- s=(jk_ws_service_t *)rPool->calloc( env, rPool, sizeof( jk_ws_service_t ));
-
+
+ s = (jk_ws_service_t *)rPool->calloc(env, rPool, sizeof(jk_ws_service_t));
+
/* XXX we should reuse the request itself !!! */
- jk2_service_apache2_init( env, s );
+ jk2_service_apache2_init(env, s);
s->pool = rPool;
- s->init( env, s, worker, r );
-
+ s->init(env, s, worker, r);
+
/* reset the reco_status, will be set to INITED in LB mode */
s->reco_status = RECO_NONE;
-
+
s->is_recoverable_error = JK_FALSE;
- s->uriEnv = uriEnv;
+ s->uriEnv = uriEnv;
/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
/* "mod_jk2.handler() Calling %s\n", worker->mbean->name); */
-
+
rc = worker->service(env, worker, s);
-
+
s->afterRequest(env, s);
-
+
rPool->reset(env, rPool);
-
- rc1=worker->rPoolCache->put( env, worker->rPoolCache, rPool );
- if( rc1 == JK_OK ) {
- rPool=NULL;
+
+ rc1 = worker->rPoolCache->put(env, worker->rPoolCache, rPool);
+ if (rc1 == JK_OK) {
+ rPool = NULL;
}
- if( rPool!=NULL ) {
+ if (rPool != NULL) {
rPool->close(env, rPool);
}
- if(rc==JK_OK) {
- workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
- return OK; /* NOT r->status, even if it has changed. */
+ if (rc == JK_OK) {
+ workerEnv->globalEnv->releaseEnv(workerEnv->globalEnv, env);
+ return OK; /* NOT r->status, even if it has changed. */
}
env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "mod_jk2.handler() Error connecting to tomcat %d, status %d\n", rc, s->status);
-
- workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
+ "mod_jk2.handler() Error connecting to tomcat %d, status %d\n",
+ rc, s->status);
+
+ workerEnv->globalEnv->releaseEnv(workerEnv->globalEnv, env);
/* In case of error, if service() set a status code, send it back */
/* Else fallback to HTTP_INTERNAL_SERVER_ERROR (500). */
if (s->status != 0)
return s->status;
else
- return HTTP_INTERNAL_SERVER_ERROR;
+ return HTTP_INTERNAL_SERVER_ERROR;
}
/** Use the internal mod_jk2 mappings to find if this is a request for
* tomcat and what worker to use.
*/
-static int jk2_translate(request_rec *r)
+static int jk2_translate(request_rec * r)
{
jk_uriEnv_t *uriEnv;
jk_env_t *env;
- if(r->proxyreq || workerEnv==NULL) {
+ if (r->proxyreq || workerEnv == NULL) {
return DECLINED;
}
/* For the JkUriSet */
- uriEnv=ap_get_module_config( r->per_dir_config, &jk2_module );
+ uriEnv = ap_get_module_config(r->per_dir_config, &jk2_module);
/* This has been mapped to a location by apache
* In a previous ( experimental ) version we had a sub-map,
* but that's too complex for now.
*/
- if( uriEnv!= NULL && uriEnv->workerName != NULL) {
+ if (uriEnv != NULL && uriEnv->workerName != NULL) {
/* get_env() */
- env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
+ env = workerEnv->globalEnv->getEnv(workerEnv->globalEnv);
- if( uriEnv->mbean->debug > 0 )
- env->l->jkLog(env, env->l, JK_LOG_DEBUG,
- "PerDir mapping %s=%s\n",r->uri, uriEnv->workerName);
-
- ap_set_module_config( r->request_config, &jk2_module, uriEnv );
- r->handler=JK_HANDLER;
- workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
+ if (uriEnv->mbean->debug > 0)
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "PerDir mapping %s=%s\n", r->uri,
+ uriEnv->workerName);
+
+ ap_set_module_config(r->request_config, &jk2_module, uriEnv);
+ r->handler = JK_HANDLER;
+ workerEnv->globalEnv->releaseEnv(workerEnv->globalEnv, env);
/* This could be a sub-request, possibly from mod_dir */
- if(r->main){
- ap_set_module_config( r->main->request_config, &jk2_module, uriEnv );
- r->main->handler=JK_HANDLER;
+ if (r->main) {
+ ap_set_module_config(r->main->request_config, &jk2_module,
+ uriEnv);
+ r->main->handler = JK_HANDLER;
}
return OK;
@@ -784,54 +811,53 @@
/* XXX Can we use type checker step to set our stuff ? */
/* bypass the directory_walk and file_walk for non-file requests */
-static int jk2_map_to_storage(request_rec *r)
+static int jk2_map_to_storage(request_rec * r)
{
jk_uriEnv_t *uriEnv;
jk_env_t *env;
const char *ptr;
- if (r->proxyreq || workerEnv==NULL) {
+ if (r->proxyreq || workerEnv == NULL) {
return DECLINED;
}
/* If already mapped by translate just returns OK */
- uriEnv = ap_get_module_config( r->request_config, &jk2_module );
- if (uriEnv!=NULL && uriEnv->workerName != NULL)
+ uriEnv = ap_get_module_config(r->request_config, &jk2_module);
+ if (uriEnv != NULL && uriEnv->workerName != NULL)
return OK;
/* From something like [uri:/examples/STAR] in workers2.properties */
- env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
+ env = workerEnv->globalEnv->getEnv(workerEnv->globalEnv);
ptr = ap_get_server_name(r);
- if ( strlen(ptr) > 1024 - 12 ) {
+ if (strlen(ptr) > 1024 - 12) {
/* That is probably an invalid request, DECLINED could display jsp source code. */
- env->l->jkLog(env, env->l, JK_LOG_DEBUG,
- "jk2_map_to_storage Host too big %s\n", ptr);
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "jk2_map_to_storage Host too big %s\n", ptr);
return HTTP_BAD_REQUEST;
}
- uriEnv=workerEnv->uriMap->mapUri(env, workerEnv->uriMap,
- ptr,
- ap_get_server_port(r),
- r->uri);
-
- if (uriEnv!=NULL && uriEnv->workerName != NULL) {
- ap_set_module_config( r->request_config, &jk2_module, uriEnv );
- r->handler=JK_HANDLER;
- workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
-
+ uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,
+ ptr, ap_get_server_port(r), r->uri);
+
+ if (uriEnv != NULL && uriEnv->workerName != NULL) {
+ ap_set_module_config(r->request_config, &jk2_module, uriEnv);
+ r->handler = JK_HANDLER;
+ workerEnv->globalEnv->releaseEnv(workerEnv->globalEnv, env);
+
/* This could be a sub-request, possibly from mod_dir */
- if(r->main){
- ap_set_module_config( r->main->request_config, &jk2_module, uriEnv );
- r->main->handler=JK_HANDLER;
+ if (r->main) {
+ ap_set_module_config(r->main->request_config, &jk2_module,
+ uriEnv);
+ r->main->handler = JK_HANDLER;
}
return OK;
}
- workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
+ workerEnv->globalEnv->releaseEnv(workerEnv->globalEnv, env);
return DECLINED;
}
-static void jk2_register_hooks(apr_pool_t *p)
+static void jk2_register_hooks(apr_pool_t * p)
{
ap_hook_handler(jk2_handler, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_config(jk2_post_config, NULL, NULL, APR_HOOK_MIDDLE);
@@ -839,28 +865,27 @@
/* Force the mpm to run before us and set the scoreboard image */
ap_hook_child_init(jk2_child_init, NULL, NULL, APR_HOOK_LAST);
- ap_hook_translate_name(jk2_translate, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_translate_name(jk2_translate, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_map_to_storage(jk2_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA jk2_module =
-{
+module AP_MODULE_DECLARE_DATA jk2_module = {
STANDARD20_MODULE_STUFF,
- jk2_create_dir_config, /* dir config creater */
- jk2_merge_dir_config, /* dir merger --- default is to override */
- jk2_create_config, /* server config */
- jk2_merge_config, /* merge server config */
- jk2_cmds, /* command ap_table_t */
- jk2_register_hooks /* register hooks */
+ jk2_create_dir_config, /* dir config creater */
+ jk2_merge_dir_config, /* dir merger --- default is to override */
+ jk2_create_config, /* server config */
+ jk2_merge_config, /* merge server config */
+ jk2_cmds, /* command ap_table_t */
+ jk2_register_hooks /* register hooks */
};
#ifdef WIN32
-BOOL WINAPI DllMain(HINSTANCE hInst, // Instance Handle of the DLL
- ULONG ulReason, // Reason why NT called this DLL
- LPVOID lpReserved) // Reserved parameter for future use
+BOOL WINAPI DllMain(HINSTANCE hInst, // Instance Handle of the DLL
+ ULONG ulReason, // Reason why NT called this DLL
+ LPVOID lpReserved) // Reserved parameter for future use
{
- GetModuleFileName( hInst, file_name, sizeof(file_name));
+ GetModuleFileName(hInst, file_name, sizeof(file_name));
return TRUE;
}
1.42 +219 -201 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- jk_service_apache2.c 24 Feb 2004 15:51:23 -0000 1.41
+++ jk_service_apache2.c 21 Mar 2004 09:44:30 -0000 1.42
@@ -30,47 +30,48 @@
/* #define USE_APRTABLES */
-#define NULL_FOR_EMPTY(x) ((((x)!=NULL) && (strlen((x))!=0)) ? (x) : NULL )
+#define NULL_FOR_EMPTY(x) ((((x)!=NULL) && (strlen((x))!=0)) ? (x) : NULL )
-static int JK_METHOD jk2_service_apache2_head(jk_env_t *env, jk_ws_service_t *s )
+static int JK_METHOD jk2_service_apache2_head(jk_env_t *env,
+ jk_ws_service_t *s)
{
int h;
int numheaders;
request_rec *r;
jk_map_t *headers;
- int debug=1;
-
- if(s==NULL || s->ws_private==NULL ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ int debug = 1;
+
+ if (s == NULL || s->ws_private == NULL) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
"service.head() NullPointerException\n");
return JK_ERR;
}
-
- if( s->uriEnv != NULL )
- debug=s->uriEnv->mbean->debug;
-
- r = (request_rec *)s->ws_private;
-
- if(s->msg==NULL) {
+
+ if (s->uriEnv != NULL)
+ debug = s->uriEnv->mbean->debug;
+
+ r = (request_rec *) s->ws_private;
+
+ if (s->msg == NULL) {
s->msg = "";
}
r->status = s->status;
r->status_line = apr_psprintf(r->pool, "%d %s", s->status, s->msg);
- headers=s->headers_out;
+ headers = s->headers_out;
#ifdef USE_APRTABLES
{
- char *val= headers->get( env, headers, "Content-Type");
- if( val!=NULL ) {
+ char *val = headers->get(env, headers, "Content-Type");
+ if (val != NULL) {
char *tmp = apr_pstrdup(r->pool, val);
- ap_content_type_tolower(tmp);
+ ap_content_type_tolower(tmp);
/* It should be done like this in Apache 2.0 */
/* This way, Apache 2.0 will be able to set the output filter */
/* and it make jk useable with deflate using AddOutputFilterByType DEFLATE text/html */
ap_set_content_type(r, tmp);
}
- val= headers->get( env, headers, "Last-Modified");
- if( val!=NULL ) {
+ val = headers->get(env, headers, "Last-Modified");
+ if (val != NULL) {
/*
* If the script gave us a Last-Modified header, we can't just
* pass it on blindly because of restrictions on future values.
@@ -81,46 +82,51 @@
/* No other change required - headers is the same as req->headers_out,
just with a different interface
- */
+ */
}
#else
numheaders = headers->size(env, headers);
/* XXX As soon as we switch to jk_map_apache2, this will not be needed ! */
- if( debug > 0 )
- env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ if (debug > 0)
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"service.head() %d %d %#lx\n", s->status,
numheaders, s->uriEnv);
-
- for(h = 0 ; h < numheaders; h++) {
- char *name=headers->nameAt( env, headers, h );
- char *val=headers->valueAt( env, headers, h );
- name=s->pool->pstrdup( env, s->pool, name );
- val=s->pool->pstrdup( env, s->pool, val );
-
- if( debug > 0 )
- env->l->jkLog(env, env->l, JK_LOG_DEBUG,
- "service.head() %s: %s %d %d\n", name, val, h, headers->size( env, headers ));
+
+ for (h = 0; h < numheaders; h++) {
+ char *name = headers->nameAt(env, headers, h);
+ char *val = headers->valueAt(env, headers, h);
+ name = s->pool->pstrdup(env, s->pool, name);
+ val = s->pool->pstrdup(env, s->pool, val);
+
+ if (debug > 0)
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "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")) {
/* XXX should be done in handler ! */
char *tmp = apr_pstrdup(r->pool, val);
- ap_content_type_tolower(tmp);
+ ap_content_type_tolower(tmp);
/* It should be done like this in Apache 2.0 */
/* This way, Apache 2.0 will be able to set the output filter */
/* and it make jk useable with deflate using AddOutputFilterByType DEFLATE text/html */
ap_set_content_type(r, tmp);
r->content_type = tmp;
apr_table_set(r->headers_out, name, val);
- } else if(!strcasecmp(name, "Location")) {
+ }
+ else if (!strcasecmp(name, "Location")) {
/* XXX setn */
apr_table_set(r->headers_out, name, val);
- } else if(!strcasecmp(name, "Content-Length")) {
- apr_table_set(r->headers_out, name, val );
- } else if(!strcasecmp(name, "Transfer-Encoding")) {
- apr_table_set(r->headers_out,name, val);
- } else if(!strcasecmp(name, "Last-Modified")) {
+ }
+ else if (!strcasecmp(name, "Content-Length")) {
+ apr_table_set(r->headers_out, name, val);
+ }
+ else if (!strcasecmp(name, "Transfer-Encoding")) {
+ apr_table_set(r->headers_out, name, val);
+ }
+ else if (!strcasecmp(name, "Last-Modified")) {
/*
* If the script gave us a Last-Modified header, we can't just
* pass it on blindly because of restrictions on future values.
@@ -128,20 +134,21 @@
ap_update_mtime(r, apr_date_parse_http(val));
ap_set_last_modified(r);
apr_table_set(r->headers_out, name, val);
- } else {
+ }
+ else {
/* All other headers may have multiple values like
* Set-Cookie, so use the table_add to allow that.
*/
- apr_table_add(r->headers_out, name, val);
+ apr_table_add(r->headers_out, name, val);
/* apr_table_set(r->headers_out, name, val); */
}
}
#endif
-
+
/* this NOP function was removed in apache 2.0 alpha14 */
/* ap_send_http_header(r); */
s->response_started = JK_TRUE;
-
+
return JK_OK;
}
@@ -154,28 +161,31 @@
* the jk_ws_service class. Think of the *s param as a "this" or "self"
* pointer.
*/
-static int JK_METHOD jk2_service_apache2_read(jk_env_t *env, jk_ws_service_t *s,
- void *b, unsigned len,
+static int JK_METHOD jk2_service_apache2_read(jk_env_t *env,
+ jk_ws_service_t *s, void *b,
+ unsigned len,
unsigned *actually_read)
{
- if(s==NULL || s->ws_private==NULL || b==NULL || actually_read==NULL ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ if (s == NULL || s->ws_private == NULL || b == NULL
+ || actually_read == NULL) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
"service.read() NullPointerException\n");
return JK_ERR;
}
- if(!s->read_body_started) {
- if(ap_should_client_block(s->ws_private)) {
+ if (!s->read_body_started) {
+ if (ap_should_client_block(s->ws_private)) {
s->read_body_started = JK_TRUE;
}
}
- if(s->read_body_started) {
+ 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;
+ }
+ else {
+ *actually_read = (unsigned)rv;
}
}
return JK_OK;
@@ -197,52 +207,55 @@
#define CHUNK_SIZE 4096
#endif
-static int JK_METHOD jk2_service_apache2_write(jk_env_t *env, jk_ws_service_t *s,
- const void *b, unsigned int len)
+static int JK_METHOD jk2_service_apache2_write(jk_env_t *env,
+ jk_ws_service_t *s,
+ const void *b,
+ unsigned int len)
{
size_t r = 0;
- long ll=len;
- char *bb=(char *)b;
+ long ll = len;
+ char *bb = (char *)b;
request_rec *rr;
- int debug=1;
+ int debug = 1;
int rc;
-
- if(s==NULL || s->ws_private == NULL || b==NULL) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
+
+ if (s == NULL || s->ws_private == NULL || b == NULL) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
"service.write() NullPointerException\n");
return JK_ERR;
}
- if( s->uriEnv != NULL )
- debug=s->uriEnv->mbean->debug;
-
- if(len==0 ) {
+ if (s->uriEnv != NULL)
+ debug = s->uriEnv->mbean->debug;
+
+ if (len == 0) {
return JK_OK;
}
/* BUFF *bf = p->r->connection->client; */
/* size_t w = (size_t)l; */
- rr=s->ws_private;
-
- if(!s->response_started) {
- if( debug > 0 )
- env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ rr = s->ws_private;
+
+ if (!s->response_started) {
+ if (debug > 0)
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"service.write() default head\n");
- rc=s->head(env, s);
- if( rc != JK_OK) {
+ rc = s->head(env, s);
+ if (rc != JK_OK) {
return rc;
}
-
+
{
const apr_array_header_t *t = apr_table_elts(rr->headers_out);
- if(t && t->nelts) {
+ if (t && t->nelts) {
int i;
-
- apr_table_entry_t *elts = (apr_table_entry_t *)t->elts;
-
- if( debug > 0 ) {
- for(i = 0 ; i < t->nelts ; i++) {
- env->l->jkLog(env, env->l, JK_LOG_DEBUG, "OutHeaders %s: %s\n",
- elts[i].key, elts[i].val);
+
+ apr_table_entry_t *elts = (apr_table_entry_t *) t->elts;
+
+ if (debug > 0) {
+ for (i = 0; i < t->nelts; i++) {
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "OutHeaders %s: %s\n", elts[i].key,
+ elts[i].val);
}
}
}
@@ -253,31 +266,31 @@
ap_rflush(rr);
return JK_OK;
}
-
+
/* Debug - try to get around rwrite */
- while( ll > 0 ) {
- unsigned long toSend=(ll>CHUNK_SIZE) ? CHUNK_SIZE : ll;
- r = ap_rwrite((const char *)bb, toSend, rr );
+ while (ll > 0) {
+ unsigned long toSend = (ll > CHUNK_SIZE) ? CHUNK_SIZE : ll;
+ r = ap_rwrite((const char *)bb, toSend, rr);
/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
/* "service.write() %ld (%ld) out of %ld \n",toSend, r, ll ); */
- ll-=CHUNK_SIZE;
- bb+=CHUNK_SIZE;
-
- if(toSend != r) {
- return JK_ERR;
- }
-
+ ll -= CHUNK_SIZE;
+ bb += CHUNK_SIZE;
+
+ if (toSend != r) {
+ return JK_ERR;
+ }
+
}
-
+
/*
* To allow server push. After writing full buffers
*/
- if(ap_rflush(rr) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,
- NULL, "mod_jk: Error flushing" );
+ if (ap_rflush(rr) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,
+ NULL, "mod_jk: Error flushing");
return JK_ERR;
}
-
+
return JK_OK;
}
@@ -285,16 +298,17 @@
/* Utility functions */
/* ========================================================================= */
-static long jk2_get_content_length(jk_env_t *env, request_rec *r)
+static long jk2_get_content_length(jk_env_t *env, request_rec * r)
{
- if(r->clength > 0) {
+ if (r->clength > 0) {
return (long)(r->clength);
- } else {
+ }
+ else {
char *lenp = (char *)apr_table_get(r->headers_in, "Content-Length");
- if(lenp) {
+ if (lenp) {
long rc = atol(lenp);
- if(rc > 0) {
+ if (rc > 0) {
return rc;
}
}
@@ -306,10 +320,10 @@
static int JK_METHOD jk2_init_ws_service(jk_env_t *env, jk_ws_service_t *s,
jk_worker_t *worker, void *serverObj)
{
- char *ssl_temp = NULL;
+ char *ssl_temp = NULL;
jk_workerEnv_t *workerEnv;
- request_rec *r=serverObj;
- int need_content_length_header=JK_FALSE;
+ request_rec *r = serverObj;
+ int need_content_length_header = JK_FALSE;
workerEnv = worker->workerEnv;
/* Common initialization */
@@ -320,33 +334,33 @@
s->ws_private = r;
s->response_started = JK_FALSE;
s->read_body_started = JK_FALSE;
- s->workerEnv=workerEnv;
+ s->workerEnv = workerEnv;
- s->jvm_route = NULL; /* Used for sticky session routing */
+ s->jvm_route = NULL; /* Used for sticky session routing */
- s->auth_type = NULL_FOR_EMPTY(r->ap_auth_type);
- s->remote_user = NULL_FOR_EMPTY(r->user);
+ s->auth_type = NULL_FOR_EMPTY(r->ap_auth_type);
+ s->remote_user = NULL_FOR_EMPTY(r->user);
- s->protocol = r->protocol;
- s->remote_host = (char *)ap_get_remote_host(r->connection,
- r->per_dir_config,
- REMOTE_HOST, NULL);
- s->remote_host = NULL_FOR_EMPTY(s->remote_host);
- s->remote_addr = NULL_FOR_EMPTY(r->connection->remote_ip);
+ s->protocol = r->protocol;
+ s->remote_host = (char *)ap_get_remote_host(r->connection,
+ r->per_dir_config,
+ REMOTE_HOST, NULL);
+ s->remote_host = NULL_FOR_EMPTY(s->remote_host);
+ s->remote_addr = NULL_FOR_EMPTY(r->connection->remote_ip);
/* get server name like in jk 1.2.x */
- s->server_name= (char *)ap_get_server_name(r);
+ s->server_name = (char *)ap_get_server_name(r);
/* get the real port (otherwise redirect failed) */
s->server_port = r->connection->local_addr->port;
s->server_software = (char *)ap_get_server_version();
- s->method = (char *)r->method;
+ s->method = (char *)r->method;
s->content_length = jk2_get_content_length(env, r);
- s->is_chunked = r->read_chunked;
+ s->is_chunked = r->read_chunked;
s->no_more_chunks = 0;
- s->query_string = r->args;
+ s->query_string = r->args;
s->startTime = r->request_time;
/*
@@ -367,64 +381,65 @@
switch (workerEnv->options & JK_OPT_FWDURIMASK) {
- case JK_OPT_FWDURICOMPATUNPARSED :
- s->req_uri = r->unparsed_uri;
- if (s->req_uri != NULL) {
- char *query_str = strchr(s->req_uri, '?');
- if (query_str != NULL) {
- *query_str = 0;
- }
+ case JK_OPT_FWDURICOMPATUNPARSED:
+ s->req_uri = r->unparsed_uri;
+ if (s->req_uri != NULL) {
+ char *query_str = strchr(s->req_uri, '?');
+ if (query_str != NULL) {
+ *query_str = 0;
}
+ }
break;
- case JK_OPT_FWDURICOMPAT :
- s->req_uri = r->uri;
+ case JK_OPT_FWDURICOMPAT:
+ s->req_uri = r->uri;
break;
- case JK_OPT_FWDURIESCAPED :
- s->req_uri = ap_escape_uri(r->pool, r->uri);
+ case JK_OPT_FWDURIESCAPED:
+ s->req_uri = ap_escape_uri(r->pool, r->uri);
break;
- default :
- return JK_ERR;
+ default:
+ return JK_ERR;
}
- s->is_ssl = JK_FALSE;
- s->ssl_cert = NULL;
+ s->is_ssl = JK_FALSE;
+ s->ssl_cert = NULL;
s->ssl_cert_len = 0;
- s->ssl_cipher = NULL; /* required by Servlet 2.3 Api,
+ s->ssl_cipher = NULL; /* required by Servlet 2.3 Api,
allready in original ajp13 */
- s->ssl_session = NULL;
- s->ssl_key_size = -1; /* required by Servlet 2.3 Api, added in jtc */
+ s->ssl_session = NULL;
+ s->ssl_key_size = -1; /* required by Servlet 2.3 Api, added in jtc */
- if(workerEnv->ssl_enable || workerEnv->envvars_in_use) {
+ if (workerEnv->ssl_enable || workerEnv->envvars_in_use) {
ap_add_common_vars(r);
- if(workerEnv->ssl_enable) {
- ssl_temp =
- (char *)apr_table_get(r->subprocess_env,
+ if (workerEnv->ssl_enable) {
+ ssl_temp =
+ (char *)apr_table_get(r->subprocess_env,
workerEnv->https_indicator);
- if(ssl_temp && !strcasecmp(ssl_temp, "on")) {
- s->is_ssl = JK_TRUE;
- s->ssl_cert =
- (char *)apr_table_get(r->subprocess_env,
+ if (ssl_temp && !strcasecmp(ssl_temp, "on")) {
+ s->is_ssl = JK_TRUE;
+ s->ssl_cert =
+ (char *)apr_table_get(r->subprocess_env,
workerEnv->certs_indicator);
- if(s->ssl_cert) {
+ if (s->ssl_cert) {
s->ssl_cert_len = strlen(s->ssl_cert);
}
/* Servlet 2.3 API */
- s->ssl_cipher =
- (char *)apr_table_get(r->subprocess_env,
+ s->ssl_cipher =
+ (char *)apr_table_get(r->subprocess_env,
workerEnv->cipher_indicator);
- s->ssl_session =
- (char *)apr_table_get(r->subprocess_env,
+ s->ssl_session =
+ (char *)apr_table_get(r->subprocess_env,
workerEnv->session_indicator);
if (workerEnv->options & JK_OPT_FWDKEYSIZE) {
/* Servlet 2.3 API */
- ssl_temp = (char *)apr_table_get(r->subprocess_env,
- workerEnv->key_size_indicator);
+ ssl_temp = (char *)apr_table_get(r->subprocess_env,
+ workerEnv->
+ key_size_indicator);
if (ssl_temp)
s->ssl_key_size = atoi(ssl_temp);
}
@@ -434,68 +449,70 @@
#ifdef USE_APRTABLES
/* We can't do that - the filtering should happen in
common to enable that.
-
- jk2_map_aprtable_factory( workerEnv->env, s->pool,
- &s->attributes,
- "map", "aprtable" );
- s->attributes->init( NULL, s->attributes, 0, XXX);
- */
- jk2_map_default_create(env, &s->attributes, s->pool );
+
+ jk2_map_aprtable_factory( workerEnv->env, s->pool,
+ &s->attributes,
+ "map", "aprtable" );
+ s->attributes->init( NULL, s->attributes, 0, XXX);
+ */
+ jk2_map_default_create(env, &s->attributes, s->pool);
#else
- jk2_map_default_create(env, &s->attributes, s->pool );
+ jk2_map_default_create(env, &s->attributes, s->pool);
#endif
-
- if(workerEnv->envvars_in_use) {
- int envCnt=workerEnv->envvars->size( env, workerEnv->envvars );
+
+ if (workerEnv->envvars_in_use) {
+ int envCnt = workerEnv->envvars->size(env, workerEnv->envvars);
int i;
- for( i=0; i< envCnt ; 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( env, workerEnv->envvars, i );
+ for (i = 0; i < envCnt; 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(env, workerEnv->envvars,
+ i);
}
- s->attributes->put( env, s->attributes, name, val, NULL );
+ s->attributes->put(env, s->attributes, name, val, NULL);
}
}
}
#ifdef USE_APRTABLES
- jk2_map_aprtable_factory( env, s->pool,
- (void *)&s->headers_in,
- "map", "aprtable" );
- s->headers_in->init( env, s->headers_in, 0, r->headers_in);
+ jk2_map_aprtable_factory(env, s->pool,
+ (void *)&s->headers_in, "map", "aprtable");
+ s->headers_in->init(env, s->headers_in, 0, r->headers_in);
#else
- jk2_map_default_create(env, &s->headers_in, s->pool );
+ jk2_map_default_create(env, &s->headers_in, s->pool);
- if(r->headers_in && apr_table_elts(r->headers_in)) {
+ if (r->headers_in && apr_table_elts(r->headers_in)) {
const apr_array_header_t *t = apr_table_elts(r->headers_in);
- if(t && t->nelts) {
+ if (t && t->nelts) {
int i;
- apr_table_entry_t *elts = (apr_table_entry_t *)t->elts;
+ apr_table_entry_t *elts = (apr_table_entry_t *) t->elts;
- for(i = 0 ; i < t->nelts ; i++) {
- s->headers_in->add( env, s->headers_in,
- elts[i].key, elts[i].val);
+ for (i = 0; i < t->nelts; i++) {
+ s->headers_in->add(env, s->headers_in,
+ elts[i].key, elts[i].val);
}
}
}
#endif
- if(!s->is_chunked && s->content_length == 0) {
+ if (!s->is_chunked && s->content_length == 0) {
/* 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( env, s->headers_in, "content-length", "0", NULL );
+ s->headers_in->put(env, s->headers_in, "content-length", "0", NULL);
}
#ifdef USE_APRTABLES
- jk2_map_aprtable_factory( env, s->pool, (void *)&s->headers_out,
- "map", "aprtable" );
- s->headers_in->init( env, s->headers_out, 0, r->headers_out);
+ jk2_map_aprtable_factory(env, s->pool, (void *)&s->headers_out,
+ "map", "aprtable");
+ s->headers_in->init(env, s->headers_out, 0, r->headers_out);
#else
- jk2_map_default_create(env, &s->headers_out, s->pool );
+ jk2_map_default_create(env, &s->headers_out, s->pool);
#endif
return JK_OK;
@@ -511,13 +528,14 @@
* jk shouldn't do it instead, and the user should get the
* error message !
*/
-static void JK_METHOD jk2_service_apache2_afterRequest(jk_env_t *env, jk_ws_service_t *s )
+static void JK_METHOD jk2_service_apache2_afterRequest(jk_env_t *env,
+ jk_ws_service_t *s)
{
-
+
if (s->content_read < s->content_length ||
- (s->is_chunked && ! s->no_more_chunks)) {
-
- request_rec *r=s->ws_private;
+ (s->is_chunked && !s->no_more_chunks)) {
+
+ request_rec *r = s->ws_private;
char *buff = apr_palloc(r->pool, 2048);
if (buff != NULL) {
@@ -529,26 +547,26 @@
}
if (s->realWorker) {
struct jk_worker *w = s->realWorker;
- if (w != NULL && w->channel != NULL
+ if (w != NULL && w->channel != NULL
&& w->channel->afterRequest != NULL) {
- w->channel->afterRequest( env, w->channel, w, NULL, s );
+ w->channel->afterRequest(env, w->channel, w, NULL, s);
}
}
}
int JK_METHOD jk2_service_apache2_init(jk_env_t *env, jk_ws_service_t *s)
{
- if(s==NULL ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ if (s == NULL) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
"service.init() NullPointerException\n");
return JK_ERR;
}
- s->head = jk2_service_apache2_head;
- s->read = jk2_service_apache2_read;
- s->write = jk2_service_apache2_write;
- s->init = jk2_init_ws_service;
- s->afterRequest = jk2_service_apache2_afterRequest;
+ s->head = jk2_service_apache2_head;
+ s->read = jk2_service_apache2_read;
+ s->write = jk2_service_apache2_write;
+ s->init = jk2_init_ws_service;
+ s->afterRequest = jk2_service_apache2_afterRequest;
return JK_OK;
}
1.13 +45 -47 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_map_aprtable.c 24 Feb 2004 08:44:42 -0000 1.12
+++ jk_map_aprtable.c 21 Mar 2004 09:44:30 -0000 1.13
@@ -33,71 +33,71 @@
#include "jk_apache2.h"
-static void *jk2_map_aprtable_get( struct jk_env *env, struct jk_map *_this,
+static void *jk2_map_aprtable_get(struct jk_env *env, struct jk_map *_this,
const char *name)
{
- apr_table_t *aprMap=_this->_private;
- return (void *)apr_table_get( aprMap, name );
+ apr_table_t *aprMap = _this->_private;
+ return (void *)apr_table_get(aprMap, name);
}
-static int jk2_map_aprtable_put( struct jk_env *env, struct jk_map *_this,
+static int jk2_map_aprtable_put(struct jk_env *env, struct jk_map *_this,
const char *name, void *value,
- void **oldValue )
+ void **oldValue)
{
- apr_table_t *aprMap=_this->_private;
- if( oldValue != NULL ) {
- *oldValue=(void *)apr_table_get( aprMap, (char *)name );
+ apr_table_t *aprMap = _this->_private;
+ if (oldValue != NULL) {
+ *oldValue = (void *)apr_table_get(aprMap, (char *)name);
}
-
- apr_table_setn( aprMap, name, (char *)value );
-
+
+ apr_table_setn(aprMap, name, (char *)value);
+
return JK_OK;
}
-static int jk2_map_aprtable_add( struct jk_env *env, struct jk_map *_this,
- const char *name, void *value )
+static int jk2_map_aprtable_add(struct jk_env *env, struct jk_map *_this,
+ const char *name, void *value)
{
- apr_table_t *aprMap=_this->_private;
-
- apr_table_addn( aprMap, name, (char *)value );
-
+ apr_table_t *aprMap = _this->_private;
+
+ apr_table_addn(aprMap, name, (char *)value);
+
return JK_OK;
}
-static int jk2_map_aprtable_size( struct jk_env *env, struct jk_map *_this )
+static int jk2_map_aprtable_size(struct jk_env *env, struct jk_map *_this)
{
- apr_table_t *aprMap=_this->_private;
- const apr_array_header_t *ah = apr_table_elts( aprMap );
+ apr_table_t *aprMap = _this->_private;
+ const apr_array_header_t *ah = apr_table_elts(aprMap);
return ah->nelts;
}
-static char * jk2_map_aprtable_nameAt( struct jk_env *env, struct jk_map *_this,
- int pos)
+static char *jk2_map_aprtable_nameAt(struct jk_env *env, struct jk_map *_this,
+ int pos)
{
- apr_table_t *aprMap=_this->_private;
- const apr_array_header_t *ah = apr_table_elts( aprMap );
- apr_table_entry_t *elts = (apr_table_entry_t *)ah->elts;
-
+ apr_table_t *aprMap = _this->_private;
+ const apr_array_header_t *ah = apr_table_elts(aprMap);
+ apr_table_entry_t *elts = (apr_table_entry_t *) ah->elts;
+
return elts[pos].key;
}
-static void * jk2_map_aprtable_valueAt( struct jk_env *env, struct jk_map *_this,
- int pos)
+static void *jk2_map_aprtable_valueAt(struct jk_env *env,
+ struct jk_map *_this, int pos)
{
- apr_table_t *aprMap=_this->_private;
- const apr_array_header_t *ah = apr_table_elts( aprMap );
- apr_table_entry_t *elts = (apr_table_entry_t *)ah->elts;
+ apr_table_t *aprMap = _this->_private;
+ const apr_array_header_t *ah = apr_table_elts(aprMap);
+ apr_table_entry_t *elts = (apr_table_entry_t *) ah->elts;
return elts[pos].val;
}
static void jk2_map_aprtable_init(jk_env_t *env, jk_map_t *m, int initialSize,
- void *wrappedObj)
+ void *wrappedObj)
{
- m->_private=wrappedObj;
+ m->_private = wrappedObj;
}
static void jk2_map_aprtable_clear(jk_env_t *env, jk_map_t *m)
@@ -111,20 +111,18 @@
jk_bean_t *result,
const char *type, const char *name)
{
- jk_map_t *_this=(jk_map_t *)pool->calloc( env, pool, sizeof(jk_map_t));
+ jk_map_t *_this = (jk_map_t *)pool->calloc(env, pool, sizeof(jk_map_t));
- result->object=_this;
-
- _this->get=jk2_map_aprtable_get;
- _this->put=jk2_map_aprtable_put;
- _this->add=jk2_map_aprtable_add;
- _this->size=jk2_map_aprtable_size;
- _this->nameAt=jk2_map_aprtable_nameAt;
- _this->valueAt=jk2_map_aprtable_valueAt;
- _this->init=jk2_map_aprtable_init;
- _this->clear=jk2_map_aprtable_clear;
-
- return JK_OK;
-}
+ result->object = _this;
+ _this->get = jk2_map_aprtable_get;
+ _this->put = jk2_map_aprtable_put;
+ _this->add = jk2_map_aprtable_add;
+ _this->size = jk2_map_aprtable_size;
+ _this->nameAt = jk2_map_aprtable_nameAt;
+ _this->valueAt = jk2_map_aprtable_valueAt;
+ _this->init = jk2_map_aprtable_init;
+ _this->clear = jk2_map_aprtable_clear;
+ return JK_OK;
+}
1.30 +48 -49 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_logger_apache2.c 24 Feb 2004 08:44:42 -0000 1.29
+++ jk_logger_apache2.c 21 Mar 2004 09:44:30 -0000 1.30
@@ -32,7 +32,7 @@
* based on vhost configs ).
*
* @author Costin Manolache
- */
+ */
#include "jk_apache2.h"
#include <stdio.h>
@@ -40,80 +40,80 @@
#define HUGE_BUFFER_SIZE (8*1024)
-static int JK_METHOD jk2_logger_apache2_log(jk_env_t *env, jk_logger_t *l,
- int level,
- const char *what)
+static int JK_METHOD jk2_logger_apache2_log(jk_env_t *env, jk_logger_t *l,
+ int level, const char *what)
{
return JK_OK;
}
-static int JK_METHOD jk2_logger_apache2_init(jk_env_t *env, jk_logger_t *_this)
+static int JK_METHOD jk2_logger_apache2_init(jk_env_t *env,
+ jk_logger_t *_this)
{
return JK_OK;
}
-static int JK_METHOD jk2_logger_apache2_close(jk_env_t *env, jk_logger_t *_this)
+static int JK_METHOD jk2_logger_apache2_close(jk_env_t *env,
+ jk_logger_t *_this)
{
return JK_OK;
}
static int JK_METHOD jk2_logger_apache2_jkVLog(jk_env_t *env, jk_logger_t *l,
- const char *file,
- int line,
- int level,
- const char *fmt,
- va_list args)
+ const char *file,
+ int line,
+ int level,
+ const char *fmt, va_list args)
{
/* XXX map jk level to apache level */
- server_rec *s=(server_rec *)l->logger_private;
+ server_rec *s = (server_rec *) l->logger_private;
/* If we use apache2 logger, we should also use APR pools.
It is possible to do some workarounds, but it would be stupid, especially
since the idea is to use apr pools long term, with the old jk_pool as
a workaround for apache13 and where apr is not available */
- apr_pool_t *aprPool=env->tmpPool->_private;
+ apr_pool_t *aprPool = env->tmpPool->_private;
int rc;
char *buf;
/* XXX XXX Change this to "SMALLSTACK" or something, I don't think it's
netware specific */
- if( level < l->level )
+ if (level < l->level)
return JK_OK;
- if( s==NULL ) {
+ if (s == NULL) {
return JK_ERR;
}
- buf=apr_pvsprintf( aprPool, fmt, args );
-
- rc=strlen( buf );
+ buf = apr_pvsprintf(aprPool, fmt, args);
+
+ rc = strlen(buf);
/* Remove trailing \n. XXX need to change the log() to not include \n */
- if( buf[rc-1] == '\n' )
- buf[rc-1]='\0';
-
- if( level == JK_LOG_DEBUG_LEVEL ) {
- ap_log_error( file, line, APLOG_DEBUG | APLOG_NOERRNO, 0, s, buf);
- } else if( level == JK_LOG_INFO_LEVEL ) {
- ap_log_error( file, line, APLOG_NOTICE | APLOG_NOERRNO, 0, s, buf);
- } else {
- ap_log_error( file, line, APLOG_ERR | APLOG_NOERRNO, 0, s, buf);
+ if (buf[rc - 1] == '\n')
+ buf[rc - 1] = '\0';
+
+ if (level == JK_LOG_DEBUG_LEVEL) {
+ ap_log_error(file, line, APLOG_DEBUG | APLOG_NOERRNO, 0, s, buf);
+ }
+ else if (level == JK_LOG_INFO_LEVEL) {
+ ap_log_error(file, line, APLOG_NOTICE | APLOG_NOERRNO, 0, s, buf);
+ }
+ else {
+ ap_log_error(file, line, APLOG_ERR | APLOG_NOERRNO, 0, s, buf);
}
- return rc ;
+ return rc;
}
static int jk2_logger_apache2_jkLog(jk_env_t *env, jk_logger_t *l,
- const char *file,
- int line,
- int level,
- const char *fmt, ...)
+ const char *file,
+ int line, int level, const char *fmt, ...)
{
va_list args;
int rc;
-
+
va_start(args, fmt);
- rc=jk2_logger_apache2_jkVLog( env, l, file, line, level, fmt, args );
+ rc = jk2_logger_apache2_jkVLog(env, l, file, line, level, fmt, args);
va_end(args);
return rc;
@@ -121,15 +121,15 @@
static int JK_METHOD
-jk2_logger_file_setProperty(jk_env_t *env, jk_bean_t *mbean,
- char *name, void *valueP )
+jk2_logger_file_setProperty(jk_env_t *env, jk_bean_t *mbean,
+ char *name, void *valueP)
{
- jk_logger_t *_this=mbean->object;
- char *value=valueP;
+ jk_logger_t *_this = mbean->object;
+ char *value = valueP;
- if( strcmp( name, "level" )==0 ) {
+ if (strcmp(name, "level") == 0) {
_this->level = jk2_logger_file_parseLogLevel(env, value);
- if( _this->level == JK_LOG_DEBUG_LEVEL ) {
+ if (_this->level == JK_LOG_DEBUG_LEVEL) {
env->debug = 1;
/* _this->jkLog( env, _this, JK_LOG_ERROR, */
/* "Level %s %d \n", value, _this->level ); */
@@ -141,29 +141,28 @@
-int JK_METHOD
+int JK_METHOD
jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t *result,
const char *type, const char *name)
{
jk_logger_t *l = (jk_logger_t *)pool->calloc(env, pool,
sizeof(jk_logger_t));
- if(l==NULL ) {
+ if (l == NULL) {
return JK_ERR;
}
-
+
l->log = jk2_logger_apache2_log;
l->logger_private = NULL;
- l->init =jk2_logger_apache2_init;
+ l->init = jk2_logger_apache2_init;
l->jkLog = jk2_logger_apache2_jkLog;
l->jkVLog = jk2_logger_apache2_jkVLog;
- l->level=JK_LOG_ERROR_LEVEL;
-
- result->object=(void *)l;
- l->mbean=result;
+ l->level = JK_LOG_ERROR_LEVEL;
+
+ result->object = (void *)l;
+ l->mbean = result;
result->setAttribute = jk2_logger_file_setProperty;
return JK_OK;
}
-
1.15 +6 -4 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_apache2.h 24 Feb 2004 08:44:42 -0000 1.14
+++ jk_apache2.h 21 Mar 2004 09:44:30 -0000 1.15
@@ -52,7 +52,7 @@
/* changed with apr 1.0 */
#include "apr_version.h"
-#if (APR_MAJOR_VERSION < 1)
+#if (APR_MAJOR_VERSION < 1)
#define apr_filepath_name_get apr_filename_of_pathname
#define apr_pool_parent_get apr_pool_get_parent
#endif
@@ -62,10 +62,12 @@
int JK_METHOD jk2_service_apache2_init(jk_env_t *env, jk_ws_service_t *s);
int JK_METHOD jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool,
- jk_bean_t *result, const char *type, const char *name);
+ jk_bean_t *result, const char *type,
+ const char *name);
int JK_METHOD jk2_pool_apr_factory(jk_env_t *env, jk_pool_t *pool,
- jk_bean_t *result, const char *type, const char *name);
+ jk_bean_t *result, const char *type,
+ const char *name);
int JK_METHOD jk2_map_aprtable_factory(jk_env_t *env, jk_pool_t *pool,
jk_bean_t *result,
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org