Re: Jk_map.c build 'problem'?

[NormW]

Greetings and thanks for the feedback...
With:
DEFINES = -DNETWARE -D_POSIX_SOURCE
in NWGNUenvironment.inc, I get the following (there was a lot more of it 
but this is the first few lines)...

### mwccnlm Compiler:
#File: ..\common\jk_shm.c
# ---
#  49:  CRITICAL_SECTION cs;
#   Error:  
#   declaration syntax error
### mwccnlm Compiler:
#  50:  };
#   Error:  ^
#   declaration syntax error
### mwccnlm Compiler:
#  55:  static jk_shm_t jk_shmem = { 0, NULL, -1, 0, NULL};
#   Error:   ^
#   illegal use of incomplete struct/union/class 'struct jk_shm'
### mwccnlm Compiler:
#  64:  if (jk_shmem.hdr) {
#   Error:  ^
#   illegal use of incomplete struct/union/class 'struct jk_shm'
Restoring the DEFINES to its original setting reproduces the error noted 
previously/below. This was a build attempted against Apache2.1 trunk and 
JTC CVS.

Will cast a fuzzy eye at a 1.3 JTC against AP 1.3 trunk...
FTM,
Norm
Günter Knauf wrote:
Hi Norm,
that's a netware-own problem;
please add -D_POSIX_SOURCE to the compiler flags and see if that fixes teh 
problem;
if so then please also check if we get no other strange behaviours - then we 
have to go other ways.
Guenter.

Just zipping the compiler over the recent updates to mod_jk and get the
error noted below

Nice to see the 'spirit' of JK2 lives on anyway...
Regards,
Norm

Compiling ../common/jk_lb_worker.c
Compiling ../common/jk_map.c
### mwccnlm Compiler:
#File: ..\common\jk_map.c
# ---
# 413:  jk_shm_set_workers_time(statbuf.st_mtime);
#   Error:  ^
#   illegal implicit conversion from 'struct timespec' to
#   'long'

Errors caused tool to abort.
make: *** [Release.o/jk_map.o] Error 1

C:\Projects\gccnlm\jakarta-tomcat-connectors\jk\native\apache-2.0

EOT

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


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

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

Re: Jk_map.c build 'problem'?

[NormW]

Greetings All,
Get the following errors when attempting a mod_jk build for Apache 1.3 
against the 1.3.33 source tree...

Compiling ../common/jk_ajp_common.c
Compiling ../common/jk_connect.c
### mwccnlm Compiler:
#File: ..\common\jk_connect.c
# ---
# 105: NetDBgethostbyname( nwSocketCtx, (host) )
#   Error:  ^
#   illegal implicit conversion from 'const char *' to
#   'char *'
### mwccnlm Compiler:
# 195: sizeof(set));
#   Error:^
#   illegal implicit conversion from 'const char *' to
#   'char *'
### mwccnlm Compiler:
# 203:  sizeof(keep));
#   Error:  ^
#   illegal implicit conversion from 'const char *' to
#   'char *'
### mwccnlm Compiler:
# 209: sizeof(len))) {
#   Error:^
#   illegal implicit conversion from 'const char *' to
#   'char *'
### mwccnlm Compiler:
# 219:sizeof(len))) {
#   Error:   ^
#   illegal implicit conversion from 'const char *' to
#   'char *'
Errors caused tool to abort.
make: *** [release/jk_connect.o] Error 1
I guess this doesn't 'help' (kind of...)
FTM,
Norm
Günter Knauf wrote:
Hi Norm,
can you please also do a build for Apache 1.3.x? 
I guess there this problem doesnt occure because of the clib headers; its only with Apache2 with libc headers.

that's a netware-own problem;
please add -D_POSIX_SOURCE to the compiler flags and see if that fixes teh 
problem;
if so then please also check if we get no other strange behaviours - then we 
have to go other ways.
Guenter.

Just zipping the compiler over the recent updates to mod_jk and get the
error noted below

Nice to see the 'spirit' of JK2 lives on anyway...
Regards,
Norm

Compiling ../common/jk_lb_worker.c
Compiling ../common/jk_map.c
### mwccnlm Compiler:
#File: ..\common\jk_map.c
# ---
# 413:  jk_shm_set_workers_time(statbuf.st_mtime);
#   Error:  ^
#   illegal implicit conversion from 'struct timespec' to
#   'long'

Errors caused tool to abort.
make: *** [Release.o/jk_map.o] Error 1

C:\Projects\gccnlm\jakarta-tomcat-connectors\jk\native\apache-2.0

EOT

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


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

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

Re: Jk_map.c build 'problem'?

[Mladen Turk]

NormW wrote:
Greetings and thanks for the feedback...
With:
DEFINES= -DNETWARE -D_POSIX_SOURCE
in NWGNUenvironment.inc, I get the following (there was a lot more of it 
but this is the first few lines)...

### mwccnlm Compiler:
#File: ..\common\jk_shm.c
# ---
#  49:  CRITICAL_SECTION cs;
This is my bad :(.
It should be JK_CRIT_SECT instead.
I'll change that.
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Jk_map.c build 'problem'?

[NormW]

Good evening,
OK will watch for an update and retry.
Regards,
Norm
Mladen Turk wrote:
NormW wrote:
Greetings and thanks for the feedback...
With:
DEFINES= -DNETWARE -D_POSIX_SOURCE
in NWGNUenvironment.inc, I get the following (there was a lot more of 
it but this is the first few lines)...

### mwccnlm Compiler:
#File: ..\common\jk_shm.c
# ---
#  49:  CRITICAL_SECTION cs;

This is my bad :(.
It should be JK_CRIT_SECT instead.
I'll change that.
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
.

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

Re: Jk_map.c build 'problem'?

[Mladen Turk]

NormW wrote:
### mwccnlm Compiler:
#File: ..\common\jk_connect.c
# ---
# 105: NetDBgethostbyname( nwSocketCtx, (host) )
#   Error:  ^
#   illegal implicit conversion from 'const char *' to
#   'char *'
This is bad ;).
gethostbyname as well as setsockopt should accept cont char*,
or cont void * parameters.
I would not like to change all those params to char* again,
just because netware defines those incorrectly.
Not sure how APR can compile that where exact params are used,
meaning 'const char*'.
If there is no way to fix those compiler warnings then I
would suggest to create two macros:
#if defined(_NETWARE)
#define JK_GETHOSTBYNAME(h) gethostbyname((char *)(h))
#else
#define JK_GETHOSTBYNAME(h) gethostbyname((h))
#endif
But that is really weird!
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Jk_map.c build 'problem'?

[Mladen Turk]

NormW wrote:
Greetings All,
Get the following errors when attempting a mod_jk build for Apache 1.3 
against the 1.3.33 source tree...

Also, can you see if it will be possible to create
NWGNUmakefile for Apache1.
Looking at this file for Apache2 seems that it's
quite portable, and can be transformed to Apache1.
Since Günter created both, perhaps he could help?
It look to me that we have two different build systems
and compilers for Netware.
Regards,
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Jk_map.c build 'problem'?

[NormW]

Good evening Mladen,
Guenter can verify, but the Build units are the same, ie CodeWarror, but 
Apache 1.3 uses an 'older' library set called Clib, whereas Apache2 gets 
a newer library set called LibC. The only other change is that the 
Makefile 'standard' changed to the NWGNU format. AFAIK there would not 
be a problem changing the build file for mod_jk on Apache 1.3 over to 
the NWGNU form, however there would be no change to the library set 
used, so the getsocketbyname() issue would remain... unless Guenter can 
see where I've made an error in the build setup...

Norm
Mladen Turk wrote:
NormW wrote:
Greetings All, Get the following errors when attempting a mod_jk
build for Apache 1.3 against the 1.3.33 source tree...
Also, can you see if it will be possible to create NWGNUmakefile for
Apache1. Looking at this file for Apache2 seems that it's quite
portable, and can be transformed to Apache1.
Since Günter created both, perhaps he could help?
It look to me that we have two different build systems and compilers
for Netware.
Regards, Mladen.
-
 To unsubscribe, e-mail: [EMAIL PROTECTED] 
For additional commands, e-mail: [EMAIL PROTECTED]

.

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

Re: Jk_map.c build 'problem'?

[Mladen Turk]

NormW wrote:
Good evening Mladen,
Guenter can verify, but the Build units are the same, ie CodeWarror, but 
Apache 1.3 uses an 'older' library set called Clib, whereas Apache2 gets 
a newer library set called LibC. The only other change is that the 
Makefile 'standard' changed to the NWGNU format. AFAIK there would not 
be a problem changing the build file for mod_jk on Apache 1.3 over to 
the NWGNU form, however there would be no change to the library set 
used, so the getsocketbyname() issue would remain... unless Guenter can 
see where I've made an error in the build setup...

In the case we will need the macros to supress the compile time
warnings. Perhaps there is some #pragma or compile time option
that will at least not mark those warnings as errors?
Those are not errors, just wrongly defined funtion proto,
and can be ignored.
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[GUMP@brutus]: Project jakarta-tomcat-jk-native (in module jakarta-tomcat-connectors) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at [EMAIL PROTECTED]

Project jakarta-tomcat-jk-native has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 15 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- jakarta-tomcat-jk-native :  Connectors to various web servers


Full details are available at:

http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/gump_work/build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native.html
Work Name: build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native (Type: 
Build)
Work ended in a state of : Failed
Elapsed: 
Command Line: make 
[Working Directory: 
/usr/local/gump/public/workspace/jakarta-tomcat-connectors/jk/native]
-
Making all in common
make[1]: Entering directory 
`/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common'
/bin/sh 
/usr/local/gump/public/workspace/apache-httpd/dest-13022005/build/libtool 
--silent --mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-13022005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR 
-I/usr/local/gump/public/workspace/apr/dest-13022005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE 
-I/home/gump/workspaces2/public/workspace/apache-httpd/srclib/pcre -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp12_worker.c 
/usr/local/gump/public/workspace/apache-httpd/dest-13022005/build/libtool: 
/usr/local/gump/public/workspace/apache-httpd/dest-13022005/build/libtool: No 
such file or directory
make[1]: *** [jk_ajp12_worker.lo] Error 127
make[1]: Leaving directory 
`/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common'
make: *** [all-recursive] Error 1
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/rss.xml
- Atom: 
http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/atom.xml

== Gump Tracking Only ===
Produced by Gump version 2.2.
Gump Run 2313022005, brutus:brutus-public:2313022005
Gump E-mail Identifier (unique within run) #26.

--
Apache Gump
http://gump.apache.org/ [Instance: brutus]

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

Re: Jk_map.c build 'problem'?

[NormW]

Good evening,
OK - will be off and delve into Apache 1.3 a little closer. No idea when 
Guenter might be through this way, but for now seems AP 1.3 is a NetWare 
issue and AP 2.0 will get another try when Guenter comes or I come by in 
the morning... if there is an update.  :-)

Norm
Mladen Turk wrote:
NormW wrote:
Good evening Mladen, Guenter can verify, but the Build units are
the same, ie CodeWarror, but Apache 1.3 uses an 'older' library set
called Clib, whereas Apache2 gets a newer library set called LibC.
The only other change is that the Makefile 'standard' changed to
the NWGNU format. AFAIK there would not be a problem changing the
build file for mod_jk on Apache 1.3 over to the NWGNU form, however
there would be no change to the library set used, so the
getsocketbyname() issue would remain... unless Guenter can see
where I've made an error in the build setup...
In the case we will need the macros to supress the compile time 
warnings. Perhaps there is some #pragma or compile time option that
will at least not mark those warnings as errors?

Those are not errors, just wrongly defined funtion proto, and can be
ignored.
Mladen.
-
 To unsubscribe, e-mail: [EMAIL PROTECTED] 
For additional commands, e-mail: [EMAIL PROTECTED]

.

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.c jk_shm.h

[mturk]

mturk   2005/02/13 04:08:05

  Modified:jk/native/common jk_shm.c jk_shm.h
  Log:
  Add logging and global lock file to shared memory.
  
  Revision  ChangesPath
  1.10  +157 -16   jakarta-tomcat-connectors/jk/native/common/jk_shm.c
  
  Index: jk_shm.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jk_shm.c  12 Feb 2005 17:01:00 -  1.9
  +++ jk_shm.c  13 Feb 2005 12:08:05 -  1.10
  @@ -31,7 +31,10 @@
   char   magic[8];
   size_t size;
   size_t pos;
  -intchilds;
  +unsigned int childs;
  +unsigned int workers;
  +
  +unsigned int urimaps;
   time_t modified;
   char   buf[1];
   };
  @@ -44,50 +47,71 @@
   size_t size;
   const char *filename;
   intfd;
  +intfd_lock;
   intattached;
   jk_shm_header_t  *hdr;
  -CRITICAL_SECTION cs;
  +JK_CRIT_SEC   cs;
   };
   
   typedef struct jk_shm jk_shm_t;
   
   static const char shm_signature[] = { JK_SHM_MAGIC };
  -static jk_shm_t jk_shmem = { 0, NULL, -1, 0, NULL};
  +static jk_shm_t jk_shmem = { 0, NULL, -1, -1, 0, NULL, 0};
   static time_t jk_workers_modified_time = 0;
   
   #if defined (WIN32) || defined(NETWARE)
   
   /* Use plain memory */
  -int jk_shm_open(const char *fname)
  +int jk_shm_open(const char *fname, jk_logger_t *l)
   {
   int rc;
  +JK_TRACE_ENTER(l);
   if (jk_shmem.hdr) {
  +if (JK_IS_DEBUG_LEVEL(l))
  +jk_log(l, JK_LOG_DEBUG, Shared memory is already opened);
  +JK_TRACE_EXIT(l);
   return 0;
   }
   
   jk_shmem.size =  JK_SHM_ALIGN(sizeof(jk_shm_header_t) + JK_SHM_SIZE);
   
   jk_shmem.hdr = (jk_shm_header_t *)calloc(1, jk_shmem.size);
  -if (!jk_shmem.hdr)
  +if (!jk_shmem.hdr) {
  +JK_TRACE_EXIT(l);
   return -1;
  +}
   jk_shmem.filename = memory;
   jk_shmem.fd   = 0;
   jk_shmem.attached = 0;
   memcpy(jk_shmem.hdr-magic, shm_signature, 8);
   jk_shmem.hdr-size = JK_SHM_SIZE;
   JK_INIT_CS((jk_shmem.cs), rc);
  +if (JK_IS_DEBUG_LEVEL(l))
  +jk_log(l, JK_LOG_DEBUG,
  +   Initialized shared memory size=%u free=%u,
  +   jk_shmem.size, jk_shmem.hdr-size);
  +JK_TRACE_EXIT(l);
   return 0;
   }
   
  -int jk_shm_attach(const char *fname)
  +int jk_shm_attach(const char *fname, jk_logger_t *l)
   {
  -if (!jk_shm_open(fname)) {
  +JK_TRACE_ENTER(l);
  +if (!jk_shm_open(fname, l)) {
   jk_shmem.attached = 1;
   jk_shmem.hdr-childs++;
  +if (JK_IS_DEBUG_LEVEL(l))
  +jk_log(l, JK_LOG_DEBUG,
  +   Attached shared memory [%d] size=%u free=%u,
  +   jk_shmem.hdr-childs, jk_shmem.hdr-size,
  +   jk_shmem.hdr-size - jk_shmem.hdr-pos);
  +JK_TRACE_EXIT(l);
   return 0;
   }
  -else
  +else {
  +JK_TRACE_EXIT(l);
   return -1;
  +}
   }
   
   void jk_shm_close()
  @@ -117,15 +141,63 @@
   #define MAP_FILE(0)
   #endif
   
  -static int do_shm_open(const char *fname, int attached)
  +static int do_shm_open_lock(const char *fname, int attached, jk_logger_t *l)
  +{
  +int rc;
  +int fd;
  +int flags = O_RDWR;
  +char flkname[256];
  +JK_TRACE_ENTER(l);
  +
  +jk_shmem.fd_lock = -1;
  +strcpy(flkname, fname);
  +strcat(flkname, .lock);
  +if (!attached)
  +flags |= (O_CREAT|O_TRUNC);
  +fd = open(flkname, flags, 0666);
  +if (fd == -1) {
  +JK_TRACE_EXIT(l);
  +return errno;
  +}
  +
  +if (!attached) {
  +if (ftruncate(fd, 1)) {
  +rc = errno;
  +close(fd);
  +JK_TRACE_EXIT(l);
  +return rc;
  + }
  +}
  +if (lseek(fd, 0, SEEK_SET) != 0) {
  +rc = errno;
  +close(fd);
  +JK_TRACE_EXIT(l);
  +return rc;
  +}
  +jk_shmem.fd_lock = fd;
  +
  +if (JK_IS_DEBUG_LEVEL(l))
  +jk_log(l, JK_LOG_DEBUG,
  +   Opened shared memory lock %s, flkname);
  +JK_TRACE_EXIT(l);
  +return 0;
  +}
  +
  +static int do_shm_open(const char *fname, int attached, jk_logger_t *l)
   {
   int rc;
   int fd;
   int flags = O_RDWR;
   void *base;
   
  -if (jk_shmem.hdr)
  -jk_shm_close();
  +JK_TRACE_ENTER(l);
  +if (jk_shmem.hdr) {
  +/* Probably a call from vhost */
  +if (JK_IS_DEBUG_LEVEL(l))
  +jk_log(l, JK_LOG_DEBUG,
  +Shared memory is already open);
  +return 0;
  +}
   jk_shmem.filename = fname;
   jk_shmem.attached = attached;
   
  @@ -134,6 +206,10 @@
   /* Use plain memory in case there is no file name */
   if 

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_mt.h

[mturk]

mturk   2005/02/13 04:09:01

  Modified:jk/native/common jk_mt.h
  Log:
  Add simple file locking. Since this will be used only for updates, the
  performance is not an issue here.
  
  Revision  ChangesPath
  1.14  +45 -2 jakarta-tomcat-connectors/jk/native/common/jk_mt.h
  
  Index: jk_mt.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_mt.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jk_mt.h   12 Jan 2005 15:25:51 -  1.13
  +++ jk_mt.h   13 Feb 2005 12:09:01 -  1.14
  @@ -34,7 +34,7 @@
   
   
   /*
  - * All WIN32 code is MT, UNIX code that uses pthreads is marked by the POSIX 
  + * All WIN32 code is MT, UNIX code that uses pthreads is marked by the POSIX
* _REENTRANT define.
*/
   #if defined (WIN32) || defined(_REENTRANT) || (defined(NETWARE)  
defined(__NOVELL_LIBC__))
  @@ -54,11 +54,18 @@
   #define JK_DELETE_CS(x, rc) DeleteCriticalSection(x); rc = JK_TRUE;
   #define JK_ENTER_CS(x, rc) EnterCriticalSection(x); rc = JK_TRUE;
   #define JK_LEAVE_CS(x, rc) LeaveCriticalSection(x); rc = JK_TRUE;
  +#define JK_ENTER_LOCK(x, rc) rc = JK_TRUE;
  +#define JK_LEAVE_LOCK(x, rc) rc = JK_TRUE;
   
   #else /* Unix pthreads */
   
   #define _MT_CODE_PTHREAD
   #include pthread.h
  +#include unistd.h
  +#include fcntl.h
  +#if HAVE_SYS_FILE_H
  +#include sys/file.h
  +#endif
   
   typedef pthread_mutex_t JK_CRIT_SEC;
   
  @@ -75,6 +82,42 @@
   if(pthread_mutex_unlock(x)) rc = JK_FALSE; else rc = JK_TRUE;
   
   int jk_gettid();
  +
  +#if HAVE_FLOCK
  +
  +#define JK_ENTER_LOCK(x, rc)\
  +do {\
  +  rc = flock((x), LOCK_EX) == -1 ? JK_FALSE : JK_TRUE; \
  +} while (0)
  +
  +#define JK_LEAVE_LOCK(x, rc)\
  +do {\
  +  rc = flock((x), LOCK_UN) == -1 ? JK_FALSE : JK_TRUE; \
  +} while (0)
  +
  +#else
  +
  +#define JK_ENTER_LOCK(x, rc)\
  +do {\
  +  struct flock _fl; \
  +  _fl.l_type   = F_WRLCK;   \
  +  _fl.l_whence = SEEK_SET;  \
  +  _fl.l_start  = 0; \
  +  _fl.l_len= 1L;\
  +  rc = fcntl((x), F_SETLKW, _fl) == -1 ? JK_FALSE : JK_TRUE; \
  +} while (0)
  +
  +#define JK_LEAVE_LOCK(x, rc)\
  +do {\
  +  struct flock _fl; \
  +  _fl.l_type   = F_UNLCK;   \
  +  _fl.l_whence = SEEK_SET;  \
  +  _fl.l_start  = 0; \
  +  _fl.l_len= 1L;\
  +  rc = fcntl((x), F_SETLK, _fl) == -1 ? JK_FALSE : JK_TRUE; \
  +} while (0)
  +#endif /* HAVE_FLOCK */
  +
   #endif /* Unix pthreads */
   
   #else /* Not an MT code */
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_service.h

[mturk]

mturk   2005/02/13 04:19:22

  Modified:jk/native/common jk_service.h
  Log:
  Add worker_list to worker_env, so we can get all workers.
  Add worker_map to service, so it can be updated on per-vhost basis.
  
  Revision  ChangesPath
  1.25  +7 -2  jakarta-tomcat-connectors/jk/native/common/jk_service.h
  
  Index: jk_service.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_service.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- jk_service.h  12 Feb 2005 17:06:34 -  1.24
  +++ jk_service.h  13 Feb 2005 12:19:22 -  1.25
  @@ -54,7 +54,7 @@
   jk_uri_worker_map_t *uri_to_worker;
   
   int num_of_workers;
  -char *first_worker;
  +char **worker_list;
   
   /* Web-Server we're running on (Apache/IIS/NES) */
   char *server_name;
  @@ -215,6 +215,11 @@
   /* Number of retries. Defaults to JK_RETRIES
*/
   int retries;
  +
  +/* Uri worker map. Added for virtual host support
  + */
  +jk_uri_worker_map_t *uw_map;
  +
   /*
* Send the response headers to the browser.
*/
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_worker.c

[mturk]

mturk   2005/02/13 04:20:01

  Modified:jk/native/common jk_worker.c
  Log:
  Use worker_env worker list.
  
  Revision  ChangesPath
  1.29  +9 -7  jakarta-tomcat-connectors/jk/native/common/jk_worker.c
  
  Index: jk_worker.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- jk_worker.c   12 Feb 2005 19:27:43 -  1.28
  +++ jk_worker.c   13 Feb 2005 12:20:01 -  1.29
  @@ -40,8 +40,6 @@
   
   int wc_open(jk_map_t *init_data, jk_worker_env_t *we, jk_logger_t *l)
   {
  -char **worker_list = NULL;
  -unsigned num_of_workers = 0;
   
   JK_TRACE_ENTER(l);
   
  @@ -50,19 +48,23 @@
   return JK_FALSE;
   }
   
  -if (!jk_get_worker_list(init_data, worker_list, num_of_workers)) {
  +if (!jk_get_worker_list(init_data, (we-worker_list),
  +we-num_of_workers)) {
   JK_TRACE_EXIT(l);
  +we-num_of_workers = 0;
  +we-worker_list = NULL;
   return JK_FALSE;
   }
   
  -if (!build_worker_map(init_data, worker_list, num_of_workers, we, l)) {
  +if (!build_worker_map(init_data, we-worker_list,
  +  we-num_of_workers, we, l)) {
   close_workers(l);
  +we-num_of_workers = 0;
  +we-worker_list = NULL;
   JK_TRACE_EXIT(l);
   return JK_FALSE;
   }
   
  -we-num_of_workers = num_of_workers;
  -we-first_worker = worker_list[0];
   JK_TRACE_EXIT(l);
   return JK_TRUE;
   }
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c

[mturk]

mturk   2005/02/13 04:21:57

  Modified:jk/native/common jk_lb_worker.c
  Log:
  Use shm_alloc_worker, so that worker get it's id set, and that we can
  monitor the total number of workers.
  
  Revision  ChangesPath
  1.47  +3 -3  jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
  
  Index: jk_lb_worker.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- jk_lb_worker.c12 Feb 2005 19:22:35 -  1.46
  +++ jk_lb_worker.c13 Feb 2005 12:21:57 -  1.47
  @@ -580,7 +580,7 @@
   }
   
   for (i = 0; i  num_of_workers; i++) {
  -p-lb_workers[i].s = jk_shm_alloc(p-p, 
sizeof(jk_shm_worker_t));
  +p-lb_workers[i].s = jk_shm_alloc_worker(p-p);
   if (p-lb_workers[i].s == NULL) {
   jk_log(l, JK_LOG_ERROR, 
  allocating worker record from shared memory);
  @@ -778,7 +778,7 @@
   private_data-buf,
   sizeof(jk_pool_atom_t) * TINY_POOL_SIZE);
   
  -private_data-s = jk_shm_alloc(private_data-p, 
sizeof(jk_shm_worker_t));
  +private_data-s = jk_shm_alloc_worker(private_data-p);
   if (!private_data-s) {
   free(private_data);
   JK_TRACE_EXIT(l);
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c

[mturk]

mturk   2005/02/13 04:22:31

  Modified:jk/native/common jk_status.c
  Log:
  Add header and footer html
  
  Revision  ChangesPath
  1.2   +25 -2 jakarta-tomcat-connectors/jk/native/common/jk_status.c
  
  Index: jk_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_status.c   6 Feb 2005 17:43:09 -   1.1
  +++ jk_status.c   13 Feb 2005 12:22:31 -  1.2
  @@ -29,6 +29,14 @@
   
   #define HUGE_BUFFER_SIZE (8*1024)
   
  +#define JK_STATUS_HEAD !DOCTYPE HTML PUBLIC \-//W3C// \

  +   DTD HTML 3.2 Final//EN\\n  \

  +   htmlheadtitleJK Status 
Manager/title/head\n  \

  +   body\n

  +
  +#define JK_STATUS_HEND /body\n/html\n

  +
  +
   typedef struct status_worker status_worker_t;
   
   struct status_endpoint
  @@ -47,6 +55,7 @@
   const char*name;
   jk_worker_t   worker;
   status_endpoint_t ep;
  +jk_worker_env_t   *we;
   };
   
   static const char *headers_names[] = {
  @@ -130,7 +139,15 @@
   if (e  e-endpoint_private  s) {
   status_endpoint_t *p = e-endpoint_private;
   
  +s-start_response(s, 200, OK, headers_names, headers_vals, 3);
  +s-write(s, JK_STATUS_HEAD, sizeof(JK_STATUS_HEAD) - 1);
  +
  +/* Step 1: Process GET params and update configuration */
   
  +/* Step 2: Display configuration */
  +
  +
  +s-write(s, JK_STATUS_HEND, sizeof(JK_STATUS_HEND) - 1);
   JK_TRACE_EXIT(l);
   return JK_TRUE;
   }
  @@ -163,6 +180,9 @@
   
   if (pThis  pThis-worker_private) {
   status_worker_t *p = pThis-worker_private;
  +
  +JK_TRACE_EXIT(l);
  +return JK_TRUE;
   }
   
   JK_LOG_NULL_PARAMS(l);
  @@ -176,7 +196,10 @@
   {
   status_worker_t *p = (status_worker_t *)pThis-worker_private;
   JK_TRACE_ENTER(log);
  -
  +if (pThis  pThis-worker_private) {
  +status_worker_t *p = pThis-worker_private;
  +p-we = we;
  +}
   JK_TRACE_EXIT(log);
   return JK_TRUE;
   }
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 mod_jk.c

[mturk]

mturk   2005/02/13 04:23:46

  Modified:jk/native/apache-1.3 mod_jk.c
  Log:
  Implement new API calls for shm and set vhost uriworker_map
  
  Revision  ChangesPath
  1.65  +10 -8 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
  
  Index: mod_jk.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- mod_jk.c  12 Feb 2005 11:55:33 -  1.64
  +++ mod_jk.c  13 Feb 2005 12:23:46 -  1.65
  @@ -618,7 +618,7 @@
   s-num_headers++;
   }
   }
  -
  +s-uw_map = conf-uw_map;
   return JK_TRUE;
   }
   
  @@ -1936,13 +1936,15 @@
   r-prev  r-prev-handler 
   !strcmp(r-prev-handler, JK_HANDLER)  r-uri 
   strlen(r-uri)  r-uri[strlen(r-uri) - 1] == '/') {
  +
  +if (worker_env.num_of_workers) {
  +/* Nothing here to do but assign the first worker since 
we
  + * already tried mapping and it didn't work out */
  +worker = worker_env.worker_list[0];
   
  -/* Nothing here to do but assign the first worker since we
  - * already tried mapping and it didn't work out */
  -worker = worker_env.first_worker;
  -
  -jk_log(l, JK_LOG_DEBUG, Manual configuration for %s %s,
  -   r-uri, worker_env.first_worker);
  +jk_log(l, JK_LOG_DEBUG, Manual configuration for %s %s,
  +   r-uri, worker_env.worker_list[0]);
  +}
   }
   
   if (worker) {
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c

[mturk]

mturk   2005/02/13 04:24:18

  Modified:jk/native/apache-2.0 mod_jk.c
  Log:
  Implement new API calls for shm and set vhost uriworker_map
  
  Revision  ChangesPath
  1.124 +13 -12jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
  
  Index: mod_jk.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
  retrieving revision 1.123
  retrieving revision 1.124
  diff -u -r1.123 -r1.124
  --- mod_jk.c  12 Feb 2005 11:55:33 -  1.123
  +++ mod_jk.c  13 Feb 2005 12:24:18 -  1.124
  @@ -670,7 +670,7 @@
   s-num_headers++;
   }
   }
  -
  +s-uw_map = conf-uw_map;
   return JK_TRUE;
   }
   
  @@ -1731,21 +1731,22 @@
 ( lb is a bit special, it should count as a single worker but
 I'm not sure how ). We also have a manual config directive that
 explicitely give control to us. */
  -worker_name = worker_env.first_worker;
  +worker_name = worker_env.worker_list[0];
   if (JK_IS_DEBUG_LEVEL(xconf-log))
   jk_log(xconf-log, JK_LOG_DEBUG,
  Manual configuration for %s %s %d,
  -   r-uri, worker_env.first_worker,
  +   r-uri, worker_env.worker_list[0],
  worker_env.num_of_workers);
   }
   else {
   worker_name = map_uri_to_worker(xconf-uw_map, r-uri, 
xconf-log);
  -if (worker_name == NULL)
  -worker_name = worker_env.first_worker;
  -if (JK_IS_DEBUG_LEVEL(xconf-log))
  -jk_log(xconf-log, JK_LOG_DEBUG,
  -   Manual configuration for %s %d,
  -   r-uri, worker_env.first_worker);
  +if (worker_name == NULL  worker_env.num_of_workers) {
  +worker_name = worker_env.worker_list[0];
  +if (JK_IS_DEBUG_LEVEL(xconf-log))
  +jk_log(xconf-log, JK_LOG_DEBUG,
  +   Manual configuration for %s %d,
  +   r-uri, worker_env.worker_list[0]);
  +}
   }
   }
   
  @@ -2238,7 +2239,7 @@
   
   JK_TRACE_ENTER(conf-log);
   
  -if ((rc = jk_shm_attach(jk_shm_file)) == 0) {
  +if ((rc = jk_shm_attach(jk_shm_file, conf-log)) == 0) {
   if (JK_IS_DEBUG_LEVEL(conf-log))
   jk_log(conf-log, JK_LOG_DEBUG, Attached shm:%s,
  jk_shm_name());
  @@ -2272,7 +2273,7 @@
   /* jk_map_t *init_map = NULL; */
   jk_map_t *init_map = conf-worker_properties;
   
  -if ((rc = jk_shm_open(jk_shm_file)) == 0) {
  +if ((rc = jk_shm_open(jk_shm_file, conf-log)) == 0) {
   if (JK_IS_DEBUG_LEVEL(conf-log))
   jk_log(conf-log, JK_LOG_DEBUG, Initialized shm:%s,
  jk_shm_name(), rc);
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 NWGNUmakefile

[mturk]

mturk   2005/02/13 04:25:04

  Modified:jk/native/apache-2.0 NWGNUmakefile
  Log:
  Add -D_POSIX_SOURCE to compiler flags.
  
  Revision  ChangesPath
  1.7   +1 -0  
jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- NWGNUmakefile 6 Feb 2005 17:43:09 -   1.6
  +++ NWGNUmakefile 13 Feb 2005 12:25:04 -  1.7
  @@ -57,6 +57,7 @@
   #
   XDEFINES += \
-D__NOVELL_LIBC__ \
  + -D_POSIX_SOURCE \
$(EOLIST)
   
   #
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/iis jk_isapi_plugin.c

[mturk]

mturk   2005/02/13 04:26:24

  Modified:jk/native/iis jk_isapi_plugin.c
  Log:
  Implement new API calls for shm and set vhost uriworker_map
  
  Revision  ChangesPath
  1.38  +5 -5  jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- jk_isapi_plugin.c 12 Feb 2005 11:55:34 -  1.37
  +++ jk_isapi_plugin.c 13 Feb 2005 12:26:24 -  1.38
  @@ -1028,12 +1028,12 @@
   int rc = JK_FALSE;
   jk_map_t *map;
   
  - /* Simulate shared memory */
  - jk_shm_open(NULL);
  -
   if (!jk_open_file_logger(logger, log_file, log_level)) {
   logger = NULL;
   }
  + /* Simulate shared memory */
  + jk_shm_open(NULL, logger);
  +
   /* Logging the initialization type: registry or properties file in 
virtual dir
*/
   if (JK_IS_DEBUG_LEVEL(logger)) {
  @@ -1338,7 +1338,7 @@
   s-headers_names = NULL;
   s-headers_values = NULL;
   s-num_headers = 0;
  -
  +s-uw_map = uw_map;
   /*
* Add SSL IIS environment
*/
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/netscape jk_nsapi_plugin.c

[mturk]

mturk   2005/02/13 04:28:42

  Modified:jk/native/netscape jk_nsapi_plugin.c
  Log:
  Implement new API calls for shm.
  
  Revision  ChangesPath
  1.18  +5 -2  
jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c
  
  Index: jk_nsapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- jk_nsapi_plugin.c 6 Feb 2005 09:38:00 -   1.17
  +++ jk_nsapi_plugin.c 13 Feb 2005 12:28:42 -  1.18
  @@ -27,6 +27,7 @@
   #include jk_pool.h
   #include jk_service.h
   #include jk_worker.h
  +#include jk_shm.h

   
   #include nsapi.h
   
  @@ -212,6 +213,7 @@
   char *worker_prp_file = pblock_findval(JK_WORKER_FILE_TAG, pb);
   char *log_level_str = pblock_findval(JK_LOG_LEVEL_TAG, pb);
   char *log_file = pblock_findval(JK_LOG_FILE_TAG, pb);
  +char *shm_file = pblock_findval(JK_SHM_FILE_TAG, pb);

   
   int rc = REQ_ABORTED;
   jk_map_t *init_map;
  @@ -231,7 +233,8 @@
jk_parse_log_level(log_level_str))) {
   logger = NULL;
   }
  -
  +

  +jk_shm_open(shm_file);

   if (jk_map_alloc(init_map)) {
   if (jk_map_read_properties(init_map, worker_prp_file)) {
   int sleep_cnt;
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/netscape jk_nsapi_plugin.c

[mturk]

mturk   2005/02/13 04:30:59

  Modified:jk/native/netscape jk_nsapi_plugin.c
  Log:
  Implement new API calls for shm.
  
  Revision  ChangesPath
  1.19  +2 -2  
jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c
  
  Index: jk_nsapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- jk_nsapi_plugin.c 13 Feb 2005 12:28:42 -  1.18
  +++ jk_nsapi_plugin.c 13 Feb 2005 12:30:59 -  1.19
  @@ -234,7 +234,7 @@
   logger = NULL;
   }
   

  -jk_shm_open(shm_file);

  +jk_shm_open(shm_file, logger);

   if (jk_map_alloc(init_map)) {
   if (jk_map_read_properties(init_map, worker_prp_file)) {
   int sleep_cnt;
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_mt.h

[mturk]

mturk   2005/02/13 04:56:41

  Modified:jk/native/common jk_mt.h
  Log:
  Include sys/file.h if HAVE_FLOCK is defined.
  
  Revision  ChangesPath
  1.15  +2 -4  jakarta-tomcat-connectors/jk/native/common/jk_mt.h
  
  Index: jk_mt.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_mt.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_mt.h   13 Feb 2005 12:09:01 -  1.14
  +++ jk_mt.h   13 Feb 2005 12:56:41 -  1.15
  @@ -63,9 +63,6 @@
   #include pthread.h
   #include unistd.h
   #include fcntl.h
  -#if HAVE_SYS_FILE_H
  -#include sys/file.h
  -#endif
   
   typedef pthread_mutex_t JK_CRIT_SEC;
   
  @@ -84,6 +81,7 @@
   int jk_gettid();
   
   #if HAVE_FLOCK
  +#include sys/file.h
   
   #define JK_ENTER_LOCK(x, rc)\
   do {\
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native configure.in

[mturk]

mturk   2005/02/13 04:57:08

  Modified:jk/native configure.in
  Log:
  Check if flock is available.
  
  Revision  ChangesPath
  1.37  +3 -1  jakarta-tomcat-connectors/jk/native/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- configure.in  20 Dec 2004 09:33:18 -  1.36
  +++ configure.in  13 Feb 2005 12:57:08 -  1.37
  @@ -55,6 +55,8 @@
   
   AC_CHECK_FUNC(vsnprintf, AC_DEFINE(HAVE_VSNPRINTF,1,[Have vsnprintf()]))
   
  +AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK,1,[Have flock()]))
  +
   APACHE_CONFIG_VARS=`pwd`/scripts/build/config_vars.mk
   WEBSERVER=
   apache_dir=
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native configure.in

[mturk]

mturk   2005/02/13 05:05:15

  Modified:jk/native configure.in
  Log:
  Increment version number.
  
  Revision  ChangesPath
  1.38  +2 -2  jakarta-tomcat-connectors/jk/native/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- configure.in  13 Feb 2005 12:57:08 -  1.37
  +++ configure.in  13 Feb 2005 13:05:15 -  1.38
  @@ -11,7 +11,7 @@
   
   dnl package and version. (synchronization with common/jk_version.h ?)
   PACKAGE=mod_jk
  -VERSION=1.2.7
  +VERSION=1.2.9
   
   AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.dsp

[mturk]

mturk   2005/02/13 05:14:17

  Modified:jk/native/apache-2.0 mod_jk.dsp
  Log:
  Add HAVE_APR define. We have APR for sure with Apache2.
  
  Revision  ChangesPath
  1.11  +2 -2  jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp
  
  Index: mod_jk.dsp
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_jk.dsp6 Feb 2005 17:43:09 -   1.10
  +++ mod_jk.dsp13 Feb 2005 13:14:17 -  1.11
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir 
   # ADD BASE CPP /nologo /MD /W3 /O2 /D WIN32 /D NDEBUG /D _WINDOWS /FD 
/c
  -# ADD CPP /nologo /MD /W3 /Zi /O2 /I ..\common /I $(JAVA_HOME)\include 
/I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I 
$(APACHE2_HOME)\srclib\apr\include /I 
$(APACHE2_HOME)\srclib\apr-util\include /D NDEBUG /D WIN32 /D _WINDOWS 
/FdRelease/mod_jk_src /FD /c
  +# ADD CPP /nologo /MD /W3 /Zi /O2 /I ..\common /I $(JAVA_HOME)\include 
/I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I 
$(APACHE2_HOME)\srclib\apr\include /I 
$(APACHE2_HOME)\srclib\apr-util\include /D NDEBUG /D WIN32 /D _WINDOWS 
/D HAVE_APR /FdRelease/mod_jk_src /FD /c
   # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
   # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d NDEBUG
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir 
   # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D WIN32 /D _DEBUG /D 
_WINDOWS /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I ..\common /I 
$(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I 
$(APACHE2_HOME)\include /I $(APACHE2_HOME)\srclib\apr\include /I 
$(APACHE2_HOME)\srclib\apr-util\include /D _DEBUG /D WIN32 /D _WINDOWS 
/FdDebug/mod_jk_src /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I ..\common /I 
$(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I 
$(APACHE2_HOME)\include /I $(APACHE2_HOME)\srclib\apr\include /I 
$(APACHE2_HOME)\srclib\apr-util\include /D _DEBUG /D WIN32 /D _WINDOWS 
/D HAVE_APR /FdDebug/mod_jk_src /FD /c
   # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32
   # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d _DEBUG
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/xdocs changelog.xml

[mturk]

mturk   2005/02/13 05:22:51

  Modified:jk/xdocs changelog.xml
  Log:
  Update change log to reflect current version.
  
  Revision  ChangesPath
  1.10  +12 -1 jakarta-tomcat-connectors/jk/xdocs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/changelog.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- changelog.xml 23 Dec 2004 14:00:50 -  1.9
  +++ changelog.xml 13 Feb 2005 13:22:50 -  1.10
  @@ -21,7 +21,18 @@
 new documentation project for JK has been started.
 /p
   /section
  -section name=Changes from JK 1.2.7
  +section name=Changes with JK 1.2.9
  +  br /
  +  subsection name=Native
  +changelog
  +  fix
  +  bug33308/bug: Fix segfaults when ForwardDirectories is enabled
  +with Apache 1.3
  +  /fix
  +/changelog
  +  /subsection
  +/section
  +section name=Changes with JK 1.2.8
 br /
 subsection name=Native
   changelog
  
  
  

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

DO NOT REPLY [Bug 26676] - Changes to server.xml irreversable

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=26676.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=26676





--- Additional Comments From [EMAIL PROTECTED]  2005-02-13 16:09 ---
(In reply to comment #1)
 You are not supposed to add Context declarations to server.xml, because the
 contexts then become impossile to manage. This works as designed, but it is
 obviously different from Tomcat 4.1.x.
If this is so, why does the Tomcat 5.5 DataSource configuration documentation 
instruct you to do so?



-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

Re: Jk_map.c build 'problem'?

[Günter Knauf]

Hi,
 OK - will be off and delve into Apache 1.3 a little closer. No idea when
 Guenter might be through this way, but for now seems AP 1.3 is a NetWare
 issue and AP 2.0 will get another try when Guenter comes or I come by in
 the morning... if there is an update.  :-)
I take a look as soon as time permits;
and sure the AP13 makefile can be adapted _now_; but when I created the 
makefile for Apache 1.3 we were building Apache self with the CodeWarrior 
project file, and mod_jk with Ant. So I created a simple makefile on my own to 
avoid the Ant hassle, and that worked fine. Only with recent Apache 1.3.31 I 
think Novell moved to the NWGUNUMakefile build system; and changing the mod_jk 
makefile to the new build system is already on my TODO list; however since the 
old makefile still works fine I didnt see high priority yet...

Guenter.



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

Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java

[Mark Thomas]

Mark Thomas wrote:
Remy Maucherat wrote:
snip
I think 32559 was actually invalid. I disagree with this fix (which I 
fixed once already), as I think no bug existed in the first place: 
although it is ok to clear the attribute list to be nice for GC (the 
containing context is discarded, so it shouldn't be very useful), no 
notification of attribute removals should be sent.

Similarly, attributes addition notifications are not done on startup, 
as the spec seems to imply they are only to be sent for notifying 
modifications while the application is running.
snip
I have just re-read the spec and some of the statements in 32559 are 
certainly wrong. However, I agree with 32559 in that reload and 
stop/start should have the same effect. I'll put together a simple test 
case to investigate this. I'll then port this fix back to TC4 plus and 
further changes the test case throws up.
I have looked at this further and the only odd behaviour is that the 
attribute listeners receive notifications of changes to the welcome 
files during context stop (and reload). No notifications of changes are 
received during context start.

I don't think this is a major issue but it is inconsistent. I'd like to 
change it (so no notifications of changes to the welcome files are 
received on stop) but I couldn't see an easy/obvious way to do this that 
didn't break something else. Any ideas anyone?

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

Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java

[Remy Maucherat]

Mark Thomas wrote:
Mark Thomas wrote:
Remy Maucherat wrote:
snip
I have just re-read the spec and some of the statements in 32559 are 
certainly wrong. However, I agree with 32559 in that reload and 
stop/start should have the same effect. I'll put together a simple 
test case to investigate this. I'll then port this fix back to TC4 
plus and further changes the test case throws up.

I have looked at this further and the only odd behaviour is that the 
attribute listeners receive notifications of changes to the welcome 
files during context stop (and reload). No notifications of changes are 
received during context start.

I don't think this is a major issue but it is inconsistent. I'd like to 
change it (so no notifications of changes to the welcome files are 
received on stop) but I couldn't see an easy/obvious way to do this that 
didn't break something else. Any ideas anyone?
I'll look into it. It may be because this is a special readonly 
attribute, so it wouldn't get removed properly on stop.

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

DO NOT REPLY [Bug 26752] - java.util.ConcurrentModificationException

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=26752.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=26752


[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]
   Severity|normal  |major
 Status|RESOLVED|REOPENED
  Component|Unknown |Connector:Coyote
 OS/Version|Linux   |FreeBSD
 Resolution|INVALID |
Version|5.0.18  |5.0.29




--- Additional Comments From [EMAIL PROTECTED]  2005-02-13 20:29 ---
This not fixed in the release I am running (jakarta-tomcat-5.0.29). What release
it it fixed in?

My stack trace is different, but the result is the same as that originally
described. I've updated the details to reflect the newer distribution.

here is the stack trace I'm getting:

Feb 13, 2005 2:18:08 PM org.apache.coyote.tomcat5.MapperListener init
WARNING: Error registering contexts
java.util.ConcurrentModificationException
at java.util.HashMap$HashIterator.nextEntry(HashMap.java:782)
at java.util.HashMap$EntryIterator.next(HashMap.java:824)
at java.util.HashMap.putAllForCreate(HashMap.java:424)
at java.util.HashMap.clone(HashMap.java:656)
at 
mx4j.server.DefaultMBeanRepository.clone(DefaultMBeanRepository.java:56)
at
mx4j.server.MBeanServerImpl.findMBeansByPattern(MBeanServerImpl.java:1603)
at 
mx4j.server.MBeanServerImpl.queryObjectNames(MBeanServerImpl.java:1568)
at mx4j.server.MBeanServerImpl.queryMBeans(MBeanServerImpl.java:1512)
at 
org.apache.coyote.tomcat5.MapperListener.init(MapperListener.java:115)
at
org.apache.coyote.tomcat5.CoyoteConnector.start(CoyoteConnector.java:1537)
at 
org.apache.catalina.core.StandardService.start(StandardService.java:489)
at 
org.apache.catalina.core.StandardServer.start(StandardServer.java:2313)
at org.apache.catalina.startup.Catalina.start(Catalina.java:556)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:324)
at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:287)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:425)

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

Re: Jk_map.c build 'problem'?

[NormW]

Still morning and the sky is a little lighter...
Günter Knauf wrote:
Hi,
OK - will be off and delve into Apache 1.3 a little closer. No idea
when Guenter might be through this way, but for now seems AP 1.3 is
a NetWare issue and AP 2.0 will get another try when Guenter comes
or I come by in the morning... if there is an update.  :-)
There have been many updates this morning from MT but not a fix for the 
problem that I noted last night (unless put in with something else) but 
will see what happens. I notice one is an update to the NWGNUmakefile, 
so perhaps I didn't try your -D_POSIX_SOURCE in the right place?

I take a look as soon as time permits; and sure the AP13 makefile can
be adapted _now_; but when I created the makefile for Apache 1.3 we
were building Apache self with the CodeWarrior project file, and
mod_jk with Ant. So I created a simple makefile on my own to avoid
the Ant hassle, and that worked fine. Only with recent Apache 1.3.31
I think Novell moved to the NWGUNUMakefile build system; and changing
the mod_jk makefile to the new build system is already on my TODO
list; however since the old makefile still works fine I didnt see
high priority yet...
Agree completely... work on your priorities not mod_jk's!
Guenter.
FTM,
Norm
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 29056] - java.util.ConcurrentModificationException

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=29056.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=29056


[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]
 Status|RESOLVED|REOPENED
 OS/Version||All
 Resolution|DUPLICATE   |




--- Additional Comments From [EMAIL PROTECTED]  2005-02-13 20:38 ---
Using 5.0.29

I'm having the same trouble, it's consistant and critical for a production
system. Restarting Tomcat usually doesn't help, and I have to remove all the
webapps in all the virtual hosts before I can get the system back up.

I've just entered my details in a reopened bug (26752), but it looks like I
added to the wrong ticket (I'll close that one again).

I've reopened this bug as it's clearly not resolved, patching a release version
of Tomcat (comment #9) is *not* resolution. If this is fixed in a later release,
let us know.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 26752] - java.util.ConcurrentModificationException

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=26752.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=26752


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2005-02-13 20:39 ---
Looks like I've added this to the wrong ticket, I'd put a comment in ticket
#29056  instead, and reclosing this one.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 29056] - java.util.ConcurrentModificationException

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=29056.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=29056





--- Additional Comments From [EMAIL PROTECTED]  2005-02-13 20:48 ---
Confirmed that comment #6 resolves the issue.
What version of tomcat can we expect this fix included in?


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java

[markt]

markt   2005/02/13 11:54:49

  Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
  Log:
  - Port Remy's fix for 33463 that was introduced by my (invalid) fix for 32559.
  - Aligned start and reload with respect to attributes
  - Remaining issue (as TC5) is that stop fires events for the welcome files
  
  Revision  ChangesPath
  1.129 +21 -21
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- StandardContext.java  16 Jan 2005 18:06:28 -  1.128
  +++ StandardContext.java  13 Feb 2005 19:54:49 -  1.129
  @@ -2464,13 +2464,6 @@
   // Shut down filters
   filterStop();
   
  -// Clear all application-originated servlet context attributes
  -if (context != null)
  -context.clearAttributes();
  -
  -// Shut down application event listeners
  -listenerStop();
  -
   // Shut down our session manager
   if ((manager != null)  (manager instanceof Lifecycle)) {
   try {
  @@ -2495,6 +2488,13 @@
   }
   }
   
  +// Shut down application event listeners
  +listenerStop();
  +
  +// Clear all application-originated servlet context attributes
  +if (context != null)
  +context.clearAttributes();
  +
   if (isUseNaming()) {
   // Stop
   namingContextListener.lifecycleEvent
  @@ -2540,6 +2540,10 @@
   // Binding thread
   oldCCL = bindThread();
   
  +// Restore the Welcome Files and Resources context attributes
  +postResources();
  +postWelcomeFiles();
  +
   // Restart our application event listeners and filters
   if (ok) {
   if (!listenerStart()) {
  @@ -2554,10 +2558,6 @@
   }
   }
   
  -// Restore the Welcome Files and Resources context attributes
  -postResources();
  -postWelcomeFiles();
  -
   // Restart our currently defined servlets
   for (int i = 0; i  children.length; i++) {
   if (!ok)
  @@ -3319,9 +3319,9 @@
   try {
   fireContainerEvent(beforeContextDestroyed, listener);
   listener.contextDestroyed(event);
  -fireContainerEvent(beforeContextDestroyed, listener);
  +fireContainerEvent(afterContextDestroyed, listener);
   } catch (Throwable t) {
  -fireContainerEvent(beforeContextDestroyed, listener);
  +fireContainerEvent(afterContextDestroyed, listener);
   log(sm.getString(standardContext.listenerStop,
listeners[j].getClass().getName()), t);
   ok = false;
  @@ -3695,13 +3695,6 @@
   // Stop our filters
   filterStop();
   
  -// Clear all application-originated servlet context attributes
  -if (context != null)
  -context.clearAttributes();
  -
  -// Stop our application listeners
  -listenerStop();
  -
   // Finalize our character set mapper
   setCharsetMapper(null);
   
  @@ -3730,6 +3723,13 @@
   ((Lifecycle) children[i]).stop();
   }
   
  +// Stop our application listeners
  +listenerStop();
  +
  +// Clear all application-originated servlet context attributes
  +if (context != null)
  +context.clearAttributes();
  +
   // Stop our Mappers, if any
   Mapper mappers[] = findMappers();
   for (int i = 0; i  mappers.length; i++) {
  
  
  

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

DO NOT REPLY [Bug 33463] - Struts PlugIn.destroy() method not called when WebApp stopped in Tomcat 5.5.7

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=33463.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33463





--- Additional Comments From [EMAIL PROTECTED]  2005-02-13 20:56 ---
And also ported back to TC4 where my same fix had created the same problem.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 29056] - java.util.ConcurrentModificationException

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=29056.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=29056





--- Additional Comments From [EMAIL PROTECTED]  2005-02-13 21:04 ---
Download the news mx4j 2.1.1 http://mx4j.sourceforge.net/
and copy mx4j.jar to your catalina.home/bin. Then delete existing
jmx.jar and move mx4j.jar to jmx.jar.

Peter

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

Mod_Jk .. build problem changes...

[NormW]

Greetings All,
Just updated mod_jk from CVS and now see the following:
Compiling ../common/jk_sockbuf.c
Compiling ../common/jk_status.c
### mwccnlm Compiler:
#File: ..\common\jk_status.c
# --
#  34: DTD HTML 3.2 Final//EN\\n  \
#   Error: ^
#   declaration syntax error
Errors caused tool to abort.
make: *** [Release.o/jk_status.o] Error 1
Darned at this point if I can spot the reason, however in the hope that 
this was the only one, tweaked the line to continue, and now get:

Compiling ../common/jk_util.c
Compiling ../common/jk_worker.c
### mwccnlm Compiler:
#File: ..\common\jk_worker.c
# --
#  52:  we-num_of_workers)) {
#   Error: ^
#   illegal implicit conversion from 'int *' to
#   'unsigned int *'
Errors caused tool to abort.
make: *** [Release.o/jk_worker.o] Error 1
Norm
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

postgresql jndi datasource feedback

[Olivier Jolly]

Hi,
 just a short mail to reply to the postgreSQL section of the jndi 
datasource example chapter of the doc (at least in the version 5.5).
 The given sample configuration works great as presented in the 
documentation.
 Keep up the good work

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

cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 NWGNUmakefile NWGNUmakefile.mak

[fuankg]

fuankg  2005/02/13 14:15:15

  Added:   jk/native/apache-1.3 NWGNUmakefile NWGNUmakefile.mak
  Log:
  added new Apache 1.3.x NetWare build system makefiles.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-connectors/jk/native/apache-1.3/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===
  #
  # Declare the sub-directories to be built here
  #
  
  SUBDIRS = \
$(EOLIST) 
  
  #
  # Get the 'head' of the build environment.  This includes default targets and
  # paths to tools
  #
  
  include $(AP_WORK)\NWGNUhead.inc
  
  #
  # build this level's files
  
  ifeq $(wildcard NWGNUmakefile.mak) NWGNUmakefile.mak 
  include NWGNUmakefile.mak
  endif
  
  #
  # You can use this target if all that is needed is to copy files to the
  # installation area
  #
  install :: nlms FORCE
  
  
  
  
  1.1  
jakarta-tomcat-connectors/jk/native/apache-1.3/NWGNUmakefile.mak
  
  Index: NWGNUmakefile.mak
  ===
  #
  # Makefile for mod_jk (NetWare version - gnu make)
  # created by Guenter Knauf [EMAIL PROTECTED]
  #
  
  #
  # Make sure all needed macro's are defined
  #
  
  # Edit the path below to point to the base of your NetWare Java SDK.
  ifndef NW_JDK
  NW_JDK= d:/projects/sdks/java-nw
  endif
  
  JKCOMMON = ../common
  
  #
  # Get the 'head' of the build environment if necessary.  This includes default
  # targets and paths to tools
  #
  
  ifndef EnvironmentDefined
  include $(AP_WORK)\NWGNUhead.inc
  endif
  
  #
  # These directories will be at the beginning of the include list, followed by
  # INCDIRS
  #
  XINCDIRS  += \
$(JKCOMMON) \
$(NW_JDK)/include \
$(NW_JDK)/include/netware \
$(SRC)\include \
$(NWOS) \
$(EOLIST)
  
  #
  # These flags will come after CFLAGS
  #
  XCFLAGS   += \
$(EOLIST)
  
  #
  # These defines will come after DEFINES
  #
  XDEFINES  += \
$(EOLIST)
  
  #
  # These flags will be added to the link.opt file
  #
  XLFLAGS   += \
$(EOLIST)
  
  #
  # These values will be appended to the correct variables based on the value of
  # RELEASE
  #
  ifeq $(RELEASE) debug
  XINCDIRS  += \
$(EOLIST)
  
  XCFLAGS   += \
$(EOLIST)
  
  XDEFINES  += \
$(EOLIST)
  
  XLFLAGS   += \
$(EOLIST)
  endif
  
  ifeq $(RELEASE) noopt
  XINCDIRS  += \
$(EOLIST)
  
  XCFLAGS   += \
$(EOLIST)
  
  XDEFINES  += \
$(EOLIST)
  
  XLFLAGS   += \
$(EOLIST)
  endif
  
  ifeq $(RELEASE) release
  XINCDIRS  += \
$(EOLIST)
  
  XCFLAGS   += \
$(EOLIST)
  
  XDEFINES  += \
$(EOLIST)
  
  XLFLAGS   += \
$(EOLIST)
  endif
  
  #
  # These are used by the link target if an NLM is being generated
  # This is used by the link 'name' directive to name the nlm.  If left blank
  # TARGET_nlm (see below) will be used.
  #
  NLM_NAME  = mod_jk
  
  #
  # This is used by the link '-desc ' directive. 
  # If left blank, NLM_NAME will be used.
  #
  NLM_DESCRIPTION   = Apache $(AP_VERSION_STR) plugin for Jakarta/Tomcat 
$(JK_VERSION_STR)
  
  #
  # This is used by the '-threadname' directive.  If left blank,
  # NLM_NAME Thread will be used.
  #
  NLM_THREAD_NAME   = JK Module
  
  #
  # If this is specified, it will override VERSION value in 
  # $(AP_WORK)\NWGNUenvironment.inc
  #
  NLM_VERSION   = $(JK_VERSION)
  
  #
  # If this is specified, it will override the default of 64K
  #
  NLM_STACK_SIZE= 49152
  
  #
  # If this is specified it will be used by the link '-entry' directive
  #
  NLM_ENTRY_SYM = _lib_start
  #NLM_ENTRY_SYM= _lib_start_ws
  
  #
  # If this is specified it will be used by the link '-exit' directive
  #
  NLM_EXIT_SYM  = _lib_stop
  #NLM_EXIT_SYM = _lib_stop_ws
  
  #
  # If this is specified it will be used by the link '-flags' directive
  #
  NLM_FLAGS =
  
  #
  # Declare all target files (you must add your files here)
  #
  
  #
  # If there is an NLM target, put it here
  #
  TARGET_nlm = \
$(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
  
  #
  # If there is an LIB target, put it here
  #
  TARGET_lib = \
$(EOLIST)
  
  #
  # These are the OBJ files needed to create the NLM target above.
  # Paths must all use the '/' character
  #
  FILES_nlm_objs = \
$(OBJDIR)/jk_nwmain.o \
$(OBJDIR)/jk_ajp12_worker.o \

cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 Makefile.netware NWGNUmakefile.mak

[fuankg]

fuankg  2005/02/13 14:28:07

  Modified:jk/native/apache-1.3 Makefile.netware NWGNUmakefile.mak
  Log:
  fixed var names.
  
  Revision  ChangesPath
  1.6   +6 -6  
jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware
  
  Index: Makefile.netware
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.netware  6 Feb 2005 17:43:09 -   1.5
  +++ Makefile.netware  13 Feb 2005 22:28:07 -  1.6
  @@ -1,21 +1,21 @@
   #
   # Makefile for mod_jk (NetWare version - gnu make)
  -# created by Guenter Knauf [EMAIL PROTECTED]
  +# created by Guenter Knauf [EMAIL PROTECTED]
   #
   
   # Edit the path below to point to the base of your Apache 1.3 includes.
   ifndef AP_HOME
  -AP_HOME  = c:/projects/cw/apache_1.3.31
  +AP_HOME  = c:/projects/cw/apache_1.3.33
   endif
   # Edit the path below to point to the base of your NetWare Java SDK.
  -ifndef NW_JDK
  -NW_JDK   = c:/projects/sdks/java-nw
  +ifndef JAVA_HOME
  +JAVA_HOME= c:/projects/sdks/java-nw
   endif
   # Edit the path below to point to the base of your Novell NDK.
   ifndef NDKBASE
   NDKBASE  = c:/novell
   endif
  -INSTDIR = s:/apache/modules
  +INSTDIR  = s:/apache/modules
   
   # Edit the vars below to change NLM target settings.
   TARGET  = mod_jk
  @@ -103,7 +103,7 @@
   JKCOMMON = ../common
   
   INCLUDES = -I$(AP_HOME)/src/include -I$(AP_HOME)/src/os/netware
  -INCLUDES += -I$(JKCOMMON) -I$(NW_JDK)/include -I$(NW_JDK)/include/netware 
  +INCLUDES += -I$(JKCOMMON) -I$(JAVA_HOME)/include 
-I$(JAVA_HOME)/include/netware 
   
   ifeq ($(LIBARCH),LIBC)
INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
  
  
  
  1.2   +4 -4  
jakarta-tomcat-connectors/jk/native/apache-1.3/NWGNUmakefile.mak
  
  Index: NWGNUmakefile.mak
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/NWGNUmakefile.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NWGNUmakefile.mak 13 Feb 2005 22:15:15 -  1.1
  +++ NWGNUmakefile.mak 13 Feb 2005 22:28:07 -  1.2
  @@ -8,8 +8,8 @@
   #
   
   # Edit the path below to point to the base of your NetWare Java SDK.
  -ifndef NW_JDK
  -NW_JDK   = d:/projects/sdks/java-nw
  +ifndef JAVA_HOME
  +JAVA_HOME = c:/projects/sdks/java-nw
   endif
   
   JKCOMMON = ../common
  @@ -29,8 +29,8 @@
   #
   XINCDIRS += \
$(JKCOMMON) \
  - $(NW_JDK)/include \
  - $(NW_JDK)/include/netware \
  + $(JAVA_HOME)/include \
  + $(JAVA_HOME)/include/netware \
$(SRC)\include \
$(NWOS) \
$(EOLIST)
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c

[fuankg]

fuankg  2005/02/13 14:32:58

  Modified:jk/native/common jk_status.c
  Log:
  removed obsolete empty lines since they break CodeWarrior compiler.
  
  Revision  ChangesPath
  1.3   +2 -7  jakarta-tomcat-connectors/jk/native/common/jk_status.c
  
  Index: jk_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_status.c   13 Feb 2005 12:22:31 -  1.2
  +++ jk_status.c   13 Feb 2005 22:32:58 -  1.3
  @@ -29,14 +29,9 @@
   
   #define HUGE_BUFFER_SIZE (8*1024)
   
  -#define JK_STATUS_HEAD !DOCTYPE HTML PUBLIC \-//W3C// \

  -   DTD HTML 3.2 Final//EN\\n  \

  -   htmlheadtitleJK Status 
Manager/title/head\n  \

  -   body\n

  -
  +#define JK_STATUS_HEAD !DOCTYPE HTML PUBLIC \-//W3C// \
   DTD HTML 3.2 Final//EN\\n  \
   htmlheadtitleJK Status Manager/title/head\n  
\
   body\n

   #define JK_STATUS_HEND /body\n/html\n

   
  -
   typedef struct status_worker status_worker_t;
   
   struct status_endpoint
  
  
  

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

Re: Mod_Jk .. build problem changes...

[Günter Knauf]

Hi Norm,
just fixed - see my last commit.

 Just updated mod_jk from CVS and now see the following:

 Compiling ../common/jk_sockbuf.c
 Compiling ../common/jk_status.c
 ### mwccnlm Compiler:
 #File: ..\common\jk_status.c
 # --
 #  34: DTD HTML 3.2 Final//EN\\n  \
 #   Error: ^
 #   declaration syntax error

 Errors caused tool to abort.
 make: *** [Release.o/jk_status.o] Error 1

 Darned at this point if I can spot the reason, however in the hope that
 this was the only one, tweaked the line to continue, and now get:

 Compiling ../common/jk_util.c
 Compiling ../common/jk_worker.c
 ### mwccnlm Compiler:
 #File: ..\common\jk_worker.c
 # --
 #  52:  we-num_of_workers)) {
 #   Error: ^
 #   illegal implicit conversion from 'int *' to
 #   'unsigned int *'

 Errors caused tool to abort.
 make: *** [Release.o/jk_worker.o] Error 1

 Norm

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



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

Re: Mod_Jk .. build problem changes...

[Günter Knauf]

Hi,
and before you ask, the next error:

Compiling ../common/jk_worker.c
### mwccnlm Compiler:
#File: ..\common\jk_worker.c
# --
#  52:  we-num_of_workers)) {
#   Error:^
#   illegal implicit conversion from 'int' to
#   'unsigned int *'

can be fixed for the moment with:

--- jk_worker.c.origSun Feb 13 23:44:08 2005
+++ jk_worker.c Sun Feb 13 23:59:50 2005
@@ -49,7 +49,7 @@
 }
 
 if (!jk_get_worker_list(init_data, (we-worker_list),
-we-num_of_workers)) {
+(unsigned int *)we-num_of_workers)) {
 JK_TRACE_EXIT(l);
 we-num_of_workers = 0;
 we-worker_list = NULL;


however at the moment I cant find find the heck where the type mismatch really 
is...

Mladen: please take a look at jk_lc_worker.c where a couple of times 
num_of_workers is defined as int instead of unsigned...

Guenter.



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

Re: Mod_Jk .. build problem changes.../resend

[Günter Knauf]

woops! was the wrong error and diff!

Hi,
and before you ask, the next error:

Compiling ../common/jk_worker.c
### mwccnlm Compiler:
#File: ..\common\jk_worker.c
# --
#  52:  we-num_of_workers)) {
#   Error:^
#   illegal implicit conversion from 'int *' to
#   'unsigned int *'

can be fixed for the moment with:

--- jk_worker.c.origSun Feb 13 23:03:50 2005
+++ jk_worker.c Sun Feb 13 23:59:50 2005
@@ -49,7 +49,7 @@
 }
 
 if (!jk_get_worker_list(init_data, (we-worker_list),
-we-num_of_workers)) {
+(unsigned int *)we-num_of_workers)) {
 JK_TRACE_EXIT(l);
 we-num_of_workers = 0;
 we-worker_list = NULL;


however at the moment I cant find find the heck where the type mismatch really 
is...

Mladen: please take a look at jk_lc_worker.c where a couple of times 
num_of_workers is defined as int instead of unsigned...

Guenter.



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

Current Connector Development

[Günter Knauf]

Hi Mladen,
appologies that I couldnt closely follow the connector development in the past 
year, so I'm somewhat suprised about all the recent directions; and cant 
really understand them; so I would greatly appreciate if you could do a 
summarize why you are currently again developing to mod_jk...

well, what I see is this:
after more than one year stagnation on the mod_jk2 connector we started again, 
made it comilable on all platforms, and improved it a lot, cleaned up the code 
cause we made APR mandatory, and did a release. Many users where happy with it, 
and a lot of new users came and saw 'hey, thats the new connector' and tried 
it; others migrated and found mod_jk2 faster over mod_jk.

Few time later you are not lucky with mod_jk2, and you just want to start 
another conenctor; and after some discussion you agreed to create mod_proy_ajp.

Then suddenly, just after mod_proy_ajp is just born - and I cant believe that 
it is only cause I couldnt follow up with development - I see that you state 
that mod_jk2 has come to its end cause of no developers and no users 
interest

really suprised of this all I get mail from Novell asking for help since mod_jk 
is now broken.
we have just fixed it so we could folow up with the 1.2.8 release, and you 
continue to break it ..

If I recall correctly we commonly agreed with last time's discussion that we 
stay with mod_jk _as_is_ and dont move to APR or such, and that mod_jk should 
mainly remain for our Apache 1.3.x users while Apache 2.x users should use 
mod_jk2 or also now mod_proxy_ajp - so what has changed this direction now??

Mladen, if you continue with the mod_jk development I fear that we end up the 
same as with mod_jk2: you will certainly break Apache 1.3.x support - at least 
on NetWare, and that's _very_ bad cause it's a shipping product of NetWare 6.

greets, Guenter.



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

Re: Current Connector Development

[Jess Holle]

Günter Knauf wrote:
Hi Mladen,
appologies that I couldnt closely follow the connector development in the past 
year, so I'm somewhat suprised about all the recent directions; and cant 
really understand them; so I would greatly appreciate if you could do a 
summarize why you are currently again developing to mod_jk...
well, what I see is this:
after more than one year stagnation on the mod_jk2 connector we started again, 
made it comilable on all platforms, and improved it a lot, cleaned up the code 
cause we made APR mandatory, and did a release. Many users where happy with it, 
and a lot of new users came and saw 'hey, thats the new connector' and tried 
it; others migrated and found mod_jk2 faster over mod_jk.
Few time later you are not lucky with mod_jk2, and you just want to start 
another conenctor; and after some discussion you agreed to create mod_proy_ajp.
Then suddenly, just after mod_proy_ajp is just born - and I cant believe that 
it is only cause I couldnt follow up with development - I see that you state 
that mod_jk2 has come to its end cause of no developers and no users 
interest
really suprised of this all I get mail from Novell asking for help since mod_jk 
is now broken.
we have just fixed it so we could folow up with the 1.2.8 release, and you 
continue to break it ..
If I recall correctly we commonly agreed with last time's discussion that we 
stay with mod_jk _as_is_ and dont move to APR or such, and that mod_jk should 
mainly remain for our Apache 1.3.x users while Apache 2.x users should use 
mod_jk2 or also now mod_proxy_ajp - so what has changed this direction now??
Mladen, if you continue with the mod_jk development I fear that we end up the same as with mod_jk2: you will certainly break Apache 1.3.x support - at least on NetWare, and that's _very_ bad cause it's a shipping product of NetWare 6.
 

I don't see mod_jk ending up the same as mod_jk2 in that:
 1) The configuration is relatively sane as compared to that of mod_jk2
 2) There are many reasonably stable mod_jk versions, so even *if* 
Mladen screws up a release there are plenty of alternative mod_jk versions.
   * On the other hand, there never really was a stable mod_jk2 
release -- every release tested continued to exhibit serious corner case 
issues.

It would be great if everyone could move to mod_proxy_ajp, but I believe 
that still requires Apache 2.1/2.2 -- which means it has not yet arrived 
for the majority of us.

I personally applaud Mladen for his efforts to fix/improve/maintain 
mod_jk given that that is the reality for most of us.

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

Re: Current Connector Development

[Günter Knauf]

Hi,
 I don't see mod_jk ending up the same as mod_jk2 in that:
   1) The configuration is relatively sane as compared to that of mod_jk2
   2) There are many reasonably stable mod_jk versions, so even *if*
 Mladen screws up a release there are plenty of alternative mod_jk
 versions.
unfortunately the situation on NetWare platform is a bit other, just to make 
that clear to everyone:
although APR is fully functional on NetWare it can only be consumed by Apache 
2.x and never from Apache 1.3.x - hence if APR gets mandatory for mod_jk then 
NetWare Apache 1.3 gets broken (and perhaps not only NetWare) for ever. The 
same applies to SHM.

 It would be great if everyone could move to mod_proxy_ajp, but I believe
 that still requires Apache 2.1/2.2 -- which means it has not yet arrived
 for the majority of us.
it would be of interest if we can now already compile the module with the 2.0.x 
series; 
then I would love to provide binaries for NetWare and Win32 on my site, and we 
will see what the users think...

 I personally applaud Mladen for his efforts to fix/improve/maintain
 mod_jk given that that is the reality for most of us.
the same from my side - and to make that absolutely clear: that was nothing 
against Mladen's work, but more a curious question why directions changed, and 
a prognose what this will probably cause for NetWare.

Guenter.



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

Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c

[NormW]

Greetings All,
Aahhh - the extra c\r's were terminating the lines
Not being the brightess kid on the block, is there any reason this can't 
just be in one string without the whitespace?

Norm
[EMAIL PROTECTED] wrote:
fuankg  2005/02/13 14:32:58
Modified:jk/native/common jk_status.c Log: removed obsolete empty
lines since they break CodeWarrior compiler.
Revision  ChangesPath 1.3   +2 -7
jakarta-tomcat-connectors/jk/native/common/jk_status.c
Index: jk_status.c 
=== 
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v 
retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 
--- jk_status.c	13 Feb 2005 12:22:31 -	1.2 +++ jk_status.c	13 Feb
2005 22:32:58 -	1.3 @@ -29,14 +29,9 @@

#define HUGE_BUFFER_SIZE (8*1024)
-#define JK_STATUS_HEAD !DOCTYPE HTML PUBLIC \-//W3C// \ -
DTD HTML 3.2 Final//EN\\n  \ -
htmlheadtitleJK Status Manager/title/head\n  \ -
body\n - +#define JK_STATUS_HEAD !DOCTYPE HTML PUBLIC
\-//W3C// \ #define JK_STATUS_HEND /body\n/html\n
- typedef struct status_worker status_worker_t;
struct status_endpoint

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

.

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

Re: Current Connector Development

[Mladen Turk]

Hi,
Well, you put it right. To some point ;)
First, I must say that mod_jk does not require APR neither it will.
So your concerns about dropping 1.3 support are not standing.
The main reason for continuing mod_jk development is the fact
that mod_jk was more stable on more platforms then jk2 was.
Adding new things to mod_jk does not mean it will be less unstable
then it is or is not already. What I'm trying to do is to port back
all the good things from jk2 like dynamic config and status, without
braking any existing platform supported.
Also, the current development version is just like said *development*.
If it's broken between two commits, it doesn't mean it will stay as
such :). AFAICS we only have one or two parameter conversion issues.
And sure, we tried various ways for connectors, that sometimes lead
to quite fuzzy directions and agreements.
As things are now standing, mod_jk will continue support for the
following servers:
apache 1.3.x, apache 2.0.x, IIS, Netscape. (Domino is down I think,
because nobody cares, thought).
Next release will have jk_status page for dynamic config and status,
as well as runtime workers.properties monitoring and reloading.
This will only allow changing of existing parameters, not creating new
workers like in jk2.
This is also the last of major design change to mod_jk that I'm willing
to port back from jk2, and after that it will be more or less frozen
from design perspective. There was a try to implement AJP14 protocol,
but IMHO mod_jk design doesn't allow us to do that.
Apache 2.1/2.2 has mod_proxy_ajp with the active development, and
surprisingly stable :).
Regards,
Mladen.
Günter Knauf wrote:
Hi Mladen,
appologies that I couldnt closely follow the connector development in the past 
year, so I'm somewhat suprised about all the recent directions; and cant 
really understand them; so I would greatly appreciate if you could do a 
summarize why you are currently again developing to mod_jk...
well, what I see is this:
after more than one year stagnation on the mod_jk2 connector we started again, 
made it comilable on all platforms, and improved it a lot, cleaned up the code 
cause we made APR mandatory, and did a release. Many users where happy with it, 
and a lot of new users came and saw 'hey, thats the new connector' and tried 
it; others migrated and found mod_jk2 faster over mod_jk.
Few time later you are not lucky with mod_jk2, and you just want to start 
another conenctor; and after some discussion you agreed to create mod_proy_ajp.
Then suddenly, just after mod_proy_ajp is just born - and I cant believe that 
it is only cause I couldnt follow up with development - I see that you state 
that mod_jk2 has come to its end cause of no developers and no users 
interest
really suprised of this all I get mail from Novell asking for help since mod_jk 
is now broken.
we have just fixed it so we could folow up with the 1.2.8 release, and you 
continue to break it ..
If I recall correctly we commonly agreed with last time's discussion that we 
stay with mod_jk _as_is_ and dont move to APR or such, and that mod_jk should 
mainly remain for our Apache 1.3.x users while Apache 2.x users should use 
mod_jk2 or also now mod_proxy_ajp - so what has changed this direction now??
Mladen, if you continue with the mod_jk development I fear that we end up the 
same as with mod_jk2: you will certainly break Apache 1.3.x support - at least 
on NetWare, and that's _very_ bad cause it's a shipping product of NetWare 6.
greets, Guenter.

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


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

Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c

[Mladen Turk]

NormW wrote:
Greetings All,
Aahhh - the extra c\r's were terminating the lines
He he.
Seems you removed LF's instead CR's.
The source looks very cool now ;).
Not being the brightess kid on the block, is there any reason this can't 
just be in one string without the whitespace?

No.
defines on multiple lines for strings are quite common, and every
compiler supports them, even mwccnlm ;).
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_service.h

[mturk]

mturk   2005/02/13 23:57:18

  Modified:jk/native/common jk_service.h
  Log:
  Change num_of workers to unsigned, to match the api.
  
  Revision  ChangesPath
  1.26  +2 -2  jakarta-tomcat-connectors/jk/native/common/jk_service.h
  
  Index: jk_service.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_service.h,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- jk_service.h  13 Feb 2005 12:19:22 -  1.25
  +++ jk_service.h  14 Feb 2005 07:57:18 -  1.26
  @@ -53,7 +53,7 @@
   /* The URI to WORKER map, will be feeded by AJP14 autoconf feature */
   jk_uri_worker_map_t *uri_to_worker;
   
  -int num_of_workers;
  +unsigned int num_of_workers;
   char **worker_list;
   
   /* Web-Server we're running on (Apache/IIS/NES) */
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c

[mturk]

mturk   2005/02/13 23:57:41

  Modified:jk/native/common jk_util.c
  Log:
  Unabify the source.
  
  Revision  ChangesPath
  1.55  +3 -3  jakarta-tomcat-connectors/jk/native/common/jk_util.c
  
  Index: jk_util.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- jk_util.c 12 Feb 2005 19:26:41 -  1.54
  +++ jk_util.c 14 Feb 2005 07:57:41 -  1.55
  @@ -1089,10 +1089,10 @@
   {
   pthread_t t = pthread_self();
   #ifdef AS400
  - /* OS400 use 64 bits ThreadId, get only low 32 bits for now */
  +/* OS400 use 64 bits ThreadId, get only low 32 bits for now */
   pthread_id_np_t   tid;
   pthread_getunique_np(t, tid);  
  - return ((int)(tid.intId.lo  0x));
  +return ((int)(tid.intId.lo  0x));
   #else
   int tid = (int)(t  0x);
   return tid;
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c

[mturk]

mturk   2005/02/13 23:58:02

  Modified:jk/native/common jk_status.c
  Log:
  Use correct line endings.
  
  Revision  ChangesPath
  1.4   +7 -3  jakarta-tomcat-connectors/jk/native/common/jk_status.c
  
  Index: jk_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_status.c   13 Feb 2005 22:32:58 -  1.3
  +++ jk_status.c   14 Feb 2005 07:58:02 -  1.4
  @@ -29,8 +29,12 @@
   
   #define HUGE_BUFFER_SIZE (8*1024)
   
  -#define JK_STATUS_HEAD !DOCTYPE HTML PUBLIC \-//W3C// \
   DTD HTML 3.2 Final//EN\\n  \
   htmlheadtitleJK Status Manager/title/head\n  
\
   body\n

  -#define JK_STATUS_HEND /body\n/html\n

  +#define JK_STATUS_HEAD !DOCTYPE HTML PUBLIC \-//W3C// \
  +   DTD HTML 3.2 Final//EN\\n  \
  +   htmlheadtitleJK Status 
Manager/title/head\n  \
  +   body\n
  +
  +#define JK_STATUS_HEND /body\n/html\n
   
   typedef struct status_worker status_worker_t;
   
  
  
  

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