from:"hgomez"

svn commit: r344133 - /tomcat/current/tc5.5.x/connectors/

2005-11-14 Thread hgomez

Author: hgomez
Date: Mon Nov 14 06:37:26 2005
New Revision: 344133

URL: http://svn.apache.org/viewcvs?rev=344133&view=rev
Log: (empty)

Added:
tomcat/current/tc5.5.x/connectors/


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

svn commit: r344135 - /tomcat/current/tc5.5.x/container/

2005-11-14 Thread hgomez

Author: hgomez
Date: Mon Nov 14 06:42:56 2005
New Revision: 344135

URL: http://svn.apache.org/viewcvs?rev=344135&view=rev
Log: (empty)

Added:
tomcat/current/tc5.5.x/container/


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

svn commit: r344136 - /tomcat/current/tc5.5.x/jasper/

2005-11-14 Thread hgomez

Author: hgomez
Date: Mon Nov 14 06:44:28 2005
New Revision: 344136

URL: http://svn.apache.org/viewcvs?rev=344136&view=rev
Log: (empty)

Added:
tomcat/current/tc5.5.x/jasper/


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

svn commit: r538457 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-05-16 Thread hgomez

Author: hgomez
Date: Wed May 16 00:40:01 2007
New Revision: 538457

URL: http://svn.apache.org/viewvc?view=rev&rev=538457
Log:
On i5/OS, we still have the sent_bodyct cleared. Need further investigation by 
Rochester Lab

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=538457&r1=538456&r2=538457
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed May 16 00:40:01 
2007
@@ -314,11 +314,6 @@
 }
 }
 
-  /* under i5/OS this flag is not set correctly */
-#ifdef AS400
-r->sent_bodyct = 1;
-#endif
-
 /* this NOP function was removed in apache 2.0 alpha14 */
 /* ap_send_http_header(r); */
 p->response_started = JK_TRUE;
@@ -2230,7 +2225,14 @@
 if (rc > 0) {
 /* If tomcat returned no body and the status is not OK,
let apache handle the error code */
+
+/* [EMAIL PROTECTED] : under i5/OS sent_bodyct is not set correctly */
+/*   check for header_only to see if there was a body */
+#ifdef AS400
+   if (r->header_only && r->status >= 
HTTP_BAD_REQUEST) {
+#else
 if (!r->sent_bodyct && r->status >= HTTP_BAD_REQUEST) {
+#endif
 jk_log(xconf->log, JK_LOG_INFO, "No body with status=%d"
" for worker=%s",
r->status, worker_name);



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

svn commit: r538459 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-05-16 Thread hgomez

Author: hgomez
Date: Wed May 16 00:45:56 2007
New Revision: 538459

URL: http://svn.apache.org/viewvc?view=rev&rev=538459
Log:
We should take a closer look to this, not only in i5/OS case

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=538459&r1=538458&r2=538459
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed May 16 00:45:56 
2007
@@ -2226,13 +2226,9 @@
 /* If tomcat returned no body and the status is not OK,
let apache handle the error code */
 
-/* [EMAIL PROTECTED] : under i5/OS sent_bodyct is not set correctly */
+/* [EMAIL PROTECTED] : under i5/OS sent_bodyct is not set correctly */
 /*   check for header_only to see if there was a body */
-#ifdef AS400
-   if (r->header_only && r->status >= 
HTTP_BAD_REQUEST) {
-#else
 if (!r->sent_bodyct && r->status >= HTTP_BAD_REQUEST) {
-#endif
 jk_log(xconf->log, JK_LOG_INFO, "No body with status=%d"
" for worker=%s",
r->status, worker_name);



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

svn commit: r538461 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-05-16 Thread hgomez

Author: hgomez
Date: Wed May 16 00:52:32 2007
New Revision: 538461

URL: http://svn.apache.org/viewvc?view=rev&rev=538461
Log:
Restore the i5/OS hack

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=538461&r1=538460&r2=538461
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed May 16 00:52:32 
2007
@@ -318,6 +318,12 @@
 /* ap_send_http_header(r); */
 p->response_started = JK_TRUE;
 
+   /* [EMAIL PROTECTED]: under i5/OS this flag is not set correctly */
+   /* We should check with Rochester Labs what could be the problem */
+#ifdef AS400
+r->sent_bodyct = 1;
+#endif
+
 return JK_TRUE;
 }
 



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

svn commit: r551893 - /tomcat/connectors/trunk/jk/native/common/jk_shm.c

2007-06-29 Thread hgomez

Author: hgomez
Date: Fri Jun 29 06:55:47 2007
New Revision: 551893

URL: http://svn.apache.org/viewvc?view=rev&rev=551893
Log:
Add ascii->ebcdic conversion around open, unlink. Provided by Ron Egyed

Modified:
tomcat/connectors/trunk/jk/native/common/jk_shm.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.c?view=diff&rev=551893&r1=551892&r2=551893
==
--- tomcat/connectors/trunk/jk/native/common/jk_shm.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.c Fri Jun 29 06:55:47 2007
@@ -241,6 +241,10 @@
 {
 int rc;
 char flkname[256];
+#ifdef AS400_UTF8
+char *wptr;
+#endif
+
 JK_TRACE_ENTER(l);
 
 if (attached && jk_shmem.lockname) {
@@ -248,7 +252,7 @@
 jk_shmem.fd_lock = open(jk_shmem.lockname, O_RDWR, 0666);
 #else
 errno = EINVAL;
-#endif
+#endif
 if (jk_shmem.fd_lock == -1) {
 rc = errno;
 JK_TRACE_EXIT(l);
@@ -278,8 +282,15 @@
 #else
 strcpy(flkname, fname);
 strcat(flkname, ".lock");
+#ifdef AS400_UTF8
+wptr = (char *)malloc(strlen(flkname) + 1);
+jk_ascii2ebcdic((char *)flkname, wptr);
+jk_shmem.fd_lock = open(wptr, O_RDWR|O_CREAT|O_TRUNC, 0666);
+free(wptr);
+#else
 jk_shmem.fd_lock = open(flkname, O_RDWR|O_CREAT|O_TRUNC, 0666);
 #endif
+#endif
 if (jk_shmem.fd_lock == -1) {
 rc = errno;
 JK_TRACE_EXIT(l);
@@ -319,6 +330,9 @@
 int rc;
 int fd;
 void *base;
+#ifdef AS400_UTF8
+char *wptr;
+#endif
 
 JK_TRACE_ENTER(l);
 if (jk_shmem.hdr) {
@@ -353,7 +367,14 @@
 if (!attached) {
 size_t size;
 jk_shmem.attached = 0;
+#ifdef AS400_UTF8
+wptr = (char *)malloc(strlen(jk_shmem.filename) + 1);
+jk_ascii2ebcdic((char *)jk_shmem.filename, wptr);
+fd = open(wptr, O_RDWR|O_CREAT|O_TRUNC, 0666);
+free(wptr);
+#else
 fd = open(jk_shmem.filename, O_RDWR|O_CREAT|O_TRUNC, 0666);
+#endif
 if (fd == -1) {
 jk_shmem.size = 0;
 JK_TRACE_EXIT(l);
@@ -365,7 +386,14 @@
 if (ftruncate(fd, jk_shmem.size)) {
 rc = errno;
 close(fd);
+#ifdef  AS400_UTF8
+wptr = (char *)malloc(strlen(jk_shmem.filename) + 1);
+jk_ascii2ebcdic((char *)jk_shmem.filename, wptr);
+unlink(wptr);
+free(wptr);
+#else
 unlink(jk_shmem.filename);
+#endif
 jk_shmem.size = 0;
 JK_TRACE_EXIT(l);
 return rc;
@@ -377,7 +405,14 @@
 if (lseek(fd, 0, SEEK_SET) != 0) {
 rc = errno;
 close(fd);
+#ifdef  AS400_UTF8
+wptr = (char *)malloc(strlen(jk_shmem.filename) + 1);
+jk_ascii2ebcdic((char *)jk_shmem.filename, wptr);
+unlink(wptr);
+free(wptr);
+#else
 unlink(jk_shmem.filename);
+#endif
 jk_shmem.size = 0;
 JK_TRACE_EXIT(l);
 return rc;
@@ -390,7 +425,14 @@
 if (base == (caddr_t)MAP_FAILED || base == (caddr_t)0) {
 rc = errno;
 close(fd);
+#ifdef  AS400_UTF8
+wptr = (char *)malloc(strlen(jk_shmem.filename) + 1);
+jk_ascii2ebcdic((char *)jk_shmem.filename, wptr);
+unlink(wptr);
+free(wptr);
+#else
 unlink(jk_shmem.filename);
+#endif
 jk_shmem.size = 0;
 JK_TRACE_EXIT(l);
 return rc;
@@ -439,7 +481,14 @@
 if (!attached) {
 munmap((void *)jk_shmem.hdr, jk_shmem.size);
 close(jk_shmem.fd);
+#ifdef  AS400_UTF8
+wptr = (char *)malloc(strlen(jk_shmem.filename) + 1);
+jk_ascii2ebcdic((char *)jk_shmem.filename, wptr);
+unlink(wptr);
+free(wptr);
+#else
 unlink(jk_shmem.filename);
+#endif
 }
 jk_shmem.hdr = NULL;
 jk_shmem.fd  = -1;
@@ -463,6 +512,10 @@
 void jk_shm_close()
 {
 int rc;
+#ifdef AS400_UTF8
+char *wptr;
+#endif
+
 if (jk_shmem.hdr) {
 --jk_shmem.hdr->h.data.childs;
 
@@ -493,12 +546,26 @@
 if (jk_shmem.fd_lock >= 0)
 close(jk_shmem.fd_lock);
 if (jk_shmem.lockname) {
+#ifdef  AS400_UTF8
+wptr = (char *)malloc(strlen(jk_shmem.lockname) + 1);
+jk_ascii2ebcdic((char *)jk_shmem.lockname, wptr);
+unlink(wptr);
+free(wptr);
+#else
 unlink(jk_shmem.lockname);
+#endif
 free(jk_shmem.lockname);
 jk_shmem.lockname = NULL;
 }
 if (jk_shmem.filename) {
+#ifdef  AS400_UTF8
+wptr = (char *)malloc(strlen(jk_shmem.filename) + 1);
+jk_ascii2ebcdic((char *)jk_shme

svn commit: r552842 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

2007-07-03 Thread hgomez

Author: hgomez
Date: Tue Jul  3 06:46:41 2007
New Revision: 552842

URL: http://svn.apache.org/viewvc?view=rev&rev=552842
Log:
Fix problem with double toupper evaluation on i5/OS V5R4 in LOCALEUTF8 mode

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?view=diff&rev=552842&r1=552841&r2=552842
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Tue Jul  3 
06:46:41 2007
@@ -252,8 +252,11 @@
 if (len < 4 || len > 15)
 return UNKNOWN_METHOD;
 
-while (*p)
-header[i++] = toupper((unsigned char)*p++);
+while (*p) {
+header[i++] = toupper((unsigned char)*p);
+p++;
+}
+
 header[i] = '\0';
 p = &header[1];
 



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

svn commit: r567689 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-08-20 Thread hgomez

Author: hgomez
Date: Mon Aug 20 06:16:13 2007
New Revision: 567689

URL: http://svn.apache.org/viewvc?rev=567689&view=rev
Log:
Fix for send_bodyct on i5/OS. The problem was in jk (not flushing) and not on 
IBM implementation (my bad)

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=567689&r1=567688&r2=567689&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Aug 20 06:16:13 
2007
@@ -319,12 +319,6 @@
 /* ap_send_http_header(r); */
 p->response_started = JK_TRUE;
 
-   /* [EMAIL PROTECTED]: under i5/OS this flag is not set correctly */
-   /* We should check with Rochester Labs what could be the problem */
-#ifdef AS400
-r->sent_bodyct = 1;
-#endif
-
 return JK_TRUE;
 }
 
@@ -375,7 +369,7 @@
 
 static void JK_METHOD ws_flush(jk_ws_service_t *s)
 {
-#ifndef AS400
+#if ! (defined(AS400) && !defined(AS400_UTF8))
 if (s && s->ws_private) {
 apache_private_data_t *p = s->ws_private;
 ap_rflush(p->r);
@@ -423,7 +417,7 @@
 }
 }
 if (p->r->header_only) {
-#ifndef AS400
+#if ! (defined(AS400) && !defined(AS400_UTF8))
 ap_rflush(p->r);
 #endif
 return JK_TRUE;
@@ -2248,8 +2242,6 @@
 /* If tomcat returned no body and the status is not OK,
let apache handle the error code */
 
-/* [EMAIL PROTECTED] : under i5/OS sent_bodyct is not set correctly */
-/*   check for header_only to see if there was a body */
 if (!r->sent_bodyct && r->status >= HTTP_BAD_REQUEST) {
 jk_log(xconf->log, JK_LOG_INFO, "No body with status=%d"
" for worker=%s",



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

svn commit: r520012 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-03-19 Thread hgomez

Author: hgomez
Date: Mon Mar 19 09:54:16 2007
New Revision: 520012

URL: http://svn.apache.org/viewvc?view=rev&rev=520012
Log:
The iSeries implementation need a different initialisation of jk log.
This fix is to be infestigated further with IBMer Rochester.

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=520012&r1=520011&r2=520012
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Mar 19 09:54:16 
2007
@@ -2785,7 +2785,22 @@
 for (; srv; srv = srv->next) {
 jk_server_conf_t *sconf = (jk_server_conf_t 
*)ap_get_module_config(srv->module_config,

&jk_module);
+/***
+ * on iSeries, the web server is 'HTTP Powered by Apache 2', as such it 
differs from the regular 
+ * implementations found on others boxes.
+ * 
+ * One of this difference is that the life cycle seems different and we 
discovered that on such platform
+ * we need to initialize the jk log with the plog instead of pconf.
+ * 
+ * We're waiting for more feedback from Rochester iSeries Labs... 
+ * 
+ ***/
+  
+#ifdef AS400
+if (open_jklog(srv, plog))
+#else
 if (open_jklog(srv, pconf))
+#endif
 return HTTP_INTERNAL_SERVER_ERROR;
 if (sconf) {
 if (!uri_worker_map_alloc(&(sconf->uw_map),



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

svn commit: r520029 - /tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc

2007-03-19 Thread hgomez

Author: hgomez
Date: Mon Mar 19 11:07:21 2007
New Revision: 520029

URL: http://svn.apache.org/viewvc?view=rev&rev=520029
Log:
Latest build file for iSeries (from module directive recommandation for i5/OS 
v5R3)

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc?view=diff&rev=520029&r1=520028&r2=520029
==
Binary files - no diff available.



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

svn commit: r520336 - /tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc

2007-03-20 Thread hgomez

Author: hgomez
Date: Tue Mar 20 01:54:06 2007
New Revision: 520336

URL: http://svn.apache.org/viewvc?view=rev&rev=520336
Log:
Add optmizing compile option

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc?view=diff&rev=520336&r1=520335&r2=520336
==
Binary files - no diff available.



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

svn commit: r523989 - /tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c

2007-03-30 Thread hgomez

Author: hgomez
Date: Fri Mar 30 01:30:57 2007
New Revision: 523989

URL: http://svn.apache.org/viewvc?view=rev&rev=523989
Log:
For EBCDIC systems translation is required

Modified:
tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c?view=diff&rev=523989&r1=523988&r2=523989
==
--- tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c Fri Mar 30 01:30:57 
2007
@@ -341,13 +341,20 @@
 if ((i + j) >= len)
 x = 0;
 if (x > 0x20 && x < 0x7F) {
-*current++ = x;
+#ifdef USE_CHARSET_EBCDIC
+   *current = x;
+   jk_xlate_from_ascii(current, 1);
+  current++;
+#else
+   *current++ = x;
+#endif
 }
 else {
 *current++ = '.';
 }
 }
 *current++ = '\0';
+
 jk_log(l, file, line, funcname, level,
"%.4x%s", i, lb);
 }



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

svn commit: r529308 - /tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc

2007-04-16 Thread hgomez

Author: hgomez
Date: Mon Apr 16 09:17:22 2007
New Revision: 529308

URL: http://svn.apache.org/viewvc?view=rev&rev=529308
Log:
Build CL for i5/OS v5R4

Added:
tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc

Added: tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc?view=auto&rev=529308
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc (added)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc Mon Apr 16 
09:17:22 2007
@@ -0,0 +1,299 @@
+PGM
+CRTCMOD MODULE(MOD_JK/MOD_JK) +
+   SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
+   DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' + 
+  'USE_APACHE_MD5' '_REENTRANT') +
+   TEXT('mod_jk.c') +
+OPTIMIZE(40) +
+LOCALETYPE(*LOCALEUTF) +
+TGTCCSID(1208) +
+TERASPACE(*YES) +
+LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
+INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
+
+CRTCMOD MODULE(MOD_JK/JK_AJP_COM) +
+SRCSTMF('/home/apache/jk/native/common/jk_ajp_common.c') +
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+   'USE_APACHE_MD5' '_REENTRANT') +
+TEXT('jk_ajp_common.c') +
+OPTIMIZE(40) +
+LOCALETYPE(*LOCALEUTF) +
+TGTCCSID(1208) +
+TERASPACE(*YES) +
+LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
+INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
+
+CRTCMOD MODULE(MOD_JK/JK_AJP12_W) +
+SRCSTMF('/home/apache/jk/native/common/jk_ajp12_worker.c') +
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+   'USE_APACHE_MD5' '_REENTRANT') +
+TEXT('jk_ajp12_worker.c') +
+OPTIMIZE(40) +
+LOCALETYPE(*LOCALEUTF) +
+TGTCCSID(1208) +
+TERASPACE(*YES) +
+LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
+INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
+
+CRTCMOD MODULE(MOD_JK/JK_AJP13) +
+SRCSTMF('/home/apache/jk/native/common/jk_ajp13.c') +
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +   
+   'USE_APACHE_MD5' '_REENTRANT') +
+TEXT('jk_ajp13.c') +
+OPTIMIZE(40) +
+LOCALETYPE(*LOCALEUTF) +
+TGTCCSID(1208) +
+TERASPACE(*YES) +
+LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
+INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
+
+CRTCMOD MODULE(MOD_JK/JK_AJP13_W) +
+SRCSTMF('/home/apache/jk/native/common/jk_ajp13_worker.c') +
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+   'USE_APACHE_MD5' '_REENTRANT') +
+TEXT('jk_ajp13_worker.c') +
+OPTIMIZE(40) +
+LOCALETYPE(*LOCALEUTF) +
+TGTCCSID(1208) +
+TERASPACE(*YES) +
+LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
+INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
+
+CRTCMOD MODULE(MOD_JK/JK_AJP14) +
+SRCSTMF('/home/apache/jk/native/common/jk_ajp14.c') +
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+   'USE_APACHE_MD5' '_REENTRANT') +
+TEXT('jk_ajp14.c') +
+OPTIMIZE(40) +
+LOCALETYPE(*LOCALEUTF) +
+TGTCCSID(1208) +
+TERASPACE(*YES) +
+LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
+INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
+
+CRTCMOD MODULE(MOD_JK/JK_AJP14_W) +
+SRCSTMF('/home/apache/jk/native/common/jk_ajp14_worker.c') +
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+   'USE_APACHE_MD5' '_REENTRANT') +
+TEXT('jk_ajp14_worker.c') +
+OPTIMIZE(40) +
+LOCALETYPE(*LOCALEUTF) +
+TGTCCSID(1208) +
+TERASPACE(*YES) +
+LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
+INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
+
+CRTCMOD MODULE(MOD_JK/JK_CONNECT) +
+SRCSTMF('/home/apache/jk/native/common/jk_connect.c') +
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' &#x

svn commit: r529581 - /tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc

2007-04-17 Thread hgomez

Author: hgomez
Date: Tue Apr 17 05:42:35 2007
New Revision: 529581

URL: http://svn.apache.org/viewvc?view=rev&rev=529581
Log:
text file

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc   (contents, 
props changed)

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc?view=diff&rev=529581&r1=529580&r2=529581
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc Tue Apr 17 
05:42:35 2007
@@ -1,259 +1,259 @@
-PGM
-CRTCMOD MODULE(MOD_JK/MOD_JK) +
-   SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
-   DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-  'USE_APACHE_MD5' '_REENTRANT') +
-   TEXT('mod_jk.c') +
-OPTIMIZE(40) +
-LOCALETYPE(*LOCALEUTF) +
-TERASPACE(*YES) +
-TGTRLS(*CURRENT) +
-INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
-
-CRTCMOD MODULE(MOD_JK/JK_AJP_COM) +
-SRCSTMF('/home/apache/jk/native/common/jk_ajp_common.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_ajp_common.c') +
-OPTIMIZE(40) +
-LOCALETYPE(*LOCALEUTF) +
-TERASPACE(*YES) +
-TGTRLS(*CURRENT) +
-INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
-
-CRTCMOD MODULE(MOD_JK/JK_AJP12_W) +
-SRCSTMF('/home/apache/jk/native/common/jk_ajp12_worker.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_ajp12_worker.c') +
-OPTIMIZE(40) +
-LOCALETYPE(*LOCALEUTF) +
-TERASPACE(*YES) +
-TGTRLS(*CURRENT) +
-INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
-
-CRTCMOD MODULE(MOD_JK/JK_AJP13) +
-SRCSTMF('/home/apache/jk/native/common/jk_ajp13.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_ajp13.c') +
-OPTIMIZE(40) +
-LOCALETYPE(*LOCALEUTF) +
-TERASPACE(*YES) +
-TGTRLS(*CURRENT) +
-INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
-
-CRTCMOD MODULE(MOD_JK/JK_AJP13_W) +
-SRCSTMF('/home/apache/jk/native/common/jk_ajp13_worker.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_ajp13_worker.c') +
-OPTIMIZE(40) +
-LOCALETYPE(*LOCALEUTF) +
-TERASPACE(*YES) +
-TGTRLS(*CURRENT) +
-INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
-
-CRTCMOD MODULE(MOD_JK/JK_AJP14) +
-SRCSTMF('/home/apache/jk/native/common/jk_ajp14.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_ajp14.c') +
-OPTIMIZE(40) +
-LOCALETYPE(*LOCALEUTF) +
-TERASPACE(*YES) +
-TGTRLS(*CURRENT) +
-INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
-
-CRTCMOD MODULE(MOD_JK/JK_AJP14_W) +
-SRCSTMF('/home/apache/jk/native/common/jk_ajp14_worker.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_ajp14_worker.c') +
-OPTIMIZE(40) +
-LOCALETYPE(*LOCALEUTF) +
-TERASPACE(*YES) +
-TGTRLS(*CURRENT) +
-INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
-
-CRTCMOD MODULE(MOD_JK/JK_CONNECT) +
-SRCSTMF('/home/apache/jk/native/common/jk_connect.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5' '_REENTRANT' 'USE_SO_RCVTIMEO' +
-   'USE_SO_SNDTIMEO' ) +
-TEXT('jk_connect.c') +
-OPTIMIZE(40) +
-LOCALETYPE(*LOCALEUTF) +
-TERASPACE(*YES) +
-TGTRLS(*CURRENT) +
-INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
-
-CRTCMOD MODULE(MOD_JK/JK_CONTEXT) +
-SRCSTMF('/home/apache/jk/native/common/jk_context.c') +
-DEFINE('AS400'

svn commit: r529606 - /tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc

2007-04-17 Thread hgomez

Author: hgomez
Date: Tue Apr 17 07:00:22 2007
New Revision: 529606

URL: http://svn.apache.org/viewvc?view=rev&rev=529606
Log:
jk_connect need _XOPEN_SOURCE and EXTENDED to avoid cast errors at compile time

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc?view=diff&rev=529606&r1=529605&r2=529606
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc Tue Apr 17 
07:00:22 2007
@@ -78,13 +78,14 @@
 
 CRTCMOD MODULE(MOD_JK/JK_CONNECT) +
 SRCSTMF('/home/apache/jk/native/common/jk_connect.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' + '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT' 'USE_SO_RCVTIMEO' +
'USE_SO_SNDTIMEO' ) +
 TEXT('jk_connect.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
 TERASPACE(*YES) +
+LANGLVL(*EXTENDED) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 



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

svn commit: r529580 - /tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc

2007-04-17 Thread hgomez

Author: hgomez
Date: Tue Apr 17 05:40:00 2007
New Revision: 529580

URL: http://svn.apache.org/viewvc?view=rev&rev=529580
Log:
Build CL for i5/OS v5R4 (new try)

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc?view=diff&rev=529580&r1=529579&r2=529580
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc Tue Apr 17 
05:40:00 2007
@@ -1,131 +1,112 @@
 PGM
 CRTCMOD MODULE(MOD_JK/MOD_JK) +
SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
-   DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' + 
+   DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
   'USE_APACHE_MD5' '_REENTRANT') +
TEXT('mod_jk.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
-TGTCCSID(1208) +
 TERASPACE(*YES) +
-LANGLVL(*EXTENDED) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 
 CRTCMOD MODULE(MOD_JK/JK_AJP_COM) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp_common.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp_common.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
-TGTCCSID(1208) +
 TERASPACE(*YES) +
-LANGLVL(*EXTENDED) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 
 CRTCMOD MODULE(MOD_JK/JK_AJP12_W) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp12_worker.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp12_worker.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
-TGTCCSID(1208) +
 TERASPACE(*YES) +
-LANGLVL(*EXTENDED) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 
 CRTCMOD MODULE(MOD_JK/JK_AJP13) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp13.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +   
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp13.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
-TGTCCSID(1208) +
 TERASPACE(*YES) +
-LANGLVL(*EXTENDED) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 
 CRTCMOD MODULE(MOD_JK/JK_AJP13_W) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp13_worker.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp13_worker.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
-TGTCCSID(1208) +
 TERASPACE(*YES) +
-LANGLVL(*EXTENDED) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 
 CRTCMOD MODULE(MOD_JK/JK_AJP14) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp14.c') +
-DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp14.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
-TGTCCSID(1208) +
 TERASPACE(*YES) +
-LANGLVL(*EXTENDED) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 
 CRTCMOD MODULE(MOD_JK/JK_AJP14_W) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp14_worker.c') +
-DEFINE('AS400' 'AS400_UTF8' &#x

svn commit: r530674 - in /tomcat/connectors/trunk/jk: native/apache-2.0/ native/common/ xdocs/webserver_howto/

2007-04-20 Thread hgomez

Author: hgomez
Date: Fri Apr 20 00:24:47 2007
New Revision: 530674

URL: http://svn.apache.org/viewvc?view=rev&rev=530674
Log:
Works in progress for i5/OS V5R4 adaptation. Still need to fix the INIT stage

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c
tomcat/connectors/trunk/jk/native/common/jk_map.c
tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c
tomcat/connectors/trunk/jk/native/common/jk_msg_buff.h
tomcat/connectors/trunk/jk/native/common/jk_util.c
tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=530674&r1=530673&r2=530674
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Fri Apr 20 00:24:47 
2007
@@ -41,7 +41,7 @@
 #include "util_script.h"
 #include "ap_mpm.h"
 
-#ifdef AS400
+#if defined(AS400) && !defined(AS400_UTF8)
 #include "ap_charset.h"
 #include "util_charset.h"   /* ap_hdrs_from_ascii */
 #endif
@@ -294,7 +294,7 @@
 ap_set_content_type(r, tmp);
 }
 else if (!strcasecmp(header_names[h], "Location")) {
-#ifdef AS400
+#if defined(AS400) && !defined(AS400_UTF8)
 /* Fix escapes in Location Header URL */
 ap_fixup_escapes((char *)header_values[h],
  strlen(header_values[h]), ap_hdrs_from_ascii);
@@ -348,7 +348,7 @@
 }
 
 if (p->read_body_started) {
-#ifdef AS400
+#if defined(AS400) && !defined(AS400_UTF8)
 int long rv = OK;
 if (rv = ap_change_request_body_xlate(p->r, 65535, 65535)) {   
 /* turn off request body translation */
 ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_CRIT, 0, NULL,
@@ -374,7 +374,7 @@
 
 static void JK_METHOD ws_flush(jk_ws_service_t *s)
 {
-#ifndef AS400
+#if defined(AS400) && !defined(AS400_UTF8)
 if (s && s->ws_private) {
 apache_private_data_t *p = s->ws_private;
 ap_rflush(p->r);
@@ -400,7 +400,7 @@
 
 static int JK_METHOD ws_write(jk_ws_service_t *s, const void *b, unsigned int 
l)
 {
-#ifdef AS400
+#if defined(AS400) && !defined(AS400_UTF8)
 int rc;
 #endif
 
@@ -422,12 +422,12 @@
 }
 }
 if (p->r->header_only) {
-#ifndef AS400
+#if defined(AS400) && !defined(AS400_UTF8)
 ap_rflush(p->r);
 #endif
 return JK_TRUE;
 }
-#ifdef AS400
+#if defined(AS400) && !defined(AS400_UTF8)
 /* turn off response body translation */
 rc = ap_change_response_body_xlate(p->r, 65535, 65535);
 if (rc) {
@@ -593,7 +593,7 @@
 s->content_length = get_content_length(r);
 s->is_chunked = r->read_chunked;
 s->no_more_chunks = 0;
-#ifdef AS400
+#if defined(AS400) && !defined(AS400_UTF8)
 /* Get the query string that is not translated to EBCDIC  */
 s->query_string = ap_get_original_query_string(r);
 #else
@@ -2795,17 +2795,17 @@
 jk_server_conf_t *sconf = (jk_server_conf_t 
*)ap_get_module_config(srv->module_config,

&jk_module);
 /***
- * on iSeries, the web server is 'HTTP Powered by Apache 2', as such it 
differs from the regular 
+ * on iSeries, the web server is 'HTTP Powered by Apache 2', as such it 
differs from the regular
  * implementations found on others boxes.
- * 
+ *
  * One of this difference is that the life cycle seems different and we 
discovered that on such platform
  * we need to initialize the jk log with the plog instead of pconf.
- * 
- * We're waiting for more feedback from Rochester iSeries Labs... 
- * 
+ *
+ * We're waiting for more feedback from Rochester iSeries Labs...
+ *
  ***/
-  
-#ifdef AS400
+
+#if defined(AS400) && !defined(AS400_UTF8)
 if (open_jklog(srv, plog))
 #else
 if (open_jklog(srv, pconf))

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c?view=diff&rev=530674&r1=530673&r2=530674
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c Fri Apr 20 
00:

svn commit: r530690 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-04-20 Thread hgomez

Author: hgomez
Date: Fri Apr 20 01:21:58 2007
New Revision: 530690

URL: http://svn.apache.org/viewvc?view=rev&rev=530690
Log:
Recent version of i5/OS APR fix the missing export

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=530690&r1=530689&r2=530690
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Fri Apr 20 01:21:58 
2007
@@ -54,16 +54,10 @@
 
 /* deprecated with apr 0.9.3 */
 
-/*
-   The latest Apache 2.0.47 for iSeries didn't export apr_filepath_name_get
-   but apr_filename_of_pathname, even if includes seems right and the APR
-   in use is 0.9.4
-*/
-
 #include "apr_version.h"
 #if (APR_MAJOR_VERSION == 0) && \
 (APR_MINOR_VERSION <= 9) && \
-(APR_PATCH_VERSION < 3) || defined(AS400)
+(APR_PATCH_VERSION < 3)
 #define apr_filepath_name_get apr_filename_of_pathname
 #endif
 



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

svn commit: r530691 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-04-20 Thread hgomez

Author: hgomez
Date: Fri Apr 20 01:29:24 2007
New Revision: 530691

URL: http://svn.apache.org/viewvc?view=rev&rev=530691
Log:
Using pconf on i5/OS V5R4 didn't show more problems.

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=530691&r1=530690&r2=530691
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Fri Apr 20 01:29:24 
2007
@@ -2788,22 +2788,7 @@
 for (; srv; srv = srv->next) {
 jk_server_conf_t *sconf = (jk_server_conf_t 
*)ap_get_module_config(srv->module_config,

&jk_module);
-/***
- * on iSeries, the web server is 'HTTP Powered by Apache 2', as such it 
differs from the regular
- * implementations found on others boxes.
- *
- * One of this difference is that the life cycle seems different and we 
discovered that on such platform
- * we need to initialize the jk log with the plog instead of pconf.
- *
- * We're waiting for more feedback from Rochester iSeries Labs...
- *
- ***/
-
-#if defined(AS400) && !defined(AS400_UTF8)
-if (open_jklog(srv, plog))
-#else
 if (open_jklog(srv, pconf))
-#endif
 return HTTP_INTERNAL_SERVER_ERROR;
 if (sconf) {
 if (!uri_worker_map_alloc(&(sconf->uw_map),



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

svn commit: r531392 - in /tomcat/connectors/trunk/jk/native/common: jk_util.c jk_util.h

2007-04-23 Thread hgomez

Author: hgomez
Date: Mon Apr 23 02:20:32 2007
New Revision: 531392

URL: http://svn.apache.org/viewvc?view=rev&rev=531392
Log:
in i5/OS V5R4 all APR/Apache APIs are in UTF8 but the runtime apis like 
inet_addr() still need EBCDIC.
Add basic ASCII<->EBCDIC conversion

Modified:
tomcat/connectors/trunk/jk/native/common/jk_util.c
tomcat/connectors/trunk/jk/native/common/jk_util.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=531392&r1=531391&r2=531392
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Mon Apr 23 02:20:32 2007
@@ -1672,3 +1672,103 @@
 #endif /* AS400 */
 }
 #endif
+
+/***
+ * ASCII <-> EBCDIC conversions
+ *
+ * For now usefull only in i5/OS V5R4 where UTF and EBCDIC mode are mixed
+ */
+
+#if defined(AS400) && !defined(AS400_UTF8)
+
+/* EBCDIC to ASCII translation table */
+static u_char ebcdic_to_ascii[256] =
+{
+  0x00,0x01,0x02,0x03,0x20,0x09,0x20,0x7f, /* 00-07 */
+  0x20,0x20,0x20,0x0b,0x0c,0x0d,0x0e,0x0f, /* 08-0f */
+  0x10,0x11,0x12,0x13,0x20,0x0a,0x08,0x20, /* 10-17 */
+  0x18,0x19,0x20,0x20,0x20,0x1d,0x1e,0x1f, /* 18-1f */
+  0x20,0x20,0x1c,0x20,0x20,0x0a,0x17,0x1b, /* 20-27 */
+  0x20,0x20,0x20,0x20,0x20,0x05,0x06,0x07, /* 28-2f */
+  0x20,0x20,0x16,0x20,0x20,0x20,0x20,0x04, /* 30-37 */
+  0x20,0x20,0x20,0x20,0x14,0x15,0x20,0x1a, /* 38-3f */
+  0x20,0x20,0x83,0x84,0x85,0xa0,0xc6,0x86, /* 40-47 */
+  0x87,0xa4,0xbd,0x2e,0x3c,0x28,0x2b,0x7c, /* 48-4f */
+  0x26,0x82,0x88,0x89,0x8a,0xa1,0x8c,0x8b, /* 50-57 */
+  0x8d,0xe1,0x21,0x24,0x2a,0x29,0x3b,0xaa, /* 58-5f */
+  0x2d,0x2f,0xb6,0x8e,0xb7,0xb5,0xc7,0x8f, /* 60-67 */
+  0x80,0xa5,0xdd,0x2c,0x25,0x5f,0x3e,0x3f, /* 68-6f */
+  0x9b,0x90,0xd2,0xd3,0xd4,0xd6,0xd7,0xd8, /* 70-77 */
+  0xde,0x60,0x3a,0x23,0x40,0x27,0x3d,0x22, /* 78-7f */
+  0x9d,0x61,0x62,0x63,0x64,0x65,0x66,0x67, /* 80-87 */
+  0x68,0x69,0xae,0xaf,0xd0,0xec,0xe7,0xf1, /* 88-8f */
+  0xf8,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,0x70, /* 90-97 */
+  0x71,0x72,0xa6,0xa7,0x91,0xf7,0x92,0xcf, /* 98-9f */
+  0xe6,0x7e,0x73,0x74,0x75,0x76,0x77,0x78, /* a8-a7 */
+  0x79,0x7a,0xad,0xa8,0xd1,0xed,0xe8,0xa9, /* a8-af */
+  0x5e,0x9c,0xbe,0xfa,0xb8,0x15,0x14,0xac, /* b0-b7 */
+  0xab,0xf3,0x5b,0x5d,0xee,0xf9,0xef,0x9e, /* b8-bf */
+  0x7b,0x41,0x42,0x43,0x44,0x45,0x46,0x47, /* c0-c7 */
+  0x48,0x49,0xf0,0x93,0x94,0x95,0xa2,0xe4, /* c8-cf */
+  0x7d,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50, /* d0-d7 */
+  0x51,0x52,0xfb,0x96,0x81,0x97,0xa3,0x98, /* d8-df */
+  0x5c,0xf6,0x53,0x54,0x55,0x56,0x57,0x58, /* e0-e7 */
+  0x59,0x5a,0xfc,0xe2,0x99,0xe3,0xe0,0xe5, /* e8-ef */
+  0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37, /* f0-f7 */
+  0x38,0x39,0xfd,0xea,0x9a,0xeb,0xe9,0xff  /* f8-ff */
+};
+
+/* ASCII to EBCDIC translation table */
+static u_char ascii_to_ebcdic[256] =
+{
+  0x00,0x01,0x02,0x03,0x37,0x2d,0x2e,0x2f, /* 00-07 */
+  0x16,0x05,0x25,0x0b,0x0c,0x0d,0x0e,0x0f, /* 08-0f */
+  0x10,0x11,0x12,0x13,0x3c,0x3d,0x32,0x26, /* 10-17 */
+  0x18,0x19,0x3f,0x27,0x22,0x1d,0x1e,0x1f, /* 18-1f */
+  0x40,0x5a,0x7f,0x7b,0x5b,0x6c,0x50,0x7d, /* 20-27 */
+  0x4d,0x5d,0x5c,0x4e,0x6b,0x60,0x4b,0x61, /* 28-2f */
+  0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7, /* 30-37 */
+  0xf8,0xf9,0x7a,0x5e,0x4c,0x7e,0x6e,0x6f, /* 38-3f */
+  0x7c,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7, /* 40-47 */
+  0xc8,0xc9,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6, /* 48-4f */
+  0xd7,0xd8,0xd9,0xe2,0xe3,0xe4,0xe5,0xe6, /* 50-57 */
+  0xe7,0xe8,0xe9,0xba,0xe0,0xbb,0xb0,0x6d, /* 58-5f */
+  0x79,0x81,0x82,0x83,0x84,0x85,0x86,0x87, /* 60-67 */
+  0x88,0x89,0x91,0x92,0x93,0x94,0x95,0x96, /* 68-6f */
+  0x97,0x98,0x99,0xa2,0xa3,0xa4,0xa5,0xa6, /* 70-77 */
+  0xa7,0xa8,0xa9,0xc0,0x4f,0xd0,0xa1,0x07, /* 78-7f */
+  0x68,0xdc,0x51,0x42,0x43,0x44,0x47,0x48, /* 80-87 */
+  0x52,0x53,0x54,0x57,0x56,0x58,0x63,0x67, /* 88-8f */
+  0x71,0x9c,0x9e,0xcb,0xcc,0xcd,0xdb,0xdd, /* 90-97 */
+  0xdf,0xec,0xfc,0x70,0xb1,0x80,0xbf,0x40, /* 98-9f */
+  0x45,0x55,0xee,0xde,0x49,0x69,0x9a,0x9b, /* a8-a7 */
+  0xab,0xaf,0x5f,0xb8,0xb7,0xaa,0x8a,0x8b, /* a8-af */
+  0x40,0x40,0x40,0x40,0x40,0x65,0x62,0x64, /* b0-b7 */
+  0xb4,0x40,0x40,0x40,0x40,0x4a,0xb2,0x40, /* b8-bf */
+  0x40,0x40,0x40,0x40,0x40,0x40,0x46,0x66, /* c0-c7 */
+  0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x9f, /* c8-cf */
+  0x8c,0xac,0x72,0x73,0x74,0x89,0x75,0x76, /* d0-d7 */
+  0x77,0x40,0x40,0x40,0x40,0x6a,0x78,0x40, /* d8-df */
+  0xee,0x59,0xeb,0xed,0xcf,0xef,0xa0,0x8e, /* e0-e7 */
+  0xae,0xfe,0xfb,0xfd,0x8d,0xad,0xbc,0xbe, /* e8-ef */
+  0xca,0x8f,0x40,0xb9,0xb6,0xb5,0xe1,0x9d, /* f0-f7 */
+  0x90,0xbd,0xb3,0xda,0xea,0xfa,0x40,0x40  /* f8-ff */
+};
+
+void jk_ascii2ebcdic(char *ptr) {
+char c;
+
+while ((c = *ptr) != 0) {
+*ptr++ = ascii_to_ebcdic[(unsigned int)c];
+}
+}
+
+void jk_ebcdic2ascii(ch

svn commit: r531393 - /tomcat/connectors/trunk/jk/native/common/jk_connect.c

2007-04-23 Thread hgomez

Author: hgomez
Date: Mon Apr 23 02:24:21 2007
New Revision: 531393

URL: http://svn.apache.org/viewvc?view=rev&rev=531393
Log:
Convert datas to EBCDIC before calling inet_addr on i5/OS V5R4

Modified:
tomcat/connectors/trunk/jk/native/common/jk_connect.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_connect.c?view=diff&rev=531393&r1=531392&r2=531393
==
--- tomcat/connectors/trunk/jk/native/common/jk_connect.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_connect.c Mon Apr 23 02:24:21 
2007
@@ -270,6 +270,11 @@
 return JK_FALSE;
 
 apr_sockaddr_ip_get(&remote_ipaddr, remote_sa);
+
+   /* i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE 
works in UTF */
+#if defined(AS400) && !defined(AS400_UTF8)
+jk_ascii2ebcdic(remote_ipaddr);
+#endif
 laddr.s_addr = inet_addr(remote_ipaddr);
 
 #else /* HAVE_APR */
@@ -290,6 +295,10 @@
 #endif /* HAVE_APR */
 }
 else {
+   /* i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE 
works in UTF */
+#if defined(AS400) && !defined(AS400_UTF8)
+jk_ascii2ebcdic(remote_ipaddr);
+#endif
 /* If we found only digits we use inet_addr() */
 laddr.s_addr = inet_addr(host);
 }
@@ -635,12 +644,12 @@
 /* Wait one microsecond */
 tv.tv_sec  = 0;
 tv.tv_usec = 1;
-
+
 do {
 rc = select((int)sock + 1, &fd, NULL, NULL, &tv);
 #if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
 errno = WSAGetLastError() - WSABASEERR;
-#endif
+#endif
 } while (rc == -1 && errno == EINTR);
 
 if (rc == 0) {
@@ -663,7 +672,7 @@
 if (ioctl(sock, FIONREAD, (void*)&nr) == 0) {
 return nr == 0 ? 0 : 1;
 }
-#endif
+#endif
 }
 
 return 0;



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

svn commit: r531403 - /tomcat/connectors/trunk/jk/native/common/jk_global.h

2007-04-23 Thread hgomez

Author: hgomez
Date: Mon Apr 23 02:58:59 2007
New Revision: 531403

URL: http://svn.apache.org/viewvc?view=rev&rev=531403
Log:
in i5/OS V5R4 Apache is no more using EBCDIC encoding

Modified:
tomcat/connectors/trunk/jk/native/common/jk_global.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?view=diff&rev=531403&r1=531402&r2=531403
==
--- tomcat/connectors/trunk/jk/native/common/jk_global.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_global.h Mon Apr 23 02:58:59 
2007
@@ -108,7 +108,7 @@
 #define NOIME
 #endif
 #include 
-/* 
+/*
  * Add a _very_few_ declarations missing from the restricted set of headers
  * (If this list becomes extensive, re-enable the required headers above!)
  * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now
@@ -276,6 +276,13 @@
 #endif  /* CHARSET_EBCDIC */
 
 #endif  /* APR_CHARSET_EBCDIC */
+
+/* on i5/OS V5R4 HTTP/APR APIs and Datas are in UTF */
+#if defined(AS400_UTF8)
+#undef USE_CHARSET_EBCDIC
+#define jk_xlate_to_ascii(b, l) /* NOOP */
+#define jk_xlate_from_ascii(b, l)   /* NOOP */
+#endif
 
 /* jk_uint32_t defines a four byte word */
 /* jk_uint64_t defines a eight byte word */



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

svn commit: r531424 - in /tomcat/connectors/trunk/jk/native/common: jk_connect.c jk_util.c jk_util.h

2007-04-23 Thread hgomez

Author: hgomez
Date: Mon Apr 23 03:54:19 2007
New Revision: 531424

URL: http://svn.apache.org/viewvc?view=rev&rev=531424
Log:
Oups fix define

Modified:
tomcat/connectors/trunk/jk/native/common/jk_connect.c
tomcat/connectors/trunk/jk/native/common/jk_util.c
tomcat/connectors/trunk/jk/native/common/jk_util.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_connect.c?view=diff&rev=531424&r1=531423&r2=531424
==
--- tomcat/connectors/trunk/jk/native/common/jk_connect.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_connect.c Mon Apr 23 03:54:19 
2007
@@ -272,7 +272,7 @@
 apr_sockaddr_ip_get(&remote_ipaddr, remote_sa);
 
/* i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE 
works in UTF */
-#if defined(AS400) && !defined(AS400_UTF8)
+#ifdef AS400_UTF8
 jk_ascii2ebcdic(remote_ipaddr);
 #endif
 laddr.s_addr = inet_addr(remote_ipaddr);
@@ -296,7 +296,7 @@
 }
 else {
/* i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE 
works in UTF */
-#if defined(AS400) && !defined(AS400_UTF8)
+#ifdef AS400_UTF8
 jk_ascii2ebcdic(remote_ipaddr);
 #endif
 /* If we found only digits we use inet_addr() */

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=531424&r1=531423&r2=531424
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Mon Apr 23 03:54:19 2007
@@ -1679,7 +1679,7 @@
  * For now usefull only in i5/OS V5R4 where UTF and EBCDIC mode are mixed
  */
 
-#if defined(AS400) && !defined(AS400_UTF8)
+#ifdef AS400_UTF8
 
 /* EBCDIC to ASCII translation table */
 static u_char ebcdic_to_ascii[256] =

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.h?view=diff&rev=531424&r1=531423&r2=531424
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.h Mon Apr 23 03:54:19 2007
@@ -211,7 +211,7 @@
 #define TC41_BRIDGE_TYPE41
 #define TC50_BRIDGE_TYPE50
 
-#if defined(AS400) && !defined(AS400_UTF8)
+#ifdef AS400_UTF8
 void jk_ascii2ebcdic(char *ptr);
 void jk_ebcdic2ascii(char *ptr);
 #endif



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

svn commit: r531426 - /tomcat/connectors/trunk/jk/native/common/jk_connect.c

2007-04-23 Thread hgomez

Author: hgomez
Date: Mon Apr 23 03:56:31 2007
New Revision: 531426

URL: http://svn.apache.org/viewvc?view=rev&rev=531426
Log:
Reoups

Modified:
tomcat/connectors/trunk/jk/native/common/jk_connect.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_connect.c?view=diff&rev=531426&r1=531425&r2=531426
==
--- tomcat/connectors/trunk/jk/native/common/jk_connect.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_connect.c Mon Apr 23 03:56:31 
2007
@@ -297,7 +297,7 @@
 else {
/* i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE 
works in UTF */
 #ifdef AS400_UTF8
-jk_ascii2ebcdic(remote_ipaddr);
+jk_ascii2ebcdic((char *)host);
 #endif
 /* If we found only digits we use inet_addr() */
 laddr.s_addr = inet_addr(host);



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

svn commit: r531454 - in /tomcat/connectors/trunk/jk/native: apache-2.0/mod_jk.c common/jk_global.h

2007-04-23 Thread hgomez

Author: hgomez
Date: Mon Apr 23 05:54:40 2007
New Revision: 531454

URL: http://svn.apache.org/viewvc?view=rev&rev=531454
Log:
i5/OS need to use apr string compare call instead of EBCDIC one

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_global.h

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=531454&r1=531453&r2=531454
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Apr 23 05:54:40 
2007
@@ -973,6 +973,11 @@
 if (conf->worker_file == NULL)
 return "JkWorkersFile file name invalid";
 
+   /* i5/OS need worker_file name in EBCDIC */
+#if defined(AS400_UTF8)
+jk_ascii2ebcdic(conf->worker_file);
+#endif
+
 if (stat(conf->worker_file, &statbuf) == -1)
 return "Can't find the workers file specified";
 
@@ -1000,6 +1005,11 @@
 
 if (conf->mount_file == NULL)
 return "JkMountFile file name invalid";
+
+   /* i5/OS need mount_file name in EBCDIC */
+#if defined(AS400_UTF8)
+jk_ascii2ebcdic(conf->mount_file);
+#endif
 
 if (stat(conf->mount_file, &statbuf) == -1)
 return "Can't find the mount file specified";

Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?view=diff&rev=531454&r1=531453&r2=531454
==
--- tomcat/connectors/trunk/jk/native/common/jk_global.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_global.h Mon Apr 23 05:54:40 
2007
@@ -354,6 +354,10 @@
 #define JK_INVALID_SOCKET  (-1)
 #endif
 
+#ifdef AS400_UTF8
+#define strcasecmp(a,b) apr_strnatcasecmp(a,b)
+#endif
+
 #ifdef __cplusplus
 }
 #endif  /* __cplusplus */



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

svn commit: r531467 - /tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc

2007-04-23 Thread hgomez

Author: hgomez
Date: Mon Apr 23 06:56:53 2007
New Revision: 531467

URL: http://svn.apache.org/viewvc?view=rev&rev=531467
Log:
Restore the *IFSIO compile flag

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc?view=diff&rev=531467&r1=531466&r2=531467
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc Mon Apr 23 
06:56:53 2007
@@ -2,10 +2,12 @@
 CRTCMOD MODULE(MOD_JK/MOD_JK) +
SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-  'USE_APACHE_MD5' '_REENTRANT') +
+   '_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('mod_jk.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
+SYSIFCOPT(*IFSIO) +
+LANGLVL(*EXTENDED) +
 TERASPACE(*YES) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
@@ -13,10 +15,12 @@
 CRTCMOD MODULE(MOD_JK/JK_AJP_COM) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp_common.c') +
 DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5' '_REENTRANT') +
+   '_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp_common.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
+SYSIFCOPT(*IFSIO) +
+LANGLVL(*EXTENDED) +
 TERASPACE(*YES) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
@@ -24,10 +28,12 @@
 CRTCMOD MODULE(MOD_JK/JK_AJP12_W) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp12_worker.c') +
 DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5' '_REENTRANT') +
+   '_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp12_worker.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
+SYSIFCOPT(*IFSIO) +
+LANGLVL(*EXTENDED) +
 TERASPACE(*YES) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
@@ -35,10 +41,12 @@
 CRTCMOD MODULE(MOD_JK/JK_AJP13) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp13.c') +
 DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5' '_REENTRANT') +
+   '_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp13.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
+SYSIFCOPT(*IFSIO) +
+LANGLVL(*EXTENDED) +
 TERASPACE(*YES) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
@@ -46,10 +54,12 @@
 CRTCMOD MODULE(MOD_JK/JK_AJP13_W) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp13_worker.c') +
 DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5' '_REENTRANT') +
+   '_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp13_worker.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
+SYSIFCOPT(*IFSIO) +
+LANGLVL(*EXTENDED) +
 TERASPACE(*YES) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
@@ -57,10 +67,12 @@
 CRTCMOD MODULE(MOD_JK/JK_AJP14) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp14.c') +
 DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5' '_REENTRANT') +
+   '_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp14.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
+SYSIFCOPT(*IFSIO) +
+LANGLVL(*EXTENDED) +
 TERASPACE(*YES) +
 TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
@@ -68,34 +80,39 @@
 CRTCMOD MODULE(MOD_JK/JK_AJP14_W) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp14_worker.c') +
 DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   'USE_APACHE_MD5&#

svn commit: r531493 - in /tomcat/connectors/trunk/jk/native/common: jk_connect.c jk_map.c jk_util.c jk_util.h

2007-04-23 Thread hgomez

Author: hgomez
Date: Mon Apr 23 08:09:32 2007
New Revision: 531493

URL: http://svn.apache.org/viewvc?view=rev&rev=531493
Log:
More fix for ASCII/EBCDIC fun in i5/OS V5R4

Modified:
tomcat/connectors/trunk/jk/native/common/jk_connect.c
tomcat/connectors/trunk/jk/native/common/jk_map.c
tomcat/connectors/trunk/jk/native/common/jk_util.c
tomcat/connectors/trunk/jk/native/common/jk_util.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_connect.c?view=diff&rev=531493&r1=531492&r2=531493
==
--- tomcat/connectors/trunk/jk/native/common/jk_connect.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_connect.c Mon Apr 23 08:09:32 
2007
@@ -273,7 +273,7 @@
 
/* i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE 
works in UTF */
 #ifdef AS400_UTF8
-jk_ascii2ebcdic(remote_ipaddr);
+jk_ascii2ebcdic(remote_ipaddr, remote_ipaddr);
 #endif
 laddr.s_addr = inet_addr(remote_ipaddr);
 
@@ -297,7 +297,7 @@
 else {
/* i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE 
works in UTF */
 #ifdef AS400_UTF8
-jk_ascii2ebcdic((char *)host);
+jk_ascii2ebcdic((char *)host, (char *)host);
 #endif
 /* If we found only digits we use inet_addr() */
 laddr.s_addr = inet_addr(host);

Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?view=diff&rev=531493&r1=531492&r2=531493
==
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Mon Apr 23 08:09:32 2007
@@ -485,7 +485,7 @@
 if (m && f) {
 struct stat statbuf;
 FILE *fp;
-if ((rc = stat(f, &statbuf)) == -1)
+if (jk_file_exists(f) != JK_TRUE)
 return JK_FALSE;
 #if defined(AS400) && !defined(AS400_UTF8)
 fp = fopen(f, "r, o_ccsid=0");

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=531493&r1=531492&r2=531493
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Mon Apr 23 08:09:32 2007
@@ -1392,16 +1392,43 @@
 
 int jk_file_exists(const char *f)
 {
+  int   rc;
+  char *ptr;
+
 if (f) {
 struct stat st;
+
 #ifdef AS400
-if ((0 == stat(f, &st)) && (st.st_mode & _S_IFREG)) {
-#else
-if ((0 == stat(f, &st)) && (st.st_mode & S_IFREG)) {
-#endif
-return JK_TRUE;
-}
+
+/**
+ * i5/OS V5R4 expect filename in ASCII for fopen but required them in EBCDIC 
for stat()
+ */
+#ifdef AS400_UTF8
+
+   ptr = (char *)malloc(strlen(f) + 1);
+   jk_ascii2ebcdic((char *)f, ptr);
+   rc = stat(ptr, &st);
+   free(ptr);
+
+if ((0 == rc) && (st.st_mode & _S_IFREG))
+   return JK_TRUE;
+
+#else /* AS400_UTF8 */
+
+if ((0 == stat(f, &st)) && (st.st_mode & _S_IFREG))
+   return JK_TRUE;
+
+#endif /* AS400_UTF8 */
+
+#else /* AS400 */
+
+if ((0 == stat(f, &st)) && (st.st_mode & S_IFREG))
+   return JK_TRUE;
+
+#endif /* AS400 */
+
 }
+
 return JK_FALSE;
 }
 
@@ -1755,20 +1782,25 @@
   0x90,0xbd,0xb3,0xda,0xea,0xfa,0x40,0x40  /* f8-ff */
 };
 
-void jk_ascii2ebcdic(char *ptr) {
+void jk_ascii2ebcdic(char *src, char *dst) {
 char c;
 
-while ((c = *ptr) != 0) {
-*ptr++ = ascii_to_ebcdic[(unsigned int)c];
+while ((c = *src++) != 0) {
+*dst++ = ascii_to_ebcdic[(unsigned int)c];
 }
+
+*dst = 0;
 }
 
-void jk_ebcdic2ascii(char *ptr) {
+void jk_ebcdic2ascii(char *src, char *dst) {
 char c;
 
-while ((c = *ptr) != 0) {
-*ptr++ = ebcdic_to_ascii[(unsigned int)c];
+while ((c = *src++) != 0) {
+*dst++ = ebcdic_to_ascii[(unsigned int)c];
 }
+
+*dst = 0;
 }
+
 #endif
 

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.h?view=diff&rev=531493&r1=531492&r2=531493
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.h Mon Apr 23 08:09:32 2007
@@ -212,8 +212,8 @@
 #define TC50_BRIDGE_TYPE50
 
 #ifdef AS400_UTF8
-void jk_ascii2ebcdic(cha

svn commit: r531494 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-04-23 Thread hgomez

Author: hgomez
Date: Mon Apr 23 08:10:13 2007
New Revision: 531494

URL: http://svn.apache.org/viewvc?view=rev&rev=531494
Log:
More fix for ASCII/EBCDIC fun in i5/OS V5R4

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=531494&r1=531493&r2=531494
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Apr 23 08:10:13 
2007
@@ -973,12 +973,7 @@
 if (conf->worker_file == NULL)
 return "JkWorkersFile file name invalid";
 
-   /* i5/OS need worker_file name in EBCDIC */
-#if defined(AS400_UTF8)
-jk_ascii2ebcdic(conf->worker_file);
-#endif
-
-if (stat(conf->worker_file, &statbuf) == -1)
+if (jk_file_exists(conf->worker_file) != JK_TRUE)
 return "Can't find the workers file specified";
 
 return NULL;
@@ -1006,12 +1001,7 @@
 if (conf->mount_file == NULL)
 return "JkMountFile file name invalid";
 
-   /* i5/OS need mount_file name in EBCDIC */
-#if defined(AS400_UTF8)
-jk_ascii2ebcdic(conf->mount_file);
-#endif
-
-if (stat(conf->mount_file, &statbuf) == -1)
+if (jk_file_exists(conf->mount_file) != JK_TRUE)
 return "Can't find the mount file specified";
 
 return NULL;



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

svn commit: r531811 - /tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 00:53:59 2007
New Revision: 531811

URL: http://svn.apache.org/viewvc?view=rev&rev=531811
Log:
Update changelog with works in progress on i5/OS V5R4 port

Modified:
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=531811&r1=531810&r2=531811
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Tue Apr 24 
00:53:59 2007
@@ -9,6 +9,7 @@
   
 Mladen Turk
 Rainer Jung
+Henri Gomez
 Changelog
   
 
@@ -21,6 +22,19 @@
   It should contain fixes made only after November 10th 2004, when the
   new documentation project for JK was started.
   
+
+
+  
+  
+
+  
+  i5/OS (AS/400) V5R4 port where Apache 2.0 modules should now use UTF8. 
(hgomez)
+  
+  
+  Docs: Add comments on i5/OS build for V5R4 and previous releases. 
(hgomez)
+  
+
+  
 
 
   



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

svn commit: r531812 - /tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 00:54:36 2007
New Revision: 531812

URL: http://svn.apache.org/viewvc?view=rev&rev=531812
Log:
Update documentation on i5/OS builds

Modified:
tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml

Modified: tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml?view=diff&rev=531812&r1=531811&r2=531812
==
--- tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml Tue Apr 24 
00:54:36 2007
@@ -206,7 +206,7 @@
 
 
 mod_jk.xxx - The Apache module, depending on your operating system, it 
will be mod_jk.so, mod_jk.nlm or
-or QZTCJK.SRVPGM (see the build section).
+or MOD_JK.SRVPGM (see the build section).
 
 
 workers.properties - A file that describes the host(s) and port(s) used 
by the workers (Tomcat processes).
@@ -1060,7 +1060,7 @@
 
 
 Create mod_jk library
-CRTLIB MOD_JK TEXT(Apache mod_jk tomcat connector 
module)
+CRTLIB MOD_JK TEXT(Apache mod'jk tomcat connector 
module')
 Create service program source file
 CRTSRCPF MOD_JK/QSRVSRC TEXT(Service program source 
file)
 Create the CL build program source file
@@ -1081,16 +1081,28 @@
 
 
 
-You could start to build all the modules of mod_jk :
+You could start to build all the modules of mod_jk (cases for V5R4 or previous 
releases):
 
 
-Copy the CL build program source from IFS
+Copy the CL build program source for i5/OS before V5R4 from IFS
 CPYFRMSTMF 
FROMSTMF('/home/apache/jk/native/apache-2.0/bldjk.qclsrc') +
 TOMBR('/QSYS.LIB/MOD_JK.LIB/QCLSRC.FILE/BLDJK.MBR') 
MBROPT(*REPLACE)
 Build the CL build program
 CRTCLPGM PGM(MOD_JK/BLDJK) SRCFILE(MOD_JK/QCLSRC) TEXT('Apache 
mod_jk build program')
 Launch the build
 CALL MOD_JK/BLDJK
+If the build if successfull, copy the new mod_jk module
+CRTDUPOBJ OBJ(MOD_JK) FROMLIB(MOD_JK) OBJTYPE(*SRVPGM) 
TOLIB(QHTTPSVR) NEWOBJ(MOD_JK)
+
+
+
+Copy the CL build program source for i5/OS V5R4 from IFS
+CPYFRMSTMF 
FROMSTMF('/home/apache/jk/native/apache-2.0/bldjk54.qclsrc') +
+TOMBR('/QSYS.LIB/MOD_JK.LIB/QCLSRC.FILE/BLDJK54.MBR') 
MBROPT(*REPLACE)
+Build the CL build program for i5/OS V5R4
+CRTCLPGM PGM(MOD_JK/BLDJK54) SRCFILE(MOD_JK/QCLSRC) TEXT('Apache 
mod_jk build program') TGTRLS(*CURRENT)
+Launch the build for i5/OS V5R4
+CALL MOD_JK/BLDJK54
 If the build if successfull, copy the new mod_jk module
 CRTDUPOBJ OBJ(MOD_JK) FROMLIB(MOD_JK) OBJTYPE(*SRVPGM) 
TOLIB(QHTTPSVR) NEWOBJ(MOD_JK)
 



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

svn commit: r531813 - /tomcat/connectors/trunk/jk/native/common/jk_map.c

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 00:57:36 2007
New Revision: 531813

URL: http://svn.apache.org/viewvc?view=rev&rev=531813
Log:
Not more need for AS400 #ifdef since it use _REETRANT. Also make use of 
file_exists() instead of stat

Modified:
tomcat/connectors/trunk/jk/native/common/jk_map.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?view=diff&rev=531813&r1=531812&r2=531813
==
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Tue Apr 24 00:57:36 2007
@@ -249,7 +249,7 @@
 const char *l = jk_map_get_string(m, name, def);
 char **ar = NULL;
 
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
 char *lasts;
 #endif
 
@@ -269,7 +269,7 @@
  * GS, in addition to VG's patch, we now need to
  * strtok also by a "*"
  */
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
 for (p = strtok_r(v, " \t,", &lasts);
  p; p = strtok_r(NULL, " \t,", &lasts))
 #else
@@ -305,7 +305,7 @@
 {
 const char *l = jk_map_get_string(m, name, def);
 
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
 char *lasts;
 #endif
 
@@ -326,7 +326,7 @@
  * GS, in addition to VG's patch, we now need to
  * strtok also by a "*"
  */
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
 for (p = strtok_r(v, " \t,", &lasts);
  p; p = strtok_r(NULL, " \t,", &lasts))
 #else
@@ -849,9 +849,8 @@
 int rc = JK_FALSE;
 
 if (m && f) {
-struct stat statbuf;
 FILE *fp;
-if ((rc = stat(f, &statbuf)) == -1)
+if (jk_file_exists(f) != JK_TRUE)
 return JK_FALSE;
 #if defined(AS400) && !defined(AS400_UTF8)
 fp = fopen(f, "r, o_ccsid=0");



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

svn commit: r531814 - /tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 00:58:44 2007
New Revision: 531814

URL: http://svn.apache.org/viewvc?view=rev&rev=531814
Log:
Not more need for AS400 #ifdef since it use _REENTRANT.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c?view=diff&rev=531814&r1=531813&r2=531814
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c Tue Apr 24 
00:58:44 2007
@@ -518,7 +518,7 @@
 char *line = NULL;
 char *name = NULL;
 char *value = NULL;
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
 char *lasts;
 #endif
 
@@ -566,7 +566,7 @@
 jk_log(l, JK_LOG_DEBUG, "ajpv12_handle_response, read %s=%s", name,
value);
 if (0 == strcmp("Status", name)) {
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
 char *numeric = strtok_r(value, " \t", &lasts);
 #else
 char *numeric = strtok(value, " \t");
@@ -578,7 +578,7 @@
"ajpv12_handle_response, invalid status code");
 return JK_FALSE;
 }
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
 reason = jk_pool_strdup(s->pool, strtok_r(NULL, " \t", &lasts));
 #else
 reason = jk_pool_strdup(s->pool, strtok(NULL, " \t"));



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

svn commit: r531815 - in /tomcat/connectors/trunk/jk/native/common: jk_util.c jk_util.h

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 01:00:07 2007
New Revision: 531815

URL: http://svn.apache.org/viewvc?view=rev&rev=531815
Log:
define jk_stat(). On i5/OS the jk_stat will do the ASCII->EBCDIC conversion and 
next call stat().
On others platform jk_stat is just stat

Modified:
tomcat/connectors/trunk/jk/native/common/jk_util.c
tomcat/connectors/trunk/jk/native/common/jk_util.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=531815&r1=531814&r2=531815
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Tue Apr 24 01:00:07 2007
@@ -525,7 +525,15 @@
 used = usable_size;
 }
 buf[used] = 0;
+
+/*
+ * MCH errors encountered on i5/OS (V5R3/V5R4) when using jk_logger, use the 
JOBLOB QPRINT instead for now
+ */
+#ifdef AS400
+   printf("%s\n", buf);
+#else
 l->log(l, level, buf);
+#endif
 #ifdef NETWARE
 free(buf);
 #endif
@@ -1390,43 +1398,33 @@
 }
 
 
-int jk_file_exists(const char *f)
-{
-  int   rc;
-  char *ptr;
-
-if (f) {
-struct stat st;
-
-#ifdef AS400
-
 /**
  * i5/OS V5R4 expect filename in ASCII for fopen but required them in EBCDIC 
for stat()
  */
 #ifdef AS400_UTF8
 
-   ptr = (char *)malloc(strlen(f) + 1);
-   jk_ascii2ebcdic((char *)f, ptr);
-   rc = stat(ptr, &st);
-   free(ptr);
-
-if ((0 == rc) && (st.st_mode & _S_IFREG))
-   return JK_TRUE;
+int jk_stat(const char *f, struct stat * statbuf)
+{
+   char *ptr;
+   int rc;
 
-#else /* AS400_UTF8 */
+   ptr = (char *)malloc(strlen(f) + 1);
+   jk_ascii2ebcdic((char *)f, ptr);
+   rc = stat(ptr, statbuf);
+   free(ptr);
 
-if ((0 == stat(f, &st)) && (st.st_mode & _S_IFREG))
-   return JK_TRUE;
+   return (rc);
+}
 
-#endif /* AS400_UTF8 */
+#endif
 
-#else /* AS400 */
+int jk_file_exists(const char *f)
+{
+if (f) {
+struct stat st;
 
-if ((0 == stat(f, &st)) && (st.st_mode & S_IFREG))
+if ((0 == jk_stat(f, &st)) && (st.st_mode & S_IFREG))
return JK_TRUE;
-
-#endif /* AS400 */
-
 }
 
 return JK_FALSE;
@@ -1582,7 +1580,7 @@
 char **jk_parse_sysprops(jk_pool_t *p, const char *sysprops)
 {
 char **rc = NULL;
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
 char *lasts;
 #endif
 
@@ -1600,7 +1598,7 @@
 rc = jk_pool_alloc(p, (num_of_prps + 1) * sizeof(char *));
 if (rc) {
 unsigned i = 0;
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
 char *tmp = strtok_r(prps, "*", &lasts);
 #else
 char *tmp = strtok(prps, "*");
@@ -1608,7 +1606,7 @@
 
 while (tmp && i < num_of_prps) {
 rc[i] = tmp;
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
 tmp = strtok_r(NULL, "*", &lasts);
 #else
 tmp = strtok(NULL, "*");

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.h?view=diff&rev=531815&r1=531814&r2=531815
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.h Tue Apr 24 01:00:07 2007
@@ -211,10 +211,26 @@
 #define TC41_BRIDGE_TYPE41
 #define TC50_BRIDGE_TYPE50
 
+#ifdef AS400
+
+#define S_IFREG _S_IFREG
+
 #ifdef AS400_UTF8
+
 void jk_ascii2ebcdic(char *src, char *dst);
 void jk_ebcdic2ascii(char *src, char *dst);
+
+/* i5/OS V5R4 need ASCII-EBCDIC conversion before stat() call */
+int jk_stat(const char *f, struct stat * statbuf);
+
+#else /* AS400_UTF8 */
+
+#define jk_stat(a, b) stat(a, b)
+
+#endif /* AS400_UTF8 */
+
 #endif
+
 
 #ifdef __cplusplus
 extern "C"



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

svn commit: r531816 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 01:00:50 2007
New Revision: 531816

URL: http://svn.apache.org/viewvc?view=rev&rev=531816
Log:
Not more need for AS400 #ifdef since it use _REENTRANT.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=531816&r1=531815&r2=531816
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Tue Apr 24 01:00:50 
2007
@@ -917,7 +917,7 @@
 {
 jk_map_t *m;
 status_worker_t *w = p->worker;
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
 char *lasts;
 #endif
 char *param;
@@ -949,7 +949,7 @@
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
 for (param = strtok_r(query, "&", &lasts);
  param; param = strtok_r(NULL, "&", &lasts)) {
 #else
@@ -2437,7 +2437,7 @@
 int mime;
 const char *arg;
 unsigned int hide_legend;
-
+
 JK_TRACE_ENTER(l);
 status_get_string(p, JK_STATUS_ARG_MIME, NULL, &arg, l);
 mime = status_mime_int(arg);



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

svn commit: r531817 - /tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 01:01:29 2007
New Revision: 531817

URL: http://svn.apache.org/viewvc?view=rev&rev=531817
Log:
Make use of jk_stat()

Modified:
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?view=diff&rev=531817&r1=531816&r2=531817
==
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Tue Apr 24 
01:01:29 2007
@@ -715,7 +715,7 @@
 if (uw_map->reload > 0 && difftime(now, uw_map->checked) > uw_map->reload) 
{
 struct stat statbuf;
 uw_map->checked = now;
-if ((rc = stat(uw_map->fname, &statbuf)) == -1) {
+if ((rc = jk_stat(uw_map->fname, &statbuf)) == -1) {
 jk_log(l, JK_LOG_ERROR,
"Unable to stat the %s (errno=%d)",
uw_map->fname, errno);



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

svn commit: r531819 - in /tomcat/connectors/trunk/jk/native/common: jk_connect.c jk_connect.h

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 01:02:47 2007
New Revision: 531819

URL: http://svn.apache.org/viewvc?view=rev&rev=531819
Log:
Define a jk_inet_addr. On i5/OS jk_inet_addr make ASCII-EBCDIC conversion then 
call inet_addr.
On other platform jk_inet_addr = inet_addr

Modified:
tomcat/connectors/trunk/jk/native/common/jk_connect.c
tomcat/connectors/trunk/jk/native/common/jk_connect.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_connect.c?view=diff&rev=531819&r1=531818&r2=531819
==
--- tomcat/connectors/trunk/jk/native/common/jk_connect.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_connect.c Tue Apr 24 01:02:47 
2007
@@ -222,6 +222,27 @@
 }
 #endif
 
+
+#ifdef AS400_UTF8
+
+/*
+ *  i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE works in UTF
+ */
+in_addr_t jk_inet_addr(const char * addrstr)
+{
+   in_addr_t addr;
+   char *ptr;
+
+   ptr = (char *)malloc(strlen(addrstr) + 1);
+   jk_ascii2ebcdic((char *)addrstr, ptr);
+   addr = inet_addr(ptr);
+   free(ptr);
+
+   return(addr);
+}
+
+#endif
+
 /** resolve the host IP */
 
 int jk_resolve(const char *host, int port, struct sockaddr_in *rc)
@@ -271,11 +292,7 @@
 
 apr_sockaddr_ip_get(&remote_ipaddr, remote_sa);
 
-   /* i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE 
works in UTF */
-#ifdef AS400_UTF8
-jk_ascii2ebcdic(remote_ipaddr, remote_ipaddr);
-#endif
-laddr.s_addr = inet_addr(remote_ipaddr);
+laddr.s_addr = jk_inet_addr(remote_ipaddr);
 
 #else /* HAVE_APR */
 
@@ -295,12 +312,8 @@
 #endif /* HAVE_APR */
 }
 else {
-   /* i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE 
works in UTF */
-#ifdef AS400_UTF8
-jk_ascii2ebcdic((char *)host, (char *)host);
-#endif
 /* If we found only digits we use inet_addr() */
-laddr.s_addr = inet_addr(host);
+laddr.s_addr = jk_inet_addr(host);
 }
 memcpy(&(rc->sin_addr), &laddr, sizeof(laddr));
 

Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_connect.h?view=diff&rev=531819&r1=531818&r2=531819
==
--- tomcat/connectors/trunk/jk/native/common/jk_connect.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_connect.h Tue Apr 24 01:02:47 
2007
@@ -56,6 +56,17 @@
 
 int jk_is_socket_connected(jk_sock_t sd);
 
+
+/***
+ * i5/OS V5R4 need ASCII<->EBCDIC translation for inet_addr() call
+ */
+#if !defined(AS400_UTF8)
+
+#define jk_inet_addr inet_addr
+
+#endif
+
+
 #ifdef __cplusplus
 }
 #endif  /* __cplusplus */



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

svn commit: r531821 - /tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 01:03:37 2007
New Revision: 531821

URL: http://svn.apache.org/viewvc?view=rev&rev=531821
Log:
Restore previous settings

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc?view=diff&rev=531821&r1=531820&r2=531821
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc Tue Apr 24 
01:03:37 2007
@@ -1,214 +1,256 @@
 PGM
 CRTCMOD MODULE(MOD_JK/MOD_JK) +
SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
-   DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' + 
+   DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
   'USE_APACHE_MD5' '_REENTRANT') +
TEXT('mod_jk.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALE) +
+SYSIFCOPT(*IFSIO) +
 LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 
 CRTCMOD MODULE(MOD_JK/JK_AJP_COM) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp_common.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp_common.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALE) +
+SYSIFCOPT(*IFSIO) +
 LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 
 CRTCMOD MODULE(MOD_JK/JK_AJP12_W) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp12_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp12_worker.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALE) +
+SYSIFCOPT(*IFSIO) +
 LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 
 CRTCMOD MODULE(MOD_JK/JK_AJP13) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp13.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +   
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp13.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALE) +
+SYSIFCOPT(*IFSIO) +
 LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 
 CRTCMOD MODULE(MOD_JK/JK_AJP13_W) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp13_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp13_worker.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALE) +
+SYSIFCOPT(*IFSIO) +
 LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 
 CRTCMOD MODULE(MOD_JK/JK_AJP14) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp14.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp14.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALE) +
+SYSIFCOPT(*IFSIO) +
 LANGLVL(*EXTENDED) +
+TGTRLS(*CURRENT) +
 INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
 
 CRTCMOD MODULE(MOD_JK/JK_AJP14_W) +
 SRCSTMF('/home/apache/jk/native/common/jk_ajp14_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=530' +  
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
 TEXT('jk_ajp1

svn commit: r531924 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 06:20:19 2007
New Revision: 531924

URL: http://svn.apache.org/viewvc?view=rev&rev=531924
Log:
A possible fix for i5/OS implementation where all inits are done twice in the 
same thread

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=531924&r1=531923&r2=531924
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Tue Apr 24 06:20:19 
2007
@@ -2540,6 +2540,10 @@
 static apr_status_t jklog_cleanup(void *d)
 {
 /* set the main_log to NULL */
+#idef AS400
+   main_log = null;
+#endif
+
 d = NULL;
 return APR_SUCCESS;
 }



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

svn commit: r531925 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 06:21:42 2007
New Revision: 531925

URL: http://svn.apache.org/viewvc?view=rev&rev=531925
Log:
no more needed on i5/OS 

Modified:
tomcat/connectors/trunk/jk/native/common/jk_util.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=531925&r1=531924&r2=531925
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Tue Apr 24 06:21:42 2007
@@ -525,15 +525,8 @@
 used = usable_size;
 }
 buf[used] = 0;
-
-/*
- * MCH errors encountered on i5/OS (V5R3/V5R4) when using jk_logger, use the 
JOBLOB QPRINT instead for now
- */
-#ifdef AS400
-   printf("%s\n", buf);
-#else
 l->log(l, level, buf);
-#endif
+
 #ifdef NETWARE
 free(buf);
 #endif



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

svn commit: r531926 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 06:22:12 2007
New Revision: 531926

URL: http://svn.apache.org/viewvc?view=rev&rev=531926
Log:
Oups

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=531926&r1=531925&r2=531926
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Tue Apr 24 06:22:12 
2007
@@ -2540,7 +2540,7 @@
 static apr_status_t jklog_cleanup(void *d)
 {
 /* set the main_log to NULL */
-#idef AS400
+#ifdef AS400
main_log = null;
 #endif
 



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

svn commit: r531939 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 06:47:23 2007
New Revision: 531939

URL: http://svn.apache.org/viewvc?view=rev&rev=531939
Log:
Fix the sent_bodyct flag unset under i5/OS

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=531939&r1=531938&r2=531939
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Tue Apr 24 06:47:23 
2007
@@ -314,6 +314,11 @@
 }
 }
 
+   /* under i5/OS this flag is not set correctly */
+#ifdef AS400
+r->sent_bodyct = 1;
+#endif
+
 /* this NOP function was removed in apache 2.0 alpha14 */
 /* ap_send_http_header(r); */
 p->response_started = JK_TRUE;



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

svn commit: r531985 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 08:31:31 2007
New Revision: 531985

URL: http://svn.apache.org/viewvc?view=rev&rev=531985
Log:
Rainer fixes for log reinit. i5/OS V5R4 now works

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=531985&r1=531984&r2=531985
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Tue Apr 24 08:31:31 
2007
@@ -2545,10 +2545,6 @@
 static apr_status_t jklog_cleanup(void *d)
 {
 /* set the main_log to NULL */
-#ifdef AS400
-   main_log = null;
-#endif
-
 d = NULL;
 return APR_SUCCESS;
 }
@@ -2621,9 +2617,11 @@
 jkl->logger_private = flp;
 flp->jklogfp = conf->jklogfp;
 conf->log = jkl;
-if (main_log == NULL)
+if (main_log == NULL) {
 main_log = conf->log;
-apr_pool_cleanup_register(p, conf->log, jklog_cleanup, jklog_cleanup);
+   apr_pool_cleanup_register(p, main_log, jklog_cleanup, 
jklog_cleanup);
+}
+
 return 0;
 }
 



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

svn commit: r531988 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 08:46:42 2007
New Revision: 531988

URL: http://svn.apache.org/viewvc?view=rev&rev=531988
Log:
On i5/OS it seems mandatory to reset the main_log. tested on an Apache instance 
with multi virtual hosts and it's required...

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=531988&r1=531987&r2=531988
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Tue Apr 24 08:46:42 
2007
@@ -2545,6 +2545,10 @@
 static apr_status_t jklog_cleanup(void *d)
 {
 /* set the main_log to NULL */
+#ifdef AS400
+   main_log = NULL;
+#endif
+
 d = NULL;
 return APR_SUCCESS;
 }



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

svn commit: r532053 - /tomcat/connectors/trunk/jk/native/common/jk_map.c

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 12:42:24 2007
New Revision: 532053

URL: http://svn.apache.org/viewvc?view=rev&rev=532053
Log:
Missing statbuf

Modified:
tomcat/connectors/trunk/jk/native/common/jk_map.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?view=diff&rev=532053&r1=532052&r2=532053
==
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Tue Apr 24 12:42:24 2007
@@ -872,8 +872,11 @@
 }
 }
 fclose(fp);
-if (modified)
+if (modified) {
+   struct stat statbuf;
+   jk_stat(f, &statbuf);
 *modified = statbuf.st_mtime;
+}
 }
 }
 



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

svn commit: r532054 - /tomcat/connectors/trunk/jk/native/common/jk_map.c

2007-04-24 Thread hgomez

Author: hgomez
Date: Tue Apr 24 12:43:57 2007
New Revision: 532054

URL: http://svn.apache.org/viewvc?view=rev&rev=532054
Log:
fix Missing statbuf

Modified:
tomcat/connectors/trunk/jk/native/common/jk_map.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?view=diff&rev=532054&r1=532053&r2=532054
==
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Tue Apr 24 12:43:57 2007
@@ -873,9 +873,9 @@
 }
 fclose(fp);
 if (modified) {
-   struct stat statbuf;
-   jk_stat(f, &statbuf);
-*modified = statbuf.st_mtime;
+struct stat statbuf;
+if (jk_stat(f, &statbuf) != -1)
+   *modified = statbuf.st_mtime;
 }
 }
 }



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

svn commit: r532236 - in /tomcat/connectors/trunk/jk/native/apache-2.0: bldjk.qclsrc bldjk54.qclsrc mod_jk.c

2007-04-25 Thread hgomez

Author: hgomez
Date: Wed Apr 25 00:46:39 2007
New Revision: 532236

URL: http://svn.apache.org/viewvc?view=rev&rev=532236
Log:
Fix tab and comments about jk_cleanup (something seems bad)

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc
tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc?view=diff&rev=532236&r1=532235&r2=532236
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc Wed Apr 25 
00:46:39 2007
@@ -1,9 +1,9 @@
 PGM
 CRTCMOD MODULE(MOD_JK/MOD_JK) +
-   SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
-   DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
-  'USE_APACHE_MD5' '_REENTRANT') +
-   TEXT('mod_jk.c') +
+SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ 'USE_APACHE_MD5' '_REENTRANT') +
+TEXT('mod_jk.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALE) +
 SYSIFCOPT(*IFSIO) +

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc?view=diff&rev=532236&r1=532235&r2=532236
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc Wed Apr 25 
00:46:39 2007
@@ -1,9 +1,9 @@
 PGM
 CRTCMOD MODULE(MOD_JK/MOD_JK) +
-   SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
-   DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
-   '_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' '_REENTRANT') +
-   TEXT('mod_jk.c') +
+SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
+DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+  '_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' '_REENTRANT') +
+TEXT('mod_jk.c') +
 OPTIMIZE(40) +
 LOCALETYPE(*LOCALEUTF) +
 SYSIFCOPT(*IFSIO) +

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=532236&r1=532235&r2=532236
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Apr 25 00:46:39 
2007
@@ -314,7 +314,7 @@
 }
 }
 
-   /* under i5/OS this flag is not set correctly */
+  /* under i5/OS this flag is not set correctly */
 #ifdef AS400
 r->sent_bodyct = 1;
 #endif
@@ -2544,11 +2544,14 @@
 
 static apr_status_t jklog_cleanup(void *d)
 {
-/* set the main_log to NULL */
+/* On i5/OS, Apache 2.x init stages and exec mode are done in the same 
thread */
+/* No fork as on Unixes, we need to cleanup some static variables */
 #ifdef AS400
-   main_log = NULL;
+main_log = NULL;
 #endif
 
+/* [EMAIL PROTECTED] */
+/* If we pass a pointer (ie: main_log), shouldn't it be *d = NULL ? */
 d = NULL;
 return APR_SUCCESS;
 }
@@ -2623,7 +2626,11 @@
 conf->log = jkl;
 if (main_log == NULL) {
 main_log = conf->log;
-   apr_pool_cleanup_register(p, main_log, jklog_cleanup, 
jklog_cleanup);
+
+/* [EMAIL PROTECTED] */
+/* Shouldn't we clean both conf->log and main_log ?
   */
+/* Also should we pass pointer (ie: main_log) or handle 
(*main_log) ? */
+apr_pool_cleanup_register(p, main_log, jklog_cleanup, 
jklog_cleanup);
 }
 
 return 0;



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

svn commit: r532238 - in /tomcat/connectors/trunk/jk/native/common: ap_snprintf.c ap_snprintf.h jk_connect.c jk_map.c jk_msg_buff.c jk_util.c

2007-04-25 Thread hgomez

Author: hgomez
Date: Wed Apr 25 00:48:37 2007
New Revision: 532238

URL: http://svn.apache.org/viewvc?view=rev&rev=532238
Log:
Tab police. Revert to old stat() in read map

Modified:
tomcat/connectors/trunk/jk/native/common/ap_snprintf.c
tomcat/connectors/trunk/jk/native/common/ap_snprintf.h
tomcat/connectors/trunk/jk/native/common/jk_connect.c
tomcat/connectors/trunk/jk/native/common/jk_map.c
tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c
tomcat/connectors/trunk/jk/native/common/jk_util.c

Modified: tomcat/connectors/trunk/jk/native/common/ap_snprintf.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/ap_snprintf.c?view=diff&rev=532238&r1=532237&r2=532238
==
--- tomcat/connectors/trunk/jk/native/common/ap_snprintf.c (original)
+++ tomcat/connectors/trunk/jk/native/common/ap_snprintf.c Wed Apr 25 00:48:37 
2007
@@ -101,15 +101,15 @@
 register int r2;
 double fi, fj;
 register char *p, *p1;
-
+
 if (ndigits >= NDIG - 1)
-   ndigits = NDIG - 2;
+  ndigits = NDIG - 2;
 r2 = 0;
 *sign = 0;
 p = &buf[0];
 if (arg < 0) {
-   *sign = 1;
-   arg = -arg;
+  *sign = 1;
+  arg = -arg;
 }
 arg = modf(arg, &fi);
 p1 = &buf[NDIG];
@@ -117,53 +117,53 @@
  * Do integer part
  */
 if (fi != 0) {
-   p1 = &buf[NDIG];
-   while (p1 > &buf[0] && fi != 0) {
-   fj = modf(fi / 10, &fi);
-   *--p1 = (int) ((fj + .03) * 10) + '0';
-   r2++;
-   }
-   while (p1 < &buf[NDIG])
-   *p++ = *p1++;
+  p1 = &buf[NDIG];
+  while (p1 > &buf[0] && fi != 0) {
+  fj = modf(fi / 10, &fi);
+  *--p1 = (int) ((fj + .03) * 10) + '0';
+  r2++;
+  }
+  while (p1 < &buf[NDIG])
+  *p++ = *p1++;
 }
 else if (arg > 0) {
-   while ((fj = arg * 10) < 1) {
-   arg = fj;
-   r2--;
-   }
+  while ((fj = arg * 10) < 1) {
+  arg = fj;
+  r2--;
+  }
 }
 p1 = &buf[ndigits];
 if (eflag == 0)
-   p1 += r2;
+  p1 += r2;
 *decpt = r2;
 if (p1 < &buf[0]) {
-   buf[0] = '\0';
-   return (buf);
+  buf[0] = '\0';
+  return (buf);
 }
 while (p <= p1 && p < &buf[NDIG]) {
-   arg *= 10;
-   arg = modf(arg, &fj);
-   *p++ = (int) fj + '0';
+  arg *= 10;
+  arg = modf(arg, &fj);
+  *p++ = (int) fj + '0';
 }
 if (p1 >= &buf[NDIG]) {
-   buf[NDIG - 1] = '\0';
-   return (buf);
+  buf[NDIG - 1] = '\0';
+  return (buf);
 }
 p = p1;
 *p1 += 5;
 while (*p1 > '9') {
-   *p1 = '0';
-   if (p1 > buf)
-   ++ * --p1;
-   else {
-   *p1 = '1';
-   (*decpt)++;
-   if (eflag == 0) {
-   if (p > buf)
-   *p = '0';
-   p++;
-   }
-   }
+  *p1 = '0';
+  if (p1 > buf)
+  ++ * --p1;
+  else {
+  *p1 = '1';
+  (*decpt)++;
+  if (eflag == 0) {
+if (p > buf)
+*p = '0';
+p++;
+  }
+  }
 }
 *p = '\0';
 return (buf);
@@ -194,51 +194,51 @@
 p1 = ap_ecvt(number, ndigit, &decpt, &sign, buf1);
 p2 = buf;
 if (sign)
-   *p2++ = '-';
+  *p2++ = '-';
 for (i = ndigit - 1; i > 0 && p1[i] == '0'; i--)
-   ndigit--;
+  ndigit--;
 if ((decpt >= 0 && decpt - ndigit > 4)
-   || (decpt < 0 && decpt < -3)) { /* use E-style */
-   decpt--;
-   *p2++ = *p1++;
-   *p2++ = '.';
-   for (i = 1; i < ndigit; i++)
-   *p2++ = *p1++;
-   *p2++ = 'e';
-   if (decpt < 0) {
-   decpt = -decpt;
-   *p2++ = '-';
-   }
-   else
-   *p2++ = '+';
-   if (decpt / 100 > 0)
-   *p2++ = decpt / 100 + '0';
-   if (decpt / 10 > 0)
-   *p2++ = (decpt % 100) / 10 + '0';
-   *p2++ = decpt % 10 + '0';
+  || (decpt < 0 && decpt < -3)) {  /* use E-style */
+  decpt--;
+  *p2++ = *p1++;
+  *p2++ = '.';
+  for (i = 1; i < ndigit; i++)
+  *p2++ = *p1++;
+  *p2++ = 'e';
+  if (decpt < 0) {
+  decpt = -decpt;
+  *p2++ = '-';
+  }
+  else
+  *p2++ = '+';
+  if (decpt / 100 > 0)
+  *p2++ = decpt / 100 + '0';
+  if (decpt / 10 > 0)
+  *p2++ = (decpt % 100) / 10 + '0';
+  *p2++ = decpt % 10 + '0';
 }
 else {
-   if (decpt <= 0) {
-   if (*p1 != '0')
-

svn commit: r532254 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-04-25 Thread hgomez

Author: hgomez
Date: Wed Apr 25 01:34:47 2007
New Revision: 532254

URL: http://svn.apache.org/viewvc?view=rev&rev=532254
Log:
Cleanup the pointer content (handle)

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=532254&r1=532253&r2=532254
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Apr 25 01:34:47 
2007
@@ -2544,15 +2544,11 @@
 
 static apr_status_t jklog_cleanup(void *d)
 {
-/* On i5/OS, Apache 2.x init stages and exec mode are done in the same 
thread */
-/* No fork as on Unixes, we need to cleanup some static variables */
-#ifdef AS400
-main_log = NULL;
-#endif
-
 /* [EMAIL PROTECTED] */
-/* If we pass a pointer (ie: main_log), shouldn't it be *d = NULL ? */
-d = NULL;
+/* Clean up pointer content */
+if (d != NULL)
+*(jk_logger_t **)d = NULL;
+
 return APR_SUCCESS;
 }
 
@@ -2630,7 +2626,7 @@
 /* [EMAIL PROTECTED] */
 /* Shouldn't we clean both conf->log and main_log ?
   */
 /* Also should we pass pointer (ie: main_log) or handle 
(*main_log) ? */
-apr_pool_cleanup_register(p, main_log, jklog_cleanup, 
jklog_cleanup);
+apr_pool_cleanup_register(p, &main_log, jklog_cleanup, 
jklog_cleanup);
 }
 
 return 0;



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

svn commit: r532312 - /tomcat/connectors/trunk/jk/native/common/jk_util.h

2007-04-25 Thread hgomez

Author: hgomez
Date: Wed Apr 25 03:56:41 2007
New Revision: 532312

URL: http://svn.apache.org/viewvc?view=rev&rev=532312
Log:
Define jk_stat

Modified:
tomcat/connectors/trunk/jk/native/common/jk_util.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.h?view=diff&rev=532312&r1=532311&r2=532312
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.h Wed Apr 25 03:56:41 2007
@@ -221,16 +221,11 @@
 void jk_ebcdic2ascii(char *src, char *dst);
 
 /* i5/OS V5R4 need ASCII-EBCDIC conversion before stat() call */
-int jk_stat(const char *f, struct stat * statbuf);
-
-#else /* AS400_UTF8 */
-
-#define jk_stat(a, b) stat(a, b)
-
 #endif /* AS400_UTF8 */
 
 #endif
 
+int jk_stat(const char *f, struct stat * statbuf);
 
 #ifdef __cplusplus
 extern "C"



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

svn commit: r532337 - /tomcat/connectors/trunk/jk/native/common/jk_map.c

2007-04-25 Thread hgomez

Author: hgomez
Date: Wed Apr 25 05:24:08 2007
New Revision: 532337

URL: http://svn.apache.org/viewvc?view=rev&rev=532337
Log:
Oups, Thanks Guenter

Modified:
tomcat/connectors/trunk/jk/native/common/jk_map.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?view=diff&rev=532337&r1=532336&r2=532337
==
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Wed Apr 25 05:24:08 2007
@@ -851,7 +851,7 @@
 if (m && f) {
 FILE *fp;
 struct stat statbuf;
-if (jk_stat(f, &statbuf) != -1)
+if (jk_stat(f, &statbuf) == -1)
 return JK_FALSE;
 #if defined(AS400) && !defined(AS400_UTF8)
 fp = fopen(f, "r, o_ccsid=0");



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

svn commit: r532342 - /tomcat/connectors/trunk/jk/native/common/jk_util.h

2007-04-25 Thread hgomez

Author: hgomez
Date: Wed Apr 25 05:36:05 2007
New Revision: 532342

URL: http://svn.apache.org/viewvc?view=rev&rev=532342
Log:
Comment about jk_map

Modified:
tomcat/connectors/trunk/jk/native/common/jk_util.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.h?view=diff&rev=532342&r1=532341&r2=532342
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.h Wed Apr 25 05:36:05 2007
@@ -220,10 +220,12 @@
 void jk_ascii2ebcdic(char *src, char *dst);
 void jk_ebcdic2ascii(char *src, char *dst);
 
-/* i5/OS V5R4 need ASCII-EBCDIC conversion before stat() call */
 #endif /* AS400_UTF8 */
 
 #endif
+
+/* i5/OS V5R4 need ASCII-EBCDIC conversion before stat() call */
+/* added a stat() mapper function, jk_map, for such purpose */
 
 int jk_stat(const char *f, struct stat * statbuf);
 



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

svn commit: r892875 - /tomcat/native/trunk/KEYS

2009-12-21 Thread hgomez

Author: hgomez
Date: Mon Dec 21 16:40:41 2009
New Revision: 892875

URL: http://svn.apache.org/viewvc?rev=892875&view=rev
Log:
Add my GPG key

Modified:
tomcat/native/trunk/KEYS

Modified: tomcat/native/trunk/KEYS
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/KEYS?rev=892875&r1=892874&r2=892875&view=diff
==
--- tomcat/native/trunk/KEYS (original)
+++ tomcat/native/trunk/KEYS Mon Dec 21 16:40:41 2009
@@ -326,3 +326,62 @@
 dXioomESUJeZzxMYdyk8nOiIeQ==
 =UD4Y
 -END PGP PUBLIC KEY BLOCK-
+
+pub   4096R/BD0A8037 2009-12-04
+Empreinte de la clé = 1473 7EB2 565F E85D B941  6210 42AE CE61 BD0A 8037
+uid  Henri Gomez 
+sig 3BD0A8037 2009-12-04  Henri Gomez 
+sub   4096R/B24EED10 2009-12-04
+sig  BD0A8037 2009-12-04  Henri Gomez 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG/MacGPG2 v2.0.12 (Darwin)
+
+mQINBEsZDQYBEADKnASDGPuXgJTztFmeJahK0cr7XG5Fjy3jAF58NKWjQMR/09kY
+lSMhOsatXLZCDVjyq/CyvXdGDxRZCrEmvcykf03Q5JutkUQEqBhMZXC7yu5EvUEK
+iFRSAM1m1thJqEw61pPlSVDyPIdBogO3zai24PP6fgPGLxxfWBhprM9BwQpYBWSn
+cpXzQr3F+QLPCCTwRZubX9wO73hqZ7QC85+4t4FbG85wVr98FgzLLnapSdnFWnad
+nuKNZqSwhmsg1X7DbRk/DN63z0kMOXtVfVDxw21GAtJHPu0s6j6Z0qaMK7+tlilv
+6WmB15cfSd/bu3aTTK6gXQ9RdpjLghMKmSfT7urHh42BXuYFQ2XNS6ASeO+eDY55
+OZZD+tfjdn2tGVcsvDM3++SnGmuQ5AfZ59zzP6xIgK0yrfK+9cdYuv0zmmf7k5Yl
+AIKiUAukHRB8P5gDyooQlqSyTXII//dNcQiKXUa0y8mWDEFO9v0bgkOYEj8rIICb
+x2g8hWbKi2iIIOaI1Z4VkYQ1k7/yYqlXRLBt5ypvjytjx4GR2ioCn6uHaroQrRwh
+WETUJoPiQ+OjQjdxCzcDNEtN3Z7RuxEqQC6K2cwZUd/+vvyLLOkj7GLNcgNpiQSJ
++5zMY7Y0y1nKMYd2rmooW1nFJYHROa+Vy+wFZViN1vg9lVhTVs2vT9bgMwARAQAB
+tCNIZW5yaSBHb21leiA8aGVucmkuZ29tZXpAZ21haWwuY29tPokCNgQTAQIAIAUC
+SxkNBgIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEEKuzmG9CoA3cD8P/0eL
+NxENYutmiu5hDvkfEB6p7TCLY2hNnwK4twJ9ZOHLRgOYazKvviRwQP3bvM345RNJ
+OYmEqK+WbwRBcArJQ/TGaxFtYGgyN/rDE2Tj1D18eVNUK97M3SZX6XIV6c0SkyQG
+TL09GxMceHWT7s+UkcZ92/BYeMLrTIiAVhDPAL7/3UC7DiEXAw3TRmM1zxqDsBOY
+NWXh6TMs4lWCH9HW9xuAfhjk2BJ8kCaiLFmPJLMMvVqdKIjdptgCMDHlGOZFIHva
+CwtVShg+QB8VNOJZWhMrLPsGK7d+V1z67yEIacdLjRS/ChSmJhzH9k20oJ/aL/5w
+i6iEOIiD4l6Gj0edlLoeElWlM4OxdUaTl0Oq5NksVNwNVDjk6X+QqOpmU5FrTQ2u
+FAOik7wXl67ZrWBoLtmQZcCemckz8qrKLaAKaN7Wvmu2q4KUunorg2bhDzA7qU7o
+u1lFmNoafHlKU2G3VDzt3VlU4XU69BrwARayWbbOBOmUTRRG9oGZLmaHiyHNU59G
+flqtinM9bAQUc6q6lMDdEpbfSek5KETHS2Yfmt547WdUxUMW90PsnhXHxNvjOfNI
+Sb3ndi0wDU53o5ja5GFE0rj2Mq3lVsgKdFhJk6huwIIeglpT6bAJA2njrS6/7a5z
+1uZLBF7h9WLotiKiO6LDgEcyjFRmqB68E3T8f7yMuQINBEsZDQYBEADHF+JycXfB
+6cv3FVqlVsH2W7pNMLSlsn7TP82OU4dsNk4RCaobPIqxd5+pZcyJIxn9UulR2OUv
+kOsMHfGuGXyLVijz5Omjk07RxTdMCwBIdfZ3kV8Z8E1gIoss4Sc0ORHzZJZ5HyOX
+IiKshp/LHz7jz3TBsMPTMkfWyNZxGR/QfsfDHxQdez0loFhvSPNaQF8CA6bhdWbR
+3Otv4KL/kijeBTLpRnfImYrV5etgtuTCY9Jn4UeapT3jYTyuvPdD883U0s/hzfRJ
+GGFe876wodaShqw/r5ahJSUdnLISW9MPJ/egniDMullXT4UDWtmRFl8PMXV+R5Mw
+ekCUQ85l/e7deKHZ4sqj7bZDCvdVyslBDNLqiHX9J9t4aGXAnN0gPPTTogtIJNQQ
+H9hBB/Z4yCSwVvzsD35vzxBsSRd6ssVRbjlKCilVlge9BGJZiiMp8NrVP67/IIV9
+0BQpxGIoWY2mvmF4qQuyax/nqu3xxAK+YfBDxtmIVUYcX8YXOa3vthN2DYBdnm5n
+7+beljnfXZS9DzEN0hw8KN7VnyNdiycjumijUBWtLWaJWu1XuQJMh6bxRGqeLyZv
+fZTEUm/r9R2pIQd746TLFBGYccQIgnAdHIeFVX4OikFMeledxQ0Sg1vMlVsEzme9
+JeDoxeRJvRGDfvZWp/KBAnuCpcOKYd40OwARAQABiQIfBBgBAgAJBQJLGQ0GAhsM
+AAoJEEKuzmG9CoA3mJMP/A53Vha8X89HCo765+pMC+oIxpHwgUHq7FLU0mofxjP1
+KRcnOOnVLJLGbpSiWxSHMZotADiqbf6NvErJG7Yalo3YIM7rbwGYpG2P0mYOvI85
+9qMZIcc5P4AcxRQMTpbfSzA5FsaOyBb1iA9mqb8hnDHUoQdEb+MA7iMP11jWUdSR
+mjarTpRAKt8IdgcuRKYtbjIrg05XR+EbXEEjvFuZV6gK9e3W4GJ8A+2GEtgcTvmZ
+drqdJrqRsggWxz9YjGj5o4a8LNV3/LBcqvPd1Ib+L/vzy4JSb2XX+a5CJg6nad2K
+GI70bvGjSDdBNazidSiYtNwKXuJAghgGcXrFC6NU/A7mlO2qJoR3QCcJQ2BnLEB2
+B3onzl4uPnr6e4ijhCt7E2XJlOFX1BPqoU0ntOvCtRMzyPh1oI+/h5My8YdcHmmA
+Aa3XOTne6qbyM/UQJOnUpDm8dezTagJm7HDBmlxi+XiMGA/0od/8CG3A1EOKjApc
+19OavHf2lDgsncwhqp7tOmXheKuM1CZLwCgqLUc0XMVmMDrxOn0/mA2lOl1G9vWQ
+ItrLhDfYc+O/XWwVLMelnUJv8fR/mCvo9nCoPg2kq5d2QKA+jDTXmsqo94tAqUZH
+2/RvjGCTBnp0HeErc1325j2pAghxmzxY0xdKIyRO6gaou0rdNNxn0L6fE4c8ZAet
+=rvjp
+-END PGP PUBLIC KEY BLOCK-



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

53 matches

Mail list logo