cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c jk_service_apache13.c

2004-03-21 Thread mturk 
mturk   2004/03/21 01:43:51

  Modified:jk/native2/server/apache13 mod_jk2.c jk_service_apache13.c
  Log:
  Apply the Apache-wide conding style.
  See http://www.apache.org/dev/styleguide.html for details.
  
  Revision  ChangesPath
  1.33  +261 -246  jakarta-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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- mod_jk2.c 12 Mar 2004 13:47:20 -  1.32
  +++ mod_jk2.c 21 Mar 2004 09:43:51 -  1.33
  @@ -48,7 +48,7 @@
   #include "jk_requtil.h"
   
   #ifdef WIN32
  -static char  file_name[_MAX_PATH];
  +static char file_name[_MAX_PATH];
   #endif
   
   
  @@ -68,7 +68,7 @@
* dir mappings. This prevents vhost configs as configured through
* httpd.conf from getting crossed.
*/
  -static int dirCounter=0;
  +static int dirCounter = 0;
   
   /*  Options setters  */
   
  @@ -83,18 +83,19 @@
* XXX Shouldn't abuse it, there is no way to write back
* the properties.
*/
  -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_uriEnv_t *serverEnv=(jk_uriEnv_t *)
  +jk_uriEnv_t *serverEnv = (jk_uriEnv_t *)
   ap_get_module_config(s->module_config, &jk2_module);
  -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 ) {
  -fprintf( stderr, "mod_jk2: Unrecognized option %s %s\n", name, value);
  +
  +rc = workerEnv->config->setPropertyString(env, workerEnv->config,
  +  (char *)name, value);
  +if (rc != JK_OK) {
  +fprintf(stderr, "mod_jk2: Unrecognized option %s %s\n", name, value);
   }
   
   return NULL;
  @@ -125,16 +126,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
  @@ -147,43 +149,49 @@
   
   /* 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 *) ap_pcalloc(cmd->pool,
  -sizeof(char *) * (strlen(s->server_hostname) + 8 )) ;
  -tmp_full_url = (char *) ap_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 *)ap_pcalloc(cmd->pool,
  + sizeof(char *) *
  + (strlen(s->server_hostname) + 8));
  +tmp_full_url =
  +(char *)ap_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, uri

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2004-02-13 Thread hgomez 
hgomez  2004/02/13 00:40:42

  Modified:jk/native2/common jk_requtil.c jk_worker_lb.c jk_msg_ajp.c
jk_worker_ajp13.c
   jk/native2/server/apache2 mod_jk2.c
   jk/native2/include jk_msg.h jk_service.h
   jk/native2/server/aolserver nsjk2.c
   jk/native2/server/dsapi jk_dsapi_plugin.c
   jk/native2/server/isapi jk_isapi_plugin.c
   jk/native2/server/apache13 mod_jk2.c
  Log:
  Port the POST recovery in LB mode from jk.

  

  Need some tests of course
  
  Revision  ChangesPath
  1.30  +1 -1  jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c
  
  Index: jk_requtil.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- jk_requtil.c  25 Sep 2003 15:23:22 -  1.29
  +++ jk_requtil.c  13 Feb 2004 08:40:41 -  1.30
  @@ -752,7 +752,7 @@
   }  
   
   env->l->jkLog(env, env->l, JK_LOG_ERROR,
  - "handler.marshapPostHead() - error len=%d\n", len);
  + "handler.marshalPostHead() - error len=%d\n", len);
   return JK_ERR;   
   }
   /*  Query decoding  */
  
  
  
  1.35  +4 -0  jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
  
  Index: jk_worker_lb.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- jk_worker_lb.c30 Oct 2003 20:08:36 -  1.34
  +++ jk_worker_lb.c13 Feb 2004 08:40:41 -  1.35
  @@ -365,6 +365,10 @@
   wEnv->config->ver = wEnv->shm->head->lbVer;
   }
   }
  +
  +/* Initialize here the recovery POST buffer */
  + s->reco_buf = jk2_msg_ajp_create( env, s->pool, 0);
  +s->reco_status = RECO_INITED;
   
   while(1) {
   int rc;
  
  
  
  1.23  +24 -0 jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c
  
  Index: jk_msg_ajp.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- jk_msg_ajp.c  25 Sep 2003 15:23:23 -  1.22
  +++ jk_msg_ajp.c  13 Feb 2004 08:40:41 -  1.23
  @@ -468,6 +468,29 @@
   }
   
   
  +/** 
  + * Copy the msg buf into another one, sort of clone.
  + *
  + * Returns -1 on error, else number of bytes copied
  + */
  +static int jk2_msg_ajp_copy(jk_env_t *env, jk_msg_t  *msg, jk_msg_t *dmsg)
  +{
  + if (dmsg == NULL)
  + return -1;
  + 
  +if(msg->len > dmsg->maxlen ) {
  +env->l->jkLog(env, env->l, JK_LOG_ERROR,
  +  "msgAjp.copy(): destination buffer too small %d/%d\n",
  +  msg->len, dmsg->maxlen);
  +return -2;
  +}
  +
  + memcpy(dmsg->buf, msg->buf, msg->len);
  + dmsg->len = msg->len;
  + dmsg->pos = msg->pos;
  + 
  + return dmsg->len;
  +}
   
   /** 
* Special method. Will read data from the server and add them as
  @@ -539,6 +562,7 @@
   msg->appendMap=jk2_msg_ajp_appendMap;
   
   msg->appendFromServer=jk2_msg_ajp_appendFromServer;
  +msg->copy=jk2_msg_ajp_copy;
   
   msg->getByte=jk2_msg_ajp_getByte;
   msg->getInt=jk2_msg_ajp_getInt;
  
  
  
  1.54  +48 -16jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
  
  Index: jk_worker_ajp13.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- jk_worker_ajp13.c 29 Jan 2004 14:17:41 -  1.53
  +++ jk_worker_ajp13.c 13 Feb 2004 08:40:41 -  1.54
  @@ -447,28 +447,61 @@
   
  Note that chunking will continue to work - using the normal read.
   */
  -if (has_post_body  || s->left_bytes_to_send > 0) {
  +if (has_post_body  || s->left_bytes_to_send > 0 || s->reco_status == 
RECO_FILLED) {
   /* We never sent any POST data and we check it we have to send at
* least of block of data (max 8k). These data will be kept in reply
* for resend if the remote Tomcat is down, a fact we will learn only
* doing a read (not yet) 
*/
  -if( attempt==0 )
  -err=jk2_serialize_postHead( env, e->post, s, e );
  -else
  -err=JK_OK; /* We already have the initial body chunk */
  -
  -if( e->worker->mbean->

Re: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c Makefile.in

2003-11-11 Thread jean-frederic clere 
 unset jk_exec_file^M
^M
{^M
  $2^M
  echo "\njk_exec_retvalue $?"^M
} | {^M
  jk_exec_ret=0^M
  while true ; do^M
read jk_exec_first jk_exec_line^M
if test ! "$?" -eq "0" ; then^M
  break^M
else^M
  if test "${jk_exec_first}" = "jk_exec_retvalue" ; then^M
jk_exec_ret="${jk_exec_line}"^M
  else^M
if test -n "${jk_exec_line}" ; then^M
 echo "$3: ${jk_exec_first} ${jk_exec_line}"^M
fi^M
  fi^M
fi^M
  done^M
  echo "${jk_exec_ret}" > retvalue.tmp^M
  unset jk_exec_first^M
  unset jk_exec_line^M
  unset jk_exec_ret^M
}^M
^M
    $1="`cat retvalue.tmp`"^M
rm -f retvalue.tmp^M
echo "  execution of \"$2\""^M
echo "  returned with value \"${$1}\""^M
^M
cd "${jk_exec_curdir}"^M
unset jk_exec_curdir^M
  ])^M
- Original Message - 
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Monday, November 10, 2003 6:05 AM
Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13
mod_jk2.c Makefile.in



hgomez  2003/11/10 03:05:33

 Modified:jk/native2 configure.in Makefile.in
  jk/support jk_apr.m4 jk_exec.m4
  jk/native2/server/apache13 mod_jk2.c Makefile.in
 Log:
 Latest jk2/apache 1.3 patch


 Obtained from: Kurt Miller

 Revision  ChangesPath
 1.14  +14 -11jakarta-tomcat-connectors/jk/native2/configure.in
 Index: configure.in
 ===
 RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/configure.in,v
 retrieving revision 1.13
 retrieving revision 1.14
 diff -u -r1.13 -r1.14
 --- configure.in 5 Nov 2003 09:15:19 - 1.13
 +++ configure.in 10 Nov 2003 11:05:33 - 1.14
 @@ -175,15 +175,10 @@
  JK_APR_THREADS()
  JK_APR([include/apr.h.in])
 +JK_APR_UTIL([include/apu.h.in])
  JK_APR_INCDIR([apr.h])
  JK_APR_LIBDIR()
 -dnl Set these to empty until we know what to do with them
 -
 -AC_SUBST(APR_UTIL_INCL)
 -AC_SUBST(APR_UTIL_LIB)
 -
 -
  dnl Java settings
  JK_JNI()
 @@ -205,11 +200,16 @@
  AC_SUBST(WEBSERVERS)

 +dnl if --with-apr is specified, --with-apr-util must be too
 +if ${TEST} ! -z "$APR_BUILD" -a -z "$APR_UTIL_DIR"; then
 +  AC_MSG_ERROR([--with-apr and --with-apr-util must be used together])
 +fi
 +
  dnl apache 1.3 consistancy checks
  if ! ${TEST} -z "$APACHE_HOME" ; then
  dnl check if apache 1.3 was selected without apr sources
  if ${TEST} -z "$APR_BUILD"; then
 -AC_MSG_ERROR([Apache 1.3 requires apr to built from
source, use --with-apr])

 +AC_MSG_ERROR([Apache 1.3 requires apr to built from
source, use --with-apr and --with-apr-util])

  fi
  dnl make sure compiler matchs apxs
  if ${TEST} "$APACHE_CC" != "$CC"; then
 @@ -222,9 +222,9 @@
  fi
  dnl apache 2 consistancy checks
 -if ! ${TEST} -z "$APACHE2_HOME" ; then
 +if ${TEST} ! -z "$APACHE2_HOME" ; then
  dnl check if apache 2 was selected with apr sources
 -if ${TEST} -z "$APR_BUILD"; then
 +if ${TEST} ! -z "$APR_BUILD"; then
  AC_MSG_ERROR([Use apr that comes with Apache 2,
remove --with-apr])

  fi
  dnl make sure compiler matchs apxs
 @@ -245,9 +245,12 @@
  AC_SUBST(APR_CFLAGS)
  AC_SUBST(APR_CLEAN)
  AC_SUBST(APR_DIR)
 +AC_SUBST(APR_UTIL_DIR)
  AC_SUBST(APR_HOME)
  AC_SUBST(APR_INCDIR)
 +AC_SUBST(APR_UTIL_INCDIR)
  AC_SUBST(APR_LIBDIR)
 +AC_SUBST(APR_UTIL_LIBDIR)
  AC_SUBST(APR_CONFIGURE_ARGS)
  AC_SUBST(APR_LDFLAGS)
  AC_SUBST(COMMON_APR_OBJECTS)


 1.4   +2 -2  jakarta-tomcat-connectors/jk/native2/Makefile.in

 Index: Makefile.in
 ===
 RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/Makefile.in,v
 retrieving revision 1.3
 retrieving revision 1.4
 diff -u -r1.3 -r1.4
 --- Makefile.in 4 Nov 2003 12:48:05 - 1.3
 +++ Makefile.in 10 Nov 2003 11:05:33 - 1.4
 @@ -41,10 +41,10 @@
  done;
  apr-build:
 - ( cd @APR_DIR@ && make )
 + ( cd @APR_DIR@ && make && cd @APR_UTIL_DIR@ && make )
  apr-clean:
 - ( cd @APR_DIR@ && make clean )
 + ( cd @APR_DIR@ && make clean && cd @APR_UTIL_DIR@ && make clean )
  apidocs: common/*.h
  mkdir -p ./docs/api


 1.8   +100 -9jakarta-tomcat-connectors/jk/support/jk_apr.m4

 Index: jk_apr.m4
 ===
 RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
 retrieving revision 1.7
 retrieving revision 1.8
 diff -u -r1.7 -r1.8
 --- jk_apr.m4 5 Nov 2003 09:14:28 - 1.7
 +++ jk_apr.m4 10 Nov 2003 11:05:33 - 1.8
 @@ -

Re: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c Makefile.in

2003-11-10 Thread Kurt Miller 
  $2^M
  echo "\njk_exec_retvalue $?"^M
} | {^M
  jk_exec_ret=0^M
  while true ; do^M
read jk_exec_first jk_exec_line^M
if test ! "$?" -eq "0" ; then^M
  break^M
else^M
  if test "${jk_exec_first}" = "jk_exec_retvalue" ; then^M
jk_exec_ret="${jk_exec_line}"^M
  else^M
if test -n "${jk_exec_line}" ; then^M
 echo "$3: ${jk_exec_first} ${jk_exec_line}"^M
fi^M
  fi^M
fi^M
  done^M
  echo "${jk_exec_ret}" > retvalue.tmp^M
  unset jk_exec_first^M
  unset jk_exec_line^M
  unset jk_exec_ret^M
}^M
^M
    $1="`cat retvalue.tmp`"^M
    rm -f retvalue.tmp^M
echo "  execution of \"$2\""^M
echo "  returned with value \"${$1}\""^M
^M
cd "${jk_exec_curdir}"^M
unset jk_exec_curdir^M
  ])^M

- Original Message - 
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Monday, November 10, 2003 6:05 AM
Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13
mod_jk2.c Makefile.in


> hgomez  2003/11/10 03:05:33
>
>   Modified:jk/native2 configure.in Makefile.in
>jk/support jk_apr.m4 jk_exec.m4
>jk/native2/server/apache13 mod_jk2.c Makefile.in
>   Log:
>   Latest jk2/apache 1.3 patch
>
>
>
>   Obtained from: Kurt Miller
>
>
>   Revision  ChangesPath
>   1.14  +14 -11jakarta-tomcat-connectors/jk/native2/configure.in
>
>   Index: configure.in
>   ===
>   RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/configure.in,v
>   retrieving revision 1.13
>   retrieving revision 1.14
>   diff -u -r1.13 -r1.14
>   --- configure.in 5 Nov 2003 09:15:19 - 1.13
>   +++ configure.in 10 Nov 2003 11:05:33 - 1.14
>   @@ -175,15 +175,10 @@
>
>JK_APR_THREADS()
>JK_APR([include/apr.h.in])
>   +JK_APR_UTIL([include/apu.h.in])
>JK_APR_INCDIR([apr.h])
>JK_APR_LIBDIR()
>
>   -dnl Set these to empty until we know what to do with them
>   -
>   -AC_SUBST(APR_UTIL_INCL)
>   -AC_SUBST(APR_UTIL_LIB)
>   -
>   -
>dnl Java settings
>
>JK_JNI()
>   @@ -205,11 +200,16 @@
>
>AC_SUBST(WEBSERVERS)
>
>   +dnl if --with-apr is specified, --with-apr-util must be too
>   +if ${TEST} ! -z "$APR_BUILD" -a -z "$APR_UTIL_DIR"; then
>   +  AC_MSG_ERROR([--with-apr and --with-apr-util must be used together])
>   +fi
>   +
>dnl apache 1.3 consistancy checks
>if ! ${TEST} -z "$APACHE_HOME" ; then
>dnl check if apache 1.3 was selected without apr sources
>if ${TEST} -z "$APR_BUILD"; then
>   -AC_MSG_ERROR([Apache 1.3 requires apr to built from
source, use --with-apr])
>   +AC_MSG_ERROR([Apache 1.3 requires apr to built from
source, use --with-apr and --with-apr-util])
>fi
>dnl make sure compiler matchs apxs
>if ${TEST} "$APACHE_CC" != "$CC"; then
>   @@ -222,9 +222,9 @@
>fi
>
>dnl apache 2 consistancy checks
>   -if ! ${TEST} -z "$APACHE2_HOME" ; then
>   +if ${TEST} ! -z "$APACHE2_HOME" ; then
>dnl check if apache 2 was selected with apr sources
>   -if ${TEST} -z "$APR_BUILD"; then
>   +if ${TEST} ! -z "$APR_BUILD"; then
>AC_MSG_ERROR([Use apr that comes with Apache 2,
remove --with-apr])
>fi
>dnl make sure compiler matchs apxs
>   @@ -245,9 +245,12 @@
>AC_SUBST(APR_CFLAGS)
>AC_SUBST(APR_CLEAN)
>AC_SUBST(APR_DIR)
>   +AC_SUBST(APR_UTIL_DIR)
>AC_SUBST(APR_HOME)
>AC_SUBST(APR_INCDIR)
>   +AC_SUBST(APR_UTIL_INCDIR)
>AC_SUBST(APR_LIBDIR)
>   +AC_SUBST(APR_UTIL_LIBDIR)
>AC_SUBST(APR_CONFIGURE_ARGS)
>AC_SUBST(APR_LDFLAGS)
>AC_SUBST(COMMON_APR_OBJECTS)
>
>
>
>   1.4   +2 -2  jakarta-tomcat-connectors/jk/native2/Makefile.in
>
>   Index: Makefile.in
>   ===
>   RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/Makefile.in,v
>   retrieving revision 1.3
>   retrieving revision 1.4
>   diff -u -r1.3 -r1.4
>   --- Makefile.in 4 Nov 2003 12:48:05 - 1.3
>   +++ Makefile.in 10 Nov 2003 11:05:33 - 1.4
>   @@ -41,10 +41,10 @@
>done;
>
>apr-build:
>   - ( cd @APR_DIR@ && make )
>   + ( cd @APR_DIR@ && make && cd @APR_UTIL_DIR@ && make )
>
>apr-clean:
>   - ( cd @APR_

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c Makefile.in

2003-11-10 Thread hgomez 
hgomez  2003/11/10 03:05:33

  Modified:jk/native2 configure.in Makefile.in
   jk/support jk_apr.m4 jk_exec.m4
   jk/native2/server/apache13 mod_jk2.c Makefile.in
  Log:
  Latest jk2/apache 1.3 patch
  
  Obtained from: Kurt Miller
  
  Revision  ChangesPath
  1.14  +14 -11jakarta-tomcat-connectors/jk/native2/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/configure.in,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- configure.in  5 Nov 2003 09:15:19 -   1.13
  +++ configure.in  10 Nov 2003 11:05:33 -  1.14
  @@ -175,15 +175,10 @@
   
   JK_APR_THREADS()
   JK_APR([include/apr.h.in])
  +JK_APR_UTIL([include/apu.h.in])
   JK_APR_INCDIR([apr.h])
   JK_APR_LIBDIR()
   
  -dnl Set these to empty until we know what to do with them
  -
  -AC_SUBST(APR_UTIL_INCL)
  -AC_SUBST(APR_UTIL_LIB)
  -
  -
   dnl Java settings
   
   JK_JNI()
  @@ -205,11 +200,16 @@
   
   AC_SUBST(WEBSERVERS)
   
  +dnl if --with-apr is specified, --with-apr-util must be too
  +if ${TEST} ! -z "$APR_BUILD" -a -z "$APR_UTIL_DIR"; then
  +  AC_MSG_ERROR([--with-apr and --with-apr-util must be used together])
  +fi
  +
   dnl apache 1.3 consistancy checks
   if ! ${TEST} -z "$APACHE_HOME" ; then
   dnl check if apache 1.3 was selected without apr sources
   if ${TEST} -z "$APR_BUILD"; then
  -AC_MSG_ERROR([Apache 1.3 requires apr to built from source, use 
--with-apr])
  +AC_MSG_ERROR([Apache 1.3 requires apr to built from source, use 
--with-apr and --with-apr-util])
   fi
   dnl make sure compiler matchs apxs
   if ${TEST} "$APACHE_CC" != "$CC"; then
  @@ -222,9 +222,9 @@
   fi
   
   dnl apache 2 consistancy checks
  -if ! ${TEST} -z "$APACHE2_HOME" ; then
  +if ${TEST} ! -z "$APACHE2_HOME" ; then
   dnl check if apache 2 was selected with apr sources
  -if ${TEST} -z "$APR_BUILD"; then
  +if ${TEST} ! -z "$APR_BUILD"; then
   AC_MSG_ERROR([Use apr that comes with Apache 2, remove --with-apr])
   fi
   dnl make sure compiler matchs apxs
  @@ -245,9 +245,12 @@
   AC_SUBST(APR_CFLAGS)
   AC_SUBST(APR_CLEAN)
   AC_SUBST(APR_DIR)
  +AC_SUBST(APR_UTIL_DIR)
   AC_SUBST(APR_HOME)
   AC_SUBST(APR_INCDIR)
  +AC_SUBST(APR_UTIL_INCDIR)
   AC_SUBST(APR_LIBDIR)
  +AC_SUBST(APR_UTIL_LIBDIR)
   AC_SUBST(APR_CONFIGURE_ARGS)
   AC_SUBST(APR_LDFLAGS)
   AC_SUBST(COMMON_APR_OBJECTS)
  
  
  
  1.4   +2 -2  jakarta-tomcat-connectors/jk/native2/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in   4 Nov 2003 12:48:05 -   1.3
  +++ Makefile.in   10 Nov 2003 11:05:33 -  1.4
  @@ -41,10 +41,10 @@
done;
   
   apr-build:
  - ( cd @APR_DIR@ && make )
  + ( cd @APR_DIR@ && make && cd @APR_UTIL_DIR@ && make )
   
   apr-clean:
  - ( cd @APR_DIR@ && make clean )
  + ( cd @APR_DIR@ && make clean && cd @APR_UTIL_DIR@ && make clean )
   
   apidocs: common/*.h
mkdir -p ./docs/api
  
  
  
  1.8   +100 -9jakarta-tomcat-connectors/jk/support/jk_apr.m4
  
  Index: jk_apr.m4
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_apr.m4 5 Nov 2003 09:14:28 -   1.7
  +++ jk_apr.m4 10 Nov 2003 11:05:33 -  1.8
  @@ -103,6 +103,7 @@
 [
   case "${withval}" in
 ""|"yes"|"YES"|"true"|"TRUE")
  +AC_MSG_ERROR(valid apr source dir location required)
 ;;
 "no"|"NO"|"false"|"FALSE")
   AC_MSG_ERROR(valid apr source dir location required)
  @@ -120,16 +121,15 @@
   
 if ${TEST} ! -z "$tempval" ; then
   APR_BUILD="apr-build"
  -APR_CFLAGS="-I ${tempval}/include -DHAS_APR"
  +APR_CFLAGS="-I ${tempval}/include"
   APR_CLEAN="apr-clean"
   APR_DIR=${tempval}
   APR_INCDIR="${tempval}/include"
   AC_MSG_RESULT(configuring apr...)
  -APR_CONFIGURE_ARGS="--enable-static --disable-shared 
${APR_CONFIGURE_ARGS}"
   tempret="0"
   JK_EXEC(
 [tempret],
  -  [./configure ${APR_CONFIGURE_ARGS}],
  +  [./configure --enable-static --disable-shared ${APR_CONFIGURE_ARGS}],
 [apr],
 [${APR_DIR}])
   if ${TEST} "${tempret}" = "0"; then
  @@ -137,8 +137,8 @@
   else
 AC_MSG_ERROR(apr configure failed with ${tem

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c jk_service_apache13.c

2003-02-03 Thread mturk 
mturk   2003/02/03 23:42:05

  Modified:jk/native2/server/apache13 mod_jk2.c jk_service_apache13.c
  Log:
  Update license to 2003.
  
  Revision  ChangesPath
  1.26  +2 -2  jakarta-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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mod_jk2.c 9 Oct 2002 17:10:24 -   1.25
  +++ mod_jk2.c 4 Feb 2003 07:42:05 -   1.26
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.10  +1 -1  
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jk_service_apache13.c 22 Nov 2002 16:04:05 -  1.9
  +++ jk_service_apache13.c 4 Feb 2003 07:42:05 -   1.10
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-10-09 Thread mturk 

mturk   2002/10/09 10:10:24

  Modified:jk/native2/server/apache13 mod_jk2.c
  Log:
  Skip the checking of default hostname and port. Using
  that scheme the same behaviour is on all web servers.
  
  Revision  ChangesPath
  1.25  +4 -8  jakarta-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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mod_jk2.c 4 Oct 2002 16:23:42 -   1.24
  +++ mod_jk2.c 9 Oct 2002 17:10:24 -   1.25
  @@ -437,7 +437,6 @@
   {
   jk_uriEnv_t *uriEnv;
   jk_env_t *env;
  -int port;
   
   if(r->proxyreq) {
   return DECLINED;
  @@ -450,13 +449,10 @@
   /* get_env() */
   env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
   
  -port = ap_get_server_port(r);
  -if (ap_is_default_port(port, r))
  -port = 0;
   uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,
  -r->server->is_virtual ? ap_get_server_name(r) : NULL,
  -port,
  -r->uri);
  +   ap_get_server_name(r),
  +   ap_get_server_port(r),
  +   r->uri);
   
   if(uriEnv==NULL || uriEnv->workerName==NULL) {
   workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-10-04 Thread mturk 

mturk   2002/10/04 09:23:42

  Modified:jk/native2/server/apache13 mod_jk2.c
  Log:
  Uuups wrong editor :) CRLF.
  
  Revision  ChangesPath
  1.24  +11 -11jakarta-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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_jk2.c 4 Oct 2002 16:10:38 -   1.23
  +++ mod_jk2.c 4 Oct 2002 16:23:42 -   1.24
  @@ -73,7 +73,7 @@
   #include "http_main.h"
   #include "http_log.h"
   #include "util_script.h"
  -#include "http_conf_globals.h"
  +#include "http_conf_globals.h"
   
   /*
* Jakarta (jk_) include files
  @@ -173,8 +173,8 @@
   /* Create the logger . We use the default jk logger, will output
  to a file. Check the logger for default settings.
   */
  -jkb=env->createBean2( env, env->globalPool, "logger.file", "");
  -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:"); 
   if( jkb==NULL ) {
   fprintf(stderr, "Error creating logger ");
  @@ -198,14 +198,14 @@
   return JK_ERR;
   }
   
  -/* serverRoot via ap_server_root
  - */
  -workerEnv->initData->add( env, workerEnv->initData, "serverRoot",
  - workerEnv->pool->pstrdup( env, workerEnv->pool, 
ap_server_root));
  -
  +/* serverRoot via ap_server_root
  + */
  +workerEnv->initData->add( env, workerEnv->initData, "serverRoot",
  + workerEnv->pool->pstrdup( env, workerEnv->pool, 
ap_server_root));
  +
/* Local initialization.
  - */
  -env->l->jkLog(env, env->l, JK_LOG_INFO, "Set serverRoot %s\n", ap_server_root); 

  + */
  +env->l->jkLog(env, env->l, JK_LOG_INFO, "Set serverRoot %s\n", ap_server_root); 
   
   workerEnv->_private = (void *)s;
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-10-04 Thread mturk 

mturk   2002/10/04 09:10:38

  Modified:jk/native2/server/apache13 mod_jk2.c
  Log:
  Fix the logger.file, using ap_server_root like on Apache2.
  
  Revision  ChangesPath
  1.23  +14 -8 jakarta-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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_jk2.c 27 Sep 2002 13:18:26 -  1.22
  +++ mod_jk2.c 4 Oct 2002 16:10:38 -   1.23
  @@ -73,6 +73,7 @@
   #include "http_main.h"
   #include "http_log.h"
   #include "util_script.h"
  +#include "http_conf_globals.h"
   
   /*
* Jakarta (jk_) include files
  @@ -172,7 +173,9 @@
   /* Create the logger . We use the default jk logger, will output
  to a file. Check the logger for default settings.
   */
  -jkb=env->createBean2( env, env->globalPool, "logger.file", "");
  +jkb=env->createBean2( env, env->globalPool, "logger.file", "");
  +env->alias( env, "logger.file:", "logger");
  +env->alias( env, "logger.file:", "logger:"); 
   if( jkb==NULL ) {
   fprintf(stderr, "Error creating logger ");
   return JK_ERR;
  @@ -195,14 +198,17 @@
   return JK_ERR;
   }
   
  -/* Local initialization.
  - */
  +/* serverRoot via ap_server_root
  + */
  +workerEnv->initData->add( env, workerEnv->initData, "serverRoot",
  + workerEnv->pool->pstrdup( env, workerEnv->pool, 
ap_server_root));
  +
  + /* Local initialization.
  + */
  +env->l->jkLog(env, env->l, JK_LOG_INFO, "Set serverRoot %s\n", ap_server_root); 

  +
   workerEnv->_private = (void *)s;
   
  -/* serverRoot via ap_server_root_relative()
  - */
  -workerEnv->initData->add( env, workerEnv->initData, "serverRoot",
  -  ap_server_root_relative(p,""));
   return JK_OK;
   }
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-09-27 Thread mturk 

mturk   2002/09/27 06:18:26

  Modified:jk/native2/server/apache13 mod_jk2.c
  Log:
  Fix the compile warnings.
  
  Revision  ChangesPath
  1.22  +2 -3  jakarta-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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_jk2.c 25 Sep 2002 08:11:10 -  1.21
  +++ mod_jk2.c 27 Sep 2002 13:18:26 -  1.22
  @@ -197,7 +197,7 @@
   
   /* Local initialization.
*/
  -workerEnv->_private = s;
  +workerEnv->_private = (void *)s;
   
   /* serverRoot via ap_server_root_relative()
*/
  @@ -316,7 +316,6 @@
*/
   static int jk2_handler(request_rec *r)
   {   
  -const char   *worker_name;
   jk_logger_t  *l=NULL;
   int  rc;
   jk_worker_t *worker=NULL;
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-09-25 Thread mturk 

mturk   2002/09/25 01:11:10

  Modified:jk/native2/server/apache13 mod_jk2.c
  Log:
  Add the same uriMap parsing as on Apache2 using
  hostname and port for virtual hosts.
  
  Revision  ChangesPath
  1.21  +26 -2 jakarta-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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_jk2.c 23 Sep 2002 17:41:43 -  1.20
  +++ mod_jk2.c 25 Sep 2002 08:11:10 -  1.21
  @@ -87,6 +87,11 @@
   #include "jk_uriMap.h"
   #include "jk_requtil.h"
   
  +#ifdef WIN32
  +static char  file_name[_MAX_PATH];
  +#endif
  +
  +
   #define JK_HANDLER  ("jakarta-servlet2")
   #define JK_MAGIC_TYPE   ("application/x-jakarta-servlet2")
   
  @@ -144,6 +149,7 @@
   jk_bean_t *jkb;
   
   #ifdef HAS_APR
  + apr_initialize();
   apr_pool_create( &jk_globalPool, NULL );
   
   jk2_pool_apr_create( NULL, &globalPool, NULL, jk_globalPool );
  @@ -426,6 +432,7 @@
   {
   jk_uriEnv_t *uriEnv;
   jk_env_t *env;
  +int port;
   
   if(r->proxyreq) {
   return DECLINED;
  @@ -438,7 +445,13 @@
   /* get_env() */
   env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
   
  -uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL, 0,r->uri );
  +port = ap_get_server_port(r);
  +if (ap_is_default_port(port, r))
  +port = 0;
  +uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,
  +r->server->is_virtual ? ap_get_server_name(r) : NULL,
  +port,
  +r->uri);
   
   if(uriEnv==NULL || uriEnv->workerName==NULL) {
   workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
  @@ -498,3 +511,14 @@
   
   };
   
  +#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
  +{
  +GetModuleFileName( hInst, file_name, sizeof(file_name));
  +return TRUE;
  +}
  +
  +#endif
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-09-23 Thread mturk 

mturk   2002/09/23 10:41:44

  Modified:jk/native2/server/apache13 mod_jk2.c
  Log:
  Supply the port to the uriMap call, This is TODO.
  
  Revision  ChangesPath
  1.20  +2 -2  jakarta-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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_jk2.c 12 Sep 2002 10:43:36 -  1.19
  +++ mod_jk2.c 23 Sep 2002 17:41:43 -  1.20
  @@ -438,7 +438,7 @@
   /* get_env() */
   env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
   
  -uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL,r->uri );
  +uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL, 0,r->uri );
   
   if(uriEnv==NULL || uriEnv->workerName==NULL) {
   workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-09-12 Thread jfclere 

jfclere 2002/09/12 03:43:37

  Modified:jk/native2/server/apache13 mod_jk2.c
  Log:
  Typo.
  
  Revision  ChangesPath
  1.19  +2 -2  jakarta-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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_jk2.c 15 Aug 2002 11:22:41 -  1.18
  +++ mod_jk2.c 12 Sep 2002 10:43:36 -  1.19
  @@ -438,7 +438,7 @@
   /* get_env() */
   env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
   
  -uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL,r->uri, );
  +uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL,r->uri );
   
   if(uriEnv==NULL || uriEnv->workerName==NULL) {
   workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-08-15 Thread mturk 

mturk   2002/08/15 04:22:41

  Modified:jk/native2/server/apache13 mod_jk2.c
  Log:
  Remove the reverse flag from uriMap call.
  All the positive/negative mappings is now done inside the uriMap
  function itself.
  
  Revision  ChangesPath
  1.18  +1 -8  jakarta-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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_jk2.c 15 Aug 2002 09:27:41 -  1.17
  +++ mod_jk2.c 15 Aug 2002 11:22:41 -  1.18
  @@ -438,18 +438,11 @@
   /* get_env() */
   env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
   
  -uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL,r->uri, 0 );
  +uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL,r->uri, );
   
   if(uriEnv==NULL || uriEnv->workerName==NULL) {
   workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
   return DECLINED;
  -}
  -else {
  -jk_uriEnv_t *rriEnv = workerEnv->uriMap->mapUri(env, 
workerEnv->uriMap,NULL,r->uri, 1 );
  -if (rriEnv != NULL && rriEnv->workerName != NULL) {
  -workerEnv->globalEnv->releaseEnv(workerEnv->globalEnv, env );
  -return DECLINED;
  -}
   }
   
   ap_set_module_config( r->request_config, &jk2_module, uriEnv );
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-08-15 Thread mturk 

mturk   2002/08/15 02:27:41

  Modified:jk/native2/server/apache13 mod_jk2.c
  Log:
  After succesfull call to the mapUri call the mapUri again with the reverse flag set.
  This will decline the 'reverse' mappings.
  
  Revision  ChangesPath
  1.17  +9 -2  jakarta-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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_jk2.c 10 Jun 2002 21:55:08 -  1.16
  +++ mod_jk2.c 15 Aug 2002 09:27:41 -  1.17
  @@ -438,11 +438,18 @@
   /* get_env() */
   env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
   
  -uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL,r->uri );
  +uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL,r->uri, 0 );
   
   if(uriEnv==NULL || uriEnv->workerName==NULL) {
   workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
   return DECLINED;
  +}
  +else {
  +jk_uriEnv_t *rriEnv = workerEnv->uriMap->mapUri(env, 
workerEnv->uriMap,NULL,r->uri, 1 );
  +if (rriEnv != NULL && rriEnv->workerName != NULL) {
  +workerEnv->globalEnv->releaseEnv(workerEnv->globalEnv, env );
  +return DECLINED;
  +}
   }
   
   ap_set_module_config( r->request_config, &jk2_module, uriEnv );
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-06-10 Thread nacho 

nacho   2002/06/10 14:55:08

  Modified:jk/native2/common jk_channel.c jk_channel_apr_socket.c
jk_channel_jni.c jk_channel_socket.c
jk_channel_un.c jk_config.c jk_config_file.c
jk_endpoint.c jk_env.c jk_handler_logon.c
jk_handler_response.c jk_logger_win32.c jk_map.c
jk_msg_ajp.c jk_mutex.c jk_mutex_proc.c
jk_mutex_thread.c jk_nwmain.c jk_objCache.c
jk_pool.c jk_pool_apr.c jk_registry.c jk_requtil.c
jk_shm.c jk_uriEnv.c jk_uriMap.c jk_vm_default.c
jk_worker_ajp13.c jk_worker_jni.c jk_worker_lb.c
jk_worker_run.c jk_worker_status.c jk_workerEnv.c
   jk/native2/server/apache2 jk_service_apache2.c mod_jk2.c
   jk/native2/server/apache13 mod_jk2.c
  Log:
  * Changed %p format specifiers to %#lx - Thanks to JFC ( where applicable )
  * Changed copyright to be 1999-2002 :) in all files..
  
  Revision  ChangesPath
  1.4   +1 -1  jakarta-tomcat-connectors/jk/native2/common/jk_channel.c
  
  Index: jk_channel.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_channel.c  30 May 2002 18:05:08 -  1.3
  +++ jk_channel.c  10 Jun 2002 21:55:06 -  1.4
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.22  +1 -1  
jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
  
  Index: jk_channel_apr_socket.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- jk_channel_apr_socket.c   30 May 2002 18:05:08 -  1.21
  +++ jk_channel_apr_socket.c   10 Jun 2002 21:55:06 -  1.22
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.26  +5 -5  jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
  
  Index: jk_channel_jni.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- jk_channel_jni.c  5 Jun 2002 19:26:45 -   1.25
  +++ jk_channel_jni.c  10 Jun 2002 21:55:06 -  1.26
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  @@ -227,7 +227,7 @@
   epData->jniJavaContext=(*jniEnv)->NewGlobalRef( jniEnv, jobj );
   
   env->l->jkLog(env, env->l, JK_LOG_INFO,
  -  "channel_jni.open() Got ep %p %p\n", jobj, epData->jniJavaContext 
); 
  +  "channel_jni.open() Got ep %#lx %#lx\n", jobj, 
epData->jniJavaContext ); 
   
   /* XXX Destroy them in close */
   
  @@ -336,7 +336,7 @@
   (jk_ch_jni_ep_private_

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-05-23 Thread hgomez 

hgomez  02/05/24 00:12:32

  Modified:jk/native2/server/apache13 mod_jk2.c
  Log:
  add module report as present at install time
  
  Revision  ChangesPath
  1.14  +8 -2  jakarta-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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_jk2.c 16 May 2002 20:56:08 -  1.13
  +++ mod_jk2.c 24 May 2002 07:12:32 -  1.14
  @@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Henri Gomez <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.13 $   *
  + * Version: $Revision: 1.14 $   *
***/
   
   /*
  @@ -281,7 +281,13 @@
   workerEnv->init(env, workerEnv );
   
   workerEnv->server_name   = (char *)ap_get_server_version();
  -/* ap_add_version_component(pconf, JK_EXPOSED_VERSION); */
  +
  +
  +#if MODULE_MAGIC_NUMBER >= 19980527
  +/* Tell apache we're here */
  +ap_add_version_component(JK_EXPOSED_VERSION);
  +#endif
  +
   }
   return OK;
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-04-09 Thread jfclere 

jfclere 02/04/09 14:00:38

  Modified:jk/native2/common jk_config.c jk_workerEnv.c
   jk/native2/server/apache13 mod_jk2.c
  Log:
  Add $(serverRoot) handling for apache13 and jk_config.c (it cores when
  modifying the value parameter (in the read only part of executable).
  
  Revision  ChangesPath
  1.8   +8 -8  jakarta-tomcat-connectors/jk/native2/common/jk_config.c
  
  Index: jk_config.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_config.c   26 Mar 2002 03:00:09 -  1.7
  +++ jk_config.c   9 Apr 2002 21:00:38 -   1.8
  @@ -58,7 +58,7 @@
   /***
* Description: General purpose config object *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.7 $   *
  + * Version: $Revision: 1.8 $   *
***/
   
   #include "jk_global.h"
  @@ -713,10 +713,13 @@
  struct jk_pool *resultPool, 
  char *value)
   {
  -char *rc = value;
  -char *env_start = rc;
  +char *rc;
  +char *env_start;
   int rec = 0;
   
  +rc = value;
  +env_start = value;
  +
   while(env_start = strstr(env_start, "$(")) {
   char *env_end = strstr(env_start, ")");
   if( rec++ > 20 ) return rc;
  @@ -724,9 +727,7 @@
   char env_name[LENGTH_OF_LINE + 1] = ""; 
   char *env_value;
   
  -*env_end = '\0';
  -strcpy(env_name, env_start + 2);
  -*env_end = ')';
  +strncpy(env_name, env_start + 2, (env_end-env_start)-2);
   
   env_value = m->get(env, m, env_name);
if(env_value == NULL ) {
  @@ -741,8 +742,7 @@
   if(!new_value) {
   break;
   }
  -*env_start = '\0';
  -strcpy(new_value, rc);
  +strncpy(new_value, rc, env_start-rc);
   strcat(new_value, env_value);
   strcat(new_value, env_end + 1);
offset= env_start - rc + strlen( env_value );
  
  
  
  1.24  +2 -2  jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
  
  Index: jk_workerEnv.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- jk_workerEnv.c2 Apr 2002 19:03:54 -   1.23
  +++ jk_workerEnv.c9 Apr 2002 21:00:38 -   1.24
  @@ -59,7 +59,7 @@
* Description: Workers controller *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Author:  Henri Gomez <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.23 $   *
  + * Version: $Revision: 1.24 $   *
***/
   
   #include "jk_env.h"
  @@ -238,7 +238,7 @@
   if(  configFile == NULL ) {
   wEnv->config->setPropertyString( env, wEnv->config,
"config.file",
  - "conf/jk2.properties" );
  + "$(serverRoot)/conf/jk2.properties" );
   }
   
   jk2_workerEnv_initWorkers( env, wEnv );
  
  
  
  1.9   +6 -1  jakarta-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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_jk2.c 26 Mar 2002 03:04:54 -  1.8
  +++ mod_jk2.c 9 Apr 2002 21:00:38 -   1.9
  @@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Henri Gomez <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.8 $   *
  + * Version: $Revision: 1.9 $   *
***/
   
   /*
  @@ -176,6 +176,11 @@
   /* Local initialization.
*/

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-03-24 Thread costin 

costin  02/03/24 19:31:41

  Modified:jk/native2/server/apache13 mod_jk2.c
  Log:
  Fix init, post_config doesn't exist in 1.3
  
  Revision  ChangesPath
  1.7   +3 -12 jakarta-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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_jk2.c 23 Mar 2002 17:15:08 -  1.6
  +++ mod_jk2.c 25 Mar 2002 03:31:41 -  1.7
  @@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Henri Gomez <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.6 $   *
  + * Version: $Revision: 1.7 $   *
***/
   
   /*
  @@ -243,21 +243,12 @@
   
   jk_env_t *env=workerEnv->globalEnv;
   
  -env->l->jkLog(env, env->l, JK_LOG_INFO, "mod_jk child init\n" );
  -
  -}
  -
  -
  -static int jk2_post_config(ap_pool *pconf, ap_pool *plog, 
  -   ap_pool *ptemp, server_rec *s)
  -{
   ap_pool *gPool=NULL;
   void *data=NULL;
   int rc=JK_TRUE;
  -jk_env_t *env=workerEnv->globalEnv;
  -
  -env->l->jkLog(env, env->l, JK_LOG_INFO, "mod_jk.post_config()\n");
   
  +env->l->jkLog(env, env->l, JK_LOG_INFO, "mod_jk child init\n" );
  +
   if(s->is_virtual) 
   return OK;
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-03-18 Thread costin 

costin  02/03/18 10:47:18

  Modified:jk/native2/server/apache13 mod_jk2.c
  Log:
  Update for the new config and signatures.
  
  It's still dumping core, but I fixed few more bugs, it's
  getting close.
  
  Revision  ChangesPath
  1.4   +17 -15jakarta-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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_jk2.c 1 Mar 2002 00:45:58 -   1.3
  +++ mod_jk2.c 18 Mar 2002 18:47:18 -  1.4
  @@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Henri Gomez <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.3 $   *
  + * Version: $Revision: 1.4 $   *
***/
   
   /*
  @@ -122,7 +122,7 @@
   
   if( type==NULL || type[0]=='\0') {
   /* Generic Jk2Set foo bar */
  -workerEnv->setProperty( env, workerEnv, name, value );
  +workerEnv->config->setPropertyString( env, workerEnv->config, name, value );
   } else if( strcmp(type, "env")==0) {
   workerEnv->envvars_in_use = JK_TRUE;
   workerEnv->envvars->put(env, workerEnv->envvars,
  @@ -131,7 +131,7 @@
   NULL);
   } else if( strcmp(type, "mount")==0) {
   if (name[0] !='/') return "Context must start with /";
  -workerEnv->setProperty( env, workerEnv, name, value );
  +workerEnv->mbean->setAttribute( env, workerEnv->mbean, name, value );
   } else {
   fprintf( stderr, "set2 error %s %s %s ", type, name, value );
   }
  @@ -168,7 +168,7 @@
   {
   jk_uriEnv_t *uriEnv=(jk_uriEnv_t *)per_dir;
   
  -uriEnv->setProperty( workerEnv->globalEnv, uriEnv, name, val );
  +uriEnv->mbean->setAttribute( workerEnv->globalEnv, uriEnv->mbean, name, val );
   
   return NULL;
   }
  @@ -190,11 +190,14 @@
   
   static void *jk2_create_dir_config(ap_pool *p, char *path)
   {
  -jk_uriEnv_t *new =
  -workerEnv->uriMap->createUriEnv( workerEnv->globalEnv,
  - workerEnv->uriMap, NULL, path );
  -
  -return new;
  +/* We don't know the vhost yet - so path is not
  + * unique. We'll have to generate a unique name
  + */
  +jk_uriEnv_t *newUri = workerEnv->globalEnv->createInstance( 
workerEnv->globalEnv,
  +workerEnv->pool,
  +"uri", path );
  +newUri->mbean->setAttribute( workerEnv->globalEnv, newUri->mbean, "path", path 
);
  +return newUri;
   }
   
   static void *jk2_merge_dir_config(ap_pool *p, void *basev, void *addv)
  @@ -231,12 +234,12 @@
   /* Init the environment. */
   
   /* Create the logger */
  -l = env->getInstance( env, env->globalPool, "logger", "file");
  +l = env->createInstance( env, env->globalPool, "logger.file", "logger");
   
   env->l=l;
   
   /* Create the workerEnv */
  -workerEnv= env->getInstance( env, env->globalPool,"workerEnv", "default");
  +workerEnv= env->createInstance( env, env->globalPool,"workerEnv", "workerEnv");
   
   if( workerEnv==NULL ) {
   env->l->jkLog(env, env->l, JK_LOG_ERROR, "Error creating workerEnv\n");
  @@ -417,7 +420,7 @@
   worker =  workerEnv->defaultWorker;
   env->l->jkLog(env, env->l, JK_LOG_INFO, 
 "mod_jk.handler() Default worker for %s %s\n",
  -  r->uri, worker->name); 
  +  r->uri, worker->mbean->name); 
   } else {
   worker=uriEnv->worker;
   env->l->jkLog(env, env->l, JK_LOG_INFO, 
  @@ -425,8 +428,7 @@
 worker, uriEnv );
   
   if( worker==NULL && uriEnv->workerName != NULL ) {
  -worker=workerEnv->getWorkerForName( env, workerEnv,
  -uriEnv->workerName);
  +worker=env->getByName( env,uriEnv->workerName);
   env->l->jkLog(env, env->l, JK_LOG_INFO, 
 "mod_jk.handler() finding worker for %p %p\n",
 worker, uriEnv );
  @@ -465,7 +467,7 @@
   s->init( env, s, worker, r );
   
   env->l->jkLog(env, env->l, JK_LOG_INFO, 
  -  "modjk.handler() Calling %s\n", worker->name); 
  +  "modjk.handler() Calling %s\n", worker->mbean->name); 
   rc = w

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

2002-02-23 Thread costin 

costin  02/02/23 11:01:05

  Added:   jk/native2/server/apache13 mod_jk2.c
  Log:
  Quick and dirty backport of mod_jk.c.
  
  Apr is not used, I'll probably remove the  and the other
  'special' code ( like native logger, etc ) - then try to
  make it work ( it just compiles right now )
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
  
  Index: mod_jk2.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 ."  *
   *   *
   *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.  For more information *
   * on the Apache Software Foundation, please see .   *
   *   *
   *