cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
wrowe 2005/09/21 06:59:50
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Fix the JK_NEED test to follow a 1|0 value instead of ifdef
Revision ChangesPath
1.155 +2 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- mod_jk.c 12 Sep 2005 22:21:31 - 1.154
+++ mod_jk.c 21 Sep 2005 13:59:50 - 1.155
@@ -2433,7 +2433,7 @@
return HTTP_INTERNAL_SERVER_ERROR;
}
-#ifdef JK_NEED_SET_MUTEX_PERMS
+#if JK_NEED_SET_MUTEX_PERMS
rv = unixd_set_global_mutex_perms(jk_log_lock);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Ack - there was a lingering #ifdef JK_NEED_... which should have been an #if JK_NEED_... - this is fixed in cvs, please retry and thanks for the detailed report! Bill Tim Whittington wrote: Confused me too. Error message is listed below. [exec] cl.exe /nologo /MD /W3 /Zi /O2 /I ..\common /I C:\j2sdk1.4.2_07\include /I C:\j2sdk1.4.2_07\include \win32 /I C:/Program Files/Apache Group/Apache2\include /D NDEBUG /D WIN32 /D _WINDOWS /Fo.\Release\\ /Fd.\R elease\mod_jk_src /FD /c ..\common\jk_worker.c [exec] jk_worker.c [exec] cl.exe @C:\TEMP\nm7CC.tmp [exec] mod_jk.c [exec] mod_jk.c(2437) : warning C4013: 'unixd_set_global_mutex_perms' undefined; assuming extern returning int [exec] link.exe @C:\TEMP\nm7CD.tmp [exec] LINK : fatal error LNK1104: cannot open file 'MSVCRT.lib' [exec] NMAKE : fatal error U1077: 'link.exe' : return code '0x450' [exec] Stop. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Sorted. William A. Rowe, Jr. wrote: Ack - there was a lingering #ifdef JK_NEED_... which should have been an #if JK_NEED_... - this is fixed in cvs, please retry and thanks for the detailed report! Bill Tim Whittington wrote: Confused me too. Error message is listed below. [exec] cl.exe /nologo /MD /W3 /Zi /O2 /I ..\common /I C:\j2sdk1.4.2_07\include /I C:\j2sdk1.4.2_07\include \win32 /I C:/Program Files/Apache Group/Apache2\include /D NDEBUG /D WIN32 /D _WINDOWS /Fo.\Release\\ /Fd.\R elease\mod_jk_src /FD /c ..\common\jk_worker.c [exec] jk_worker.c [exec] cl.exe @C:\TEMP\nm7CC.tmp [exec] mod_jk.c [exec] mod_jk.c(2437) : warning C4013: 'unixd_set_global_mutex_perms' undefined; assuming extern returning int [exec] link.exe @C:\TEMP\nm7CD.tmp [exec] LINK : fatal error LNK1104: cannot open file 'MSVCRT.lib' [exec] NMAKE : fatal error U1077: 'link.exe' : return code '0x450' [exec] Stop. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
This breaks the build on Windows using Microsoft Visual C++ Toolkit 2003
(at least).
It seems #define FOO 0 on WIN32 is still defined according to #ifdef
Changing
# define JK_NEED_SET_MUTEX_PERMS 0
to
# undef JK_NEED_SET_MUTEX_PERMS
fixes the problem
tim
[EMAIL PROTECTED] wrote:
wrowe 2005/09/12 15:21:31
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Modify the test introduced in 1.152 for httpd-2.2 compatibility, the
new symbol isn't available in httpd-2.0 leading to perms issues.
This patch anticipates that the flag will become a 0|1 flag defined
always before httpd-2.2 ships.
Revision ChangesPath
1.154 +16 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- mod_jk.c 12 Sep 2005 13:26:06 - 1.153
+++ mod_jk.c 12 Sep 2005 22:21:31 - 1.154
@@ -68,7 +68,21 @@
#include apr_strings.h
+/* Yes; sorta sucks - with luck we will clean this up before httpd-2.2
+ * ships, leaving AP_NEED_SET_MUTEX_PERMS def'd as 1 or 0 on all platforms.
+ */
#ifdef AP_NEED_SET_MUTEX_PERMS
+# define JK_NEED_SET_MUTEX_PERMS AP_NEED_SET_MUTEX_PERMS
+#else
+ /* A special case for httpd-2.0 */
+# if !defined(OS2) !defined(WIN32) !defined(BEOS) !defined(NETWARE)
+# define JK_NEED_SET_MUTEX_PERMS 1
+# else
+# define JK_NEED_SET_MUTEX_PERMS 0
+# endif
+#endif
+
+#if JK_NEED_SET_MUTEX_PERMS
#include unixd.h /* for unixd_set_global_mutex_perms */
#endif
/*
@@ -2419,7 +2433,7 @@
return HTTP_INTERNAL_SERVER_ERROR;
}
-#ifdef AP_NEED_SET_MUTEX_PERMS
+#ifdef JK_NEED_SET_MUTEX_PERMS
rv = unixd_set_global_mutex_perms(jk_log_lock);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Tim Whittington wrote: This breaks the build on Windows using Microsoft Visual C++ Toolkit 2003 (at least). It seems #define FOO 0 on WIN32 is still defined according to #ifdef Your suggestion is counterintuitive and reflects, perhaps, a compiler bug. It would be very helpful if you would post the *precise* error messages from msvc 7. Thanks! Bill - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Confused me too. Error message is listed below. [exec] cl.exe /nologo /MD /W3 /Zi /O2 /I ..\common /I C:\j2sdk1.4.2_07\include /I C:\j2sdk1.4.2_07\include \win32 /I C:/Program Files/Apache Group/Apache2\include /D NDEBUG /D WIN32 /D _WINDOWS /Fo.\Release\\ /Fd.\R elease\mod_jk_src /FD /c ..\common\jk_worker.c [exec] jk_worker.c [exec] cl.exe @C:\TEMP\nm7CC.tmp [exec] mod_jk.c [exec] mod_jk.c(2437) : warning C4013: 'unixd_set_global_mutex_perms' undefined; assuming extern returning int [exec] link.exe @C:\TEMP\nm7CD.tmp [exec] LINK : fatal error LNK1104: cannot open file 'MSVCRT.lib' [exec] NMAKE : fatal error U1077: 'link.exe' : return code '0x450' [exec] Stop. William A. Rowe, Jr. wrote: Tim Whittington wrote: This breaks the build on Windows using Microsoft Visual C++ Toolkit 2003 (at least). It seems #define FOO 0 on WIN32 is still defined according to #ifdef Your suggestion is counterintuitive and reflects, perhaps, a compiler bug. It would be very helpful if you would post the *precise* error messages from msvc 7. Thanks! Bill - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/09/12 06:26:07
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Fix #bug 35809. Patch provided by Christophe Dubach .
Revision ChangesPath
1.153 +2 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- mod_jk.c 12 Jul 2005 19:17:42 - 1.152
+++ mod_jk.c 12 Sep 2005 13:26:06 - 1.153
@@ -2102,7 +2102,7 @@
int i;
for (i = 0; i sz; i++) {
const char *name = jk_map_name_at(src, i);
-if (jk_map_get(src, name, NULL) == NULL) {
+if (jk_map_get(dst, name, NULL) == NULL) {
if (!jk_map_put(dst, name,
apr_pstrdup(p, jk_map_get_string(src, name,
NULL)),
NULL)) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Commit 1.153 on jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Mladen (and everyone) ... could you please provide more descriptive commit log messages? At least, one sentence of what the commit fixes? This one wasn't too helpful, and wastes extra time reviewing commits. Thanks :) Revision 1.153 - (view) (download) (as text) (annotate) - [select for diffs] Mon Sep 12 13:26:06 2005 UTC (8 hours, 6 minutes ago) by mturk Branch: MAIN CVS Tags: HEAD Changes since 1.152: +2 -2 lines Diff to previous 1.152 (colored) Fix #bug 35809. Patch provided by Christophe Dubach . - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Commit 1.153 on jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
William A. Rowe, Jr. wrote: Mladen (and everyone) ... could you please provide more descriptive commit log messages? At least, one sentence of what the commit fixes? This one wasn't too helpful, and wastes extra time reviewing commits. Very funny. It even links the bug report, the diff is 3 chars long, and even I can understand it. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
wrowe 2005/09/12 15:21:31
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Modify the test introduced in 1.152 for httpd-2.2 compatibility, the
new symbol isn't available in httpd-2.0 leading to perms issues.
This patch anticipates that the flag will become a 0|1 flag defined
always before httpd-2.2 ships.
Revision ChangesPath
1.154 +16 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- mod_jk.c 12 Sep 2005 13:26:06 - 1.153
+++ mod_jk.c 12 Sep 2005 22:21:31 - 1.154
@@ -68,7 +68,21 @@
#include apr_strings.h
+/* Yes; sorta sucks - with luck we will clean this up before httpd-2.2
+ * ships, leaving AP_NEED_SET_MUTEX_PERMS def'd as 1 or 0 on all platforms.
+ */
#ifdef AP_NEED_SET_MUTEX_PERMS
+# define JK_NEED_SET_MUTEX_PERMS AP_NEED_SET_MUTEX_PERMS
+#else
+ /* A special case for httpd-2.0 */
+# if !defined(OS2) !defined(WIN32) !defined(BEOS) !defined(NETWARE)
+# define JK_NEED_SET_MUTEX_PERMS 1
+# else
+# define JK_NEED_SET_MUTEX_PERMS 0
+# endif
+#endif
+
+#if JK_NEED_SET_MUTEX_PERMS
#include unixd.h /* for unixd_set_global_mutex_perms */
#endif
/*
@@ -2419,7 +2433,7 @@
return HTTP_INTERNAL_SERVER_ERROR;
}
-#ifdef AP_NEED_SET_MUTEX_PERMS
+#ifdef JK_NEED_SET_MUTEX_PERMS
rv = unixd_set_global_mutex_perms(jk_log_lock);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Commit 1.153 on jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Remy Maucherat wrote: William A. Rowe, Jr. wrote: Mladen (and everyone) ... could you please provide more descriptive commit log messages? At least, one sentence of what the commit fixes? This one wasn't too helpful, and wastes extra time reviewing commits. Very funny. It even links the bug report, the diff is 3 chars long, and even I can understand it. Meaning I aught to delve every bug report, every diff, every time I try to read the cvs commit log of 24 months of activity? Get real :) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Commit 1.153 on jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
William A. Rowe, Jr. wrote: Remy Maucherat wrote: William A. Rowe, Jr. wrote: Mladen (and everyone) ... could you please provide more descriptive commit log messages? At least, one sentence of what the commit fixes? This one wasn't too helpful, and wastes extra time reviewing commits. Very funny. It even links the bug report, the diff is 3 chars long, and even I can understand it. Meaning I aught to delve every bug report, every diff, every time I try to read the cvs commit log of 24 months of activity? Get real :) Let me rephrase :) I've been digging since Sunday a.m. through about 270 commits from 5 projects, across dozens and dozens of files, looking for various issues and edge cases. Yes, for pure review of a single case, the bug #'s have been extraordinarily helpful! But in terms of seeing net changes on some files I'm looking at, without even a mention such as Fix JKMountCopy directive. is a huge waste of otherwise productive time :) Bill - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[Fwd: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c]
I didn't miss the SVN conversion horizion?
This needs to hit jk before we roll out 1.2.15. 1.152 broke Apache 2.0
builds (while conforming to Apache 2.2) - so this patch is the umbrella
which addresses both flavors.
Bill
Original Message
Subject: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Date: 12 Sep 2005 22:21:31 -
From: [EMAIL PROTECTED]
Reply-To: Tomcat Developers List tomcat-dev@jakarta.apache.org
To: [EMAIL PROTECTED]
wrowe 2005/09/12 15:21:31
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Modify the test introduced in 1.152 for httpd-2.2 compatibility, the
new symbol isn't available in httpd-2.0 leading to perms issues.
This patch anticipates that the flag will become a 0|1 flag defined
always before httpd-2.2 ships.
Revision ChangesPath
1.154 +16 -2
jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- mod_jk.c 12 Sep 2005 13:26:06 - 1.153
+++ mod_jk.c 12 Sep 2005 22:21:31 - 1.154
@@ -68,7 +68,21 @@
#include apr_strings.h
+/* Yes; sorta sucks - with luck we will clean this up before httpd-2.2
+ * ships, leaving AP_NEED_SET_MUTEX_PERMS def'd as 1 or 0 on all
platforms.
+ */
#ifdef AP_NEED_SET_MUTEX_PERMS
+# define JK_NEED_SET_MUTEX_PERMS AP_NEED_SET_MUTEX_PERMS
+#else
+ /* A special case for httpd-2.0 */
+# if !defined(OS2) !defined(WIN32) !defined(BEOS)
!defined(NETWARE)
+# define JK_NEED_SET_MUTEX_PERMS 1
+# else
+# define JK_NEED_SET_MUTEX_PERMS 0
+# endif
+#endif
+
+#if JK_NEED_SET_MUTEX_PERMS
#include unixd.h /* for unixd_set_global_mutex_perms */
#endif
/*
@@ -2419,7 +2433,7 @@
return HTTP_INTERNAL_SERVER_ERROR;
}
-#ifdef AP_NEED_SET_MUTEX_PERMS
+#ifdef JK_NEED_SET_MUTEX_PERMS
rv = unixd_set_global_mutex_perms(jk_log_lock);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
wrowe 2005/07/12 12:17:43
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Use the same mutex check as we use in the unix MPMs.
Revision ChangesPath
1.152 +3 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- mod_jk.c 16 Jun 2005 06:30:45 - 1.151
+++ mod_jk.c 12 Jul 2005 19:17:42 - 1.152
@@ -68,7 +68,7 @@
#include apr_strings.h
-#if APR_USE_SYSVSEM_SERIALIZE || APR_USE_FLOCK_SERIALIZE
+#ifdef AP_NEED_SET_MUTEX_PERMS
#include unixd.h /* for unixd_set_global_mutex_perms */
#endif
/*
@@ -2419,7 +2419,7 @@
return HTTP_INTERNAL_SERVER_ERROR;
}
-#if APR_USE_SYSVSEM_SERIALIZE || APR_USE_FLOCK_SERIALIZE
+#ifdef AP_NEED_SET_MUTEX_PERMS
rv = unixd_set_global_mutex_perms(jk_log_lock);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/06/15 23:30:45
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Remove the second invocation for 'ap_get_module_config'.
Have no idea why it was called twice, because it can not change during
the request. Also remove the useless r-uri duplication.
Revision ChangesPath
1.151 +11 -32jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- mod_jk.c 19 May 2005 06:31:42 - 1.150
+++ mod_jk.c 16 Jun 2005 06:30:45 - 1.151
@@ -1755,7 +1755,6 @@
{
const char *worker_name;
jk_server_conf_t *xconf;
-jk_server_conf_t *conf;
int rc, dmt = 1;
/* We do DIR_MAGIC_TYPE here to make sure TC gets all requests, even
@@ -1767,9 +1766,8 @@
(dmt = strcmp(r-handler, DIR_MAGIC_TYPE)))
return DECLINED;
-xconf =
-(jk_server_conf_t *) ap_get_module_config(r-server-module_config,
- jk_module);
+xconf = (jk_server_conf_t *)
ap_get_module_config(r-server-module_config,
+ jk_module);
JK_TRACE_ENTER(xconf-log);
if (apr_table_get(r-subprocess_env, no-jk)) {
jk_log(xconf-log, JK_LOG_DEBUG,
@@ -1819,6 +1817,8 @@
worker_name, worker_env.num_of_workers, r-uri);
}
}
+if (worker_name)
+apr_table_setn(r-notes, JK_WORKER_ID, worker_name);
}
if (JK_IS_DEBUG_LEVEL(xconf-log))
@@ -1826,9 +1826,6 @@
r-proxyreq=%d,
r-handler, worker_name, r-proxyreq);
-conf = (jk_server_conf_t *)
ap_get_module_config(r-server-module_config,
- jk_module);
-
/* If this is a proxy request, we'll notify an error */
if (r-proxyreq) {
jk_log(xconf-log, JK_LOG_INFO, Proxy request for worker=%s
@@ -1838,20 +1835,6 @@
return HTTP_INTERNAL_SERVER_ERROR;
}
-if (conf !worker_name) {
-/* Direct mapping ( via setHandler ). Try overrides */
-char *uri = apr_pstrdup(r-pool, r-uri);
-worker_name = map_uri_to_worker(conf-uw_map, uri, conf-log);
-if (!worker_name) {
-/* Since we are here, an explicit (native) mapping has been used
*/
-/* Use default worker */
-worker_name = ajp14; /* XXX add a directive for default */
-}
-if (worker_name) {
-apr_table_setn(r-notes, JK_WORKER_ID, worker_name);
-}
-}
-
if (worker_name) {
jk_worker_t *worker = wc_get_worker_for_name(worker_name,
xconf-log);
@@ -1887,12 +1870,12 @@
s.ws_private = private_data;
s.pool = private_data.p;
#ifndef NO_GETTIMEOFDAY
-if (conf-format != NULL) {
+if (xconf-format != NULL) {
gettimeofday(tv_begin, NULL);
}
#endif
-if (init_ws_service(private_data, s, conf)) {
+if (init_ws_service(private_data, s, xconf)) {
jk_endpoint_t *end = NULL;
/* Use per/thread pool ( or context ) to reuse the
@@ -1940,7 +1923,7 @@
return HTTP_INTERNAL_SERVER_ERROR;
}
#ifndef NO_GETTIMEOFDAY
-if (conf-format != NULL) {
+if (xconf-format != NULL) {
char *duration = NULL;
long micro, seconds;
gettimeofday(tv_end, NULL);
@@ -1952,7 +1935,7 @@
seconds = tv_end.tv_sec - tv_begin.tv_sec;
duration = apr_psprintf(r-pool, %.1ld.%.6ld, seconds,
micro);
apr_table_setn(r-notes, JK_DURATION, duration);
-request_log_transaction(r, conf);
+request_log_transaction(r, xconf);
}
#endif
@@ -2485,7 +2468,6 @@
if (conf) {
const char *worker;
-char *uri;
if ((r-handler != NULL) (!strcmp(r-handler, JK_HANDLER))) {
/* Somebody already set the handler, probably manual config
* or native configuration, no need for extra overhead
@@ -2541,8 +2523,7 @@
}
}
-uri = apr_pstrdup(r-pool, r-uri);
-worker = map_uri_to_worker(conf-uw_map, uri, conf-log);
+worker = map_uri_to_worker(conf-uw_map, r-uri, conf-log);
if (worker) {
r-handler = apr_pstrdup(r-pool, JK_HANDLER);
@@ -2666,7 +2647,6
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 bldjk.qclsrc
hgomez 2005/05/24 04:59:29
Modified:jk/native/apache-2.0 bldjk.qclsrc
Log:
Make use of SO_RCVTIMEO and SO_SNDTIMEO on iSeries (no configure to help us
on OS/400)
Revision ChangesPath
1.13 +2 -1
jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc
Index: bldjk.qclsrc
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bldjk.qclsrc 15 Feb 2005 07:19:05 - 1.12
+++ bldjk.qclsrc 24 May 2005 11:59:28 - 1.13
@@ -99,7 +99,8 @@
CRTCMOD MODULE(MOD_JK/JK_CONNECT) +
SRCSTMF('/home/apache/jk/native/common/jk_connect.c') +
DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
- 'USE_APACHE_MD5' '_REENTRANT') +
+ 'USE_APACHE_MD5' '_REENTRANT' 'USE_SO_RCVTIMEO' +
+ 'USE_SO_SNDTIMEO' ) +
TEXT('jk_connect.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 bldjk.qclsrc
From iSeries manual :
SO_RCVTIMEO :
Set the receive timeout value. This option is not supported unless
_XOPEN_SOURCE is defined to be 520 or greater.
SO_SNDTIMEO :
Set the send timeout value. This option is not supported unless
_XOPEN_SOURCE is defined to be 520 or greater.
So for OS400 V5R2 and higher.
24 May 2005 11:59:29 -, [EMAIL PROTECTED] [EMAIL PROTECTED]:
hgomez 2005/05/24 04:59:29
Modified:jk/native/apache-2.0 bldjk.qclsrc
Log:
Make use of SO_RCVTIMEO and SO_SNDTIMEO on iSeries (no configure to help us
on OS/400)
Revision ChangesPath
1.13 +2 -1
jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc
Index: bldjk.qclsrc
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bldjk.qclsrc 15 Feb 2005 07:19:05 - 1.12
+++ bldjk.qclsrc 24 May 2005 11:59:28 - 1.13
@@ -99,7 +99,8 @@
CRTCMOD MODULE(MOD_JK/JK_CONNECT) +
SRCSTMF('/home/apache/jk/native/common/jk_connect.c') +
DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
- 'USE_APACHE_MD5' '_REENTRANT') +
+ 'USE_APACHE_MD5' '_REENTRANT' 'USE_SO_RCVTIMEO' +
+ 'USE_SO_SNDTIMEO' ) +
TEXT('jk_connect.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/05/18 23:31:42
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Fix Apache2 ws_write. There is no need to break the write to 4K
chunks. Since apache does not write directly to wire but rather
creates output filter buckets this will also lower the number of buckets
created.
Revision ChangesPath
1.150 +28 -20jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- mod_jk.c 18 May 2005 18:21:59 - 1.149
+++ mod_jk.c 19 May 2005 06:31:42 - 1.150
@@ -319,10 +319,12 @@
static void JK_METHOD ws_flush(jk_ws_service_t *s)
{
+#ifndef AS400
if (s s-ws_private) {
apache_private_data_t *p = s-ws_private;
ap_rflush(p-r);
}
+#endif
}
/*
@@ -341,7 +343,7 @@
#define CHUNK_SIZE 4096
#endif
-static int JK_METHOD ws_write(jk_ws_service_t *s, const void *b, unsigned l)
+static int JK_METHOD ws_write(jk_ws_service_t *s, const void *b, unsigned
int l)
{
#ifdef AS400
int rc;
@@ -352,9 +354,9 @@
if (l) {
/* BUFF *bf = p-r-connection-client; */
-size_t r = 0;
-long ll = l;
-char *bb = (char *)b;
+int r = 0;
+int ll = l;
+const char *bb = (const char *)b;
if (!p-response_started) {
if (JK_IS_DEBUG_LEVEL(main_log))
@@ -371,7 +373,8 @@
return JK_TRUE;
}
#ifdef AS400
-rc = ap_change_response_body_xlate(p-r, 65535, 65535); /*
turn off response body translation */
+/* turn off response body translation */
+rc = ap_change_response_body_xlate(p-r, 65535, 65535);
if (rc) {
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_CRIT, 0,
NULL,
@@ -381,19 +384,24 @@
}
#endif
-/* Debug - try to get around rwrite */
-while (ll 0) {
-size_t toSend = (ll CHUNK_SIZE) ? CHUNK_SIZE : ll;
-r = ap_rwrite((const char *)bb, toSend, p-r);
-jk_log(main_log, JK_LOG_DEBUG,
- writing %ld (%ld) out of %ld, toSend, r, ll);
-ll -= CHUNK_SIZE;
-bb += CHUNK_SIZE;
+while (ll 0 !p-r-connection-aborted) {
+#if 0
+/* Apache 2 output filter does not write
+ * directly to the wire.
+ */
+int toSend = (ll CHUNK_SIZE) ? CHUNK_SIZE : ll;
+r = ap_rwrite(bb, toSend, p-r);
+#else
+r = ap_rwrite(bb, ll, p-r);
+#endif
+if (JK_IS_DEBUG_LEVEL(main_log))
+jk_log(main_log, JK_LOG_DEBUG,
+ written %d out of %d, r, ll);
-if (toSend != r) {
+if (r 0)
return JK_FALSE;
-}
-
+ll -= r;
+bb += r;
}
}
@@ -1870,7 +1878,7 @@
private_data.response_started = JK_FALSE;
private_data.read_body_started = JK_FALSE;
private_data.r = r;
-
+
wc_maintain(xconf-log);
jk_init_ws_service(s);
@@ -2406,7 +2414,7 @@
worker_env.uri_to_worker = conf-uw_map;
worker_env.virtual = *; /* for now */
worker_env.server_name = (char *)ap_get_server_version();
-if (wc_open(init_map, worker_env, conf-log)) {
+if (wc_open(init_map, worker_env, conf-log)) {
ap_add_version_component(pconf, JK_EXPOSED_VERSION);
}
}
@@ -2418,7 +2426,7 @@
apr_status_t rv;
jk_server_conf_t *conf;
server_rec *srv = s;
-
+
/* create the jk log lockfiles in the parent */
if ((rv = apr_global_mutex_create(jk_log_lock, NULL,
APR_LOCK_DEFAULT,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/05/18 11:17:23 Modified:jk/native/apache-1.3 mod_jk.c jk/native/apache-2.0 mod_jk.c Log: Add JK_OPT_FLUSHPACKETS to default options. Revision ChangesPath 1.84 +2 -2 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- mod_jk.c 18 May 2005 18:04:52 - 1.83 +++ mod_jk.c 18 May 2005 18:17:23 - 1.84 @@ -1879,7 +1879,7 @@ c-format_string = NULL; c-format = NULL; c-mountcopy = JK_FALSE; -c-options = JK_OPT_FWDURIDEFAULT; +c-options = JK_OPT_FWDURIDEFAULT | JK_OPT_FLUSHPACKETS; /* * By default we will try to gather SSL info. 1.147 +2 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- mod_jk.c 18 May 2005 18:04:52 - 1.146 +++ mod_jk.c 18 May 2005 18:17:23 - 1.147 @@ -2048,7 +2048,7 @@ c-format = NULL; c-mountcopy = JK_FALSE; c-was_initialized = JK_FALSE; -c-options = JK_OPT_FWDURIDEFAULT; +c-options = JK_OPT_FWDURIDEFAULT | JK_OPT_FLUSHPACKETS; /* * By default we will try to gather SSL info. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/05/18 11:19:31 Modified:jk/native/apache-1.3 mod_jk.c jk/native/apache-2.0 mod_jk.c Log: Brr... Revert latest commit. We agreed not to flush packets by default. Revision ChangesPath 1.85 +2 -2 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- mod_jk.c 18 May 2005 18:17:23 - 1.84 +++ mod_jk.c 18 May 2005 18:19:31 - 1.85 @@ -1879,7 +1879,7 @@ c-format_string = NULL; c-format = NULL; c-mountcopy = JK_FALSE; -c-options = JK_OPT_FWDURIDEFAULT | JK_OPT_FLUSHPACKETS; +c-options = JK_OPT_FWDURIDEFAULT; /* * By default we will try to gather SSL info. 1.148 +2 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- mod_jk.c 18 May 2005 18:17:23 - 1.147 +++ mod_jk.c 18 May 2005 18:19:31 - 1.148 @@ -2048,7 +2048,7 @@ c-format = NULL; c-mountcopy = JK_FALSE; c-was_initialized = JK_FALSE; -c-options = JK_OPT_FWDURIDEFAULT | JK_OPT_FLUSHPACKETS; +c-options = JK_OPT_FWDURIDEFAULT; /* * By default we will try to gather SSL info. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/05/18 11:21:59
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Add missing FlushPackets JkOption.
Revision ChangesPath
1.149 +4 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- mod_jk.c 18 May 2005 18:19:31 - 1.148
+++ mod_jk.c 18 May 2005 18:21:59 - 1.149
@@ -1525,6 +1525,9 @@
else if (!strcasecmp(w, ForwardLocalAddress)) {
opt = JK_OPT_FWDLOCAL;
}
+else if (!strcasecmp(w, FlushPackets)) {
+opt = JK_OPT_FLUSHPACKETS;
+}
else
return apr_pstrcat(cmd-pool, JkOptions: Illegal option ', w,
', NULL);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/05/14 03:08:23
Modified:jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Call endpoint-done after endpoint-service, because reading dummy
data might block and enpoint is unavailable althought it should.
Revision ChangesPath
1.81 +3 -2 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- mod_jk.c 7 May 2005 08:15:47 - 1.80
+++ mod_jk.c 14 May 2005 10:08:23 - 1.81
@@ -1756,6 +1756,7 @@
jk_endpoint_t *end = NULL;
if (worker-get_endpoint(worker, end, l)) {
rc = end-service(end, s, l, is_error);
+end-done(end, l);
if (s.content_read s.content_length ||
(s.is_chunked !s.no_more_chunks)) {
@@ -1773,7 +1774,6 @@
}
}
}
-end-done(end, l);
}
#ifndef NO_GETTIMEOFDAY
if (conf-format != NULL) {
@@ -1797,6 +1797,7 @@
jk_log(l, JK_LOG_ERROR, Could not init service
for worker=%s,
worker_name);
+jk_close_pool(private_data.p);
JK_TRACE_EXIT(l);
return is_error;
}
1.144 +3 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- mod_jk.c 7 May 2005 08:15:47 - 1.143
+++ mod_jk.c 14 May 2005 10:08:23 - 1.144
@@ -1895,7 +1895,7 @@
if (worker-get_endpoint(worker, end, xconf-log)) {
rc = end-service(end, s, xconf-log,
is_error);
-
+end-done(end, xconf-log);
if (s.content_read s.content_length ||
(s.is_chunked !s.no_more_chunks)) {
@@ -1913,7 +1913,6 @@
}
}
}
-end-done(end, xconf-log);
}
else {/* this means we couldn't get an endpoint
*/
jk_log(xconf-log, JK_LOG_ERROR, Could not get endpoint
@@ -1926,6 +1925,7 @@
jk_log(xconf-log, JK_LOG_ERROR, Could not init service
for worker=%s,
worker_name);
+jk_close_pool(private_data.p);
JK_TRACE_EXIT(xconf-log);
return HTTP_INTERNAL_SERVER_ERROR;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0
Apparently there was something peculiar with the line endings in the previous generation of these files. Here is the patch below, compressed with --ignore-space: Index: mod_jk.dsp === RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -b -r1.10 -r1.11 --- mod_jk.dsp 15 Feb 2005 12:02:27 - 1.10 +++ mod_jk.dsp 11 May 2005 23:38:30 - 1.11 @@ -42,8 +42,8 @@ # PROP Intermediate_Dir Release # PROP Ignore_Export_Lib 0 # PROP Target_Dir -# ADD BASE CPP /nologo /MD /W3 /Zi /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK_EXPORTS /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /I ..\common /I $(APACHE1_HOME)\include /I $(APACHE1_HOME)\src\include /I $(APACHE1_HOME)\src\os\win32 /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK_EXPORTS /FdRelease\mod_jk_src /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Oy- /Zi /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK_EXPORTS /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I ..\common /I $(APACHE1_HOME)\include /I $(APACHE1_HOME)\src\include /I $(APACHE1_HOME)\src\os\win32 /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK_EXPORTS /FdRelease\mod_jk_src /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d NDEBUG Index: mod_jk.dsp === RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- mod_jk.dsp 15 Feb 2005 12:02:28 - 1.12 +++ mod_jk.dsp 11 May 2005 23:38:30 - 1.13 @@ -42,8 +42,8 @@ # PROP Intermediate_Dir Release # PROP Ignore_Export_Lib 0 # PROP Target_Dir -# ADD BASE CPP /nologo /MD /W3 /O2 /D WIN32 /D NDEBUG /D _WINDOWS /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /I ..\common /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\srclib\apr\include /I $(APACHE2_HOME)\srclib\apr-util\include /D NDEBUG /D WIN32 /D _WINDOWS /D HAVE_APR /FdRelease/mod_jk_src /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Oy- /Zi /D WIN32 /D NDEBUG /D _WINDOWS /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I ..\common /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\srclib\apr\include /I $(APACHE2_HOME)\srclib\apr-util\include /D NDEBUG /D WIN32 /D _WINDOWS /D HAVE_APR /FdRelease/mod_jk_src /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d NDEBUG and here is the commit log that bounced - in all it's ugly glory: wrowe 2005/05/11 16:38:30 Modified:jk/native/apache-1.3 mod_jk.dsp jk/native/apache-2.0 mod_jk.dsp Log: Add the /Oy- following /O2, to disable this optimization. It specifically re-enables stack frame mechanics to help analize user.dmp files or perform JIT debugging of a crash(ing) Apache instance. Same patch in the works for httpd itself, making mod_jk and httpd crashes somewhat more traceable. Did not add /Gs0 per brane's comments, leaving the stack frame probes configured as /Gs (implied by /O2). Reviewed by: stoddard, brane Revision ChangesPath 1.11 +287 -287 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp Index: mod_jk.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mod_jk.dsp15 Feb 2005 12:02:27 - 1.10 +++ mod_jk.dsp11 May 2005 23:38:30 - 1.11 @@ -1,287 +1,287 @@ -# Microsoft Developer Studio Project File - Name=mod_jk - Package Owner=4 -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102 - -CFG=mod_jk - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f mod_jk.mak. -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f mod_jk.mak CFG=mod_jk - Win32 Debug -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE mod_jk - Win32 Release (based on Win32 (x86) Dynamic-Link Library) -!MESSAGE mod_jk - Win32 Debug (based on Win32 (x86) Dynamic-Link
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/04/29 23:02:19
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Assure singleton call to wc_close.
Revision ChangesPath
1.142 +6 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- mod_jk.c 28 Apr 2005 11:28:46 - 1.141
+++ mod_jk.c 30 Apr 2005 06:02:19 - 1.142
@@ -1996,12 +1996,13 @@
(jk_server_conf_t *) ap_get_module_config(s-module_config,
jk_module);
-if (conf) {
+if (conf conf-worker_properties) {
/* On pool cleanup pass NULL for the jk_logger to
prevent segmentation faults on Windows because
we can't guarantee what order pools get cleaned
up between APR implementations. */
-wc_close(NULL);
+if (conf-was_initialized)
+wc_close(NULL);
if (conf-worker_properties)
jk_map_free(conf-worker_properties);
if (conf-uri_to_context)
@@ -2010,6 +2011,8 @@
jk_map_free(conf-automount);
if (conf-uw_map)
uri_worker_map_free(conf-uw_map, NULL);
+conf-was_initialized = JK_FALSE;
+conf-worker_properties = NULL;
}
s = s-next;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/04/28 04:28:46
Modified:jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Add default 'logs/jk-runtime-status' if JkShmFile was not specified.
Revision ChangesPath
1.78 +10 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- mod_jk.c 24 Apr 2005 10:02:16 - 1.77
+++ mod_jk.c 28 Apr 2005 11:28:45 - 1.78
@@ -1979,6 +1979,15 @@
main_log = conf-log;
}
}
+#if !defined(WIN32) !defined(NETWARE)
+if (!jk_shm_file) {
+jk_shm_file = ap_server_root_relative(p, logs/jk-runtime-status);
+if (jk_shm_file)
+ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO, NULL,
+ No JkShmFile defined in httpd.conf.
+ Using default %s, jk_shm_file);
+}
+#endif
if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf-log)) == 0) {
if (JK_IS_DEBUG_LEVEL(conf-log))
1.141 +11 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- mod_jk.c 24 Apr 2005 10:02:16 - 1.140
+++ mod_jk.c 28 Apr 2005 11:28:46 - 1.141
@@ -2329,6 +2329,16 @@
/* jk_map_t *init_map = NULL; */
jk_map_t *init_map = conf-worker_properties;
+#if !defined(WIN32) !defined(NETWARE)
+if (!jk_shm_file) {
+jk_shm_file = ap_server_root_relative(pconf,
logs/jk-runtime-status);
+if (jk_shm_file)
+ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO,
+ 0, NULL,
+ No JkShmFile defined in httpd.conf.
+ Using default %s, jk_shm_file);
+}
+#endif
if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf-log)) == 0) {
if (JK_IS_DEBUG_LEVEL(conf-log))
jk_log(conf-log, JK_LOG_DEBUG, Initialized shm:%s,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/04/12 23:34:57
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Add APR_USE_FLOCK_SERIALIZE so that FreeBSD can set the
child lock permissions. Fixex #34423
Revision ChangesPath
1.138 +3 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- mod_jk.c 11 Apr 2005 07:02:19 - 1.137
+++ mod_jk.c 13 Apr 2005 06:34:57 - 1.138
@@ -68,7 +68,7 @@
#include apr_strings.h
-#if APR_USE_SYSVSEM_SERIALIZE
+#if APR_USE_SYSVSEM_SERIALIZE || APR_USE_FLOCK_SERIALIZE
#include unixd.h /* for unixd_set_global_mutex_perms */
#endif
/*
@@ -2401,7 +2401,7 @@
return HTTP_INTERNAL_SERVER_ERROR;
}
-#if APR_USE_SYSVSEM_SERIALIZE
+#if APR_USE_SYSVSEM_SERIALIZE || APR_USE_FLOCK_SERIALIZE
rv = unixd_set_global_mutex_perms(jk_log_lock);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/04/13 01:27:39
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Fix logging for worker names, so it makes more sense what is happening.
Revision ChangesPath
1.139 +5 -6 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- mod_jk.c 13 Apr 2005 06:34:57 - 1.138
+++ mod_jk.c 13 Apr 2005 08:27:39 - 1.139
@@ -1785,9 +1785,8 @@
worker_name = worker_env.worker_list[0];
if (JK_IS_DEBUG_LEVEL(xconf-log))
jk_log(xconf-log, JK_LOG_DEBUG,
- Manual configuration for %s %s %d,
- r-uri, worker_env.worker_list[0],
- worker_env.num_of_workers);
+ Single worker (%s) configuration for %s,
+ worker_name, r-uri);
}
else {
worker_name = map_uri_to_worker(xconf-uw_map, r-uri,
xconf-log);
@@ -1795,8 +1794,8 @@
worker_name = worker_env.worker_list[0];
if (JK_IS_DEBUG_LEVEL(xconf-log))
jk_log(xconf-log, JK_LOG_DEBUG,
- Manual configuration for %s %d,
- r-uri, worker_env.worker_list[0]);
+ Using first worker (%s) from %d workers for %s,
+ worker_name, worker_env.num_of_workers, r-uri);
}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33778] - AddModule was removed from Apache 2.0, docs need updating
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=33778. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=33778 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2005-04-13 14:18 --- Fixed in the cvs. Thanks! Mladen. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/04/10 23:55:23
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Fix compile time warnings about no previous prototype..
Revision ChangesPath
1.136 +5 -4 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- mod_jk.c 9 Apr 2005 15:44:35 - 1.135
+++ mod_jk.c 11 Apr 2005 06:55:23 - 1.136
@@ -1474,7 +1474,8 @@
* ForwardDirectories = Forward all directory requests with no index
files to Tomcat
*/
-const char *jk_set_options(cmd_parms * cmd, void *dummy, const char *line)
+static const char *jk_set_options(cmd_parms * cmd, void *dummy,
+ const char *line)
{
int opt = 0;
int mask = 0;
@@ -1717,7 +1718,7 @@
/** Util - cleanup endpoint.
*/
-apr_status_t jk_cleanup_endpoint(void *data)
+static apr_status_t jk_cleanup_endpoint(void *data)
{
jk_endpoint_t *end = (jk_endpoint_t *)data;
/* printf(XXX jk_cleanup1 %ld\n, data); */
@@ -1727,7 +1728,7 @@
/** Util - cleanup shmem.
*/
-apr_status_t jk_cleanup_shmem(void *data)
+static apr_status_t jk_cleanup_shmem(void *data)
{
jk_logger_t *l = data;
jk_shm_close();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/04/11 00:02:19
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Remove unused function jk_cleanup_endpoint.
Revision ChangesPath
1.137 +1 -11 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- mod_jk.c 11 Apr 2005 06:55:23 - 1.136
+++ mod_jk.c 11 Apr 2005 07:02:19 - 1.137
@@ -1716,16 +1716,6 @@
/* The JK module handlers
*/
/* =
*/
-/** Util - cleanup endpoint.
- */
-static apr_status_t jk_cleanup_endpoint(void *data)
-{
-jk_endpoint_t *end = (jk_endpoint_t *)data;
-/* printf(XXX jk_cleanup1 %ld\n, data); */
-end-done(end, NULL);
-return 0;
-}
-
/** Util - cleanup shmem.
*/
static apr_status_t jk_cleanup_shmem(void *data)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
glenn 2005/04/09 08:44:35
Modified:jk/native/apache-2.0 mod_jk.c
Log:
BUG: 34357 Apache 2 JkAutoAlias segfault
In some situations Apache 2 mod_jk could segfault
when the JkAutoAlias directive is used.
Added an additional null pointer test.
Revision ChangesPath
1.135 +3 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- mod_jk.c 26 Mar 2005 09:37:10 - 1.134
+++ mod_jk.c 9 Apr 2005 15:44:35 - 1.135
@@ -2482,7 +2482,8 @@
/* Special case to make sure that apache can serve a directory
listing if there are no matches for the DirectoryIndex and
Tomcat webapps are mapped into apache using JkAutoAlias. */
-if (r-main != NULL (conf-alias_dir != NULL)
+if (r-main != NULL r-main-handler != NULL
+(conf-alias_dir != NULL)
!strcmp(r-main-handler, DIR_MAGIC_TYPE)) {
/* Append the request uri to the JkAutoAlias directory and
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 Makefile.in
hgomez 2005/03/29 06:35:48 Modified:jk/native/apache-1.3 Makefile.in jk/native/apache-2.0 Makefile.in Log: Shoud also remove mod_jk.a (found at least on Linux) Revision ChangesPath 1.16 +1 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.in 18 Mar 2005 08:17:59 - 1.15 +++ Makefile.in 29 Mar 2005 14:35:48 - 1.16 @@ -73,7 +73,7 @@ # Clean part. # clean: - rm -rf *.lo *.la + rm -rf *.lo *.la *.a rm -rf *.o .libs *.so # 1.18 +1 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Makefile.in 7 Mar 2005 18:38:50 - 1.17 +++ Makefile.in 29 Mar 2005 14:35:48 - 1.18 @@ -77,5 +77,5 @@ @echo clean: - rm -f *.o *.so *.lo *.la *.slo + rm -f *.o *.so *.lo *.la *.slo *.a rm -rf .libs - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/03/26 01:37:10
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Do not abort the connection if request is invalid, so that client receives
apache http error code, instead just dropping connection.
Revision ChangesPath
1.134 +4 -4 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- mod_jk.c 24 Mar 2005 10:19:19 - 1.133
+++ mod_jk.c 26 Mar 2005 09:37:10 - 1.134
@@ -38,7 +38,6 @@
#include http_main.h
#include http_log.h
#include util_script.h
-
#include ap_mpm.h
#ifdef AS400
@@ -1964,12 +1963,13 @@
return OK; /* NOT r-status, even if it has changed. */
}
else if (rc == JK_CLIENT_ERROR) {
-r-connection-aborted = 1;
+if (is_error != HTTP_REQUEST_ENTITY_TOO_LARGE)
+r-connection-aborted = 1;
jk_log(xconf-log, JK_LOG_INFO, Aborting connection
for worker=%s,
worker_name);
JK_TRACE_EXIT(xconf-log);
-return OK;
+return is_error;
}
else {
jk_log(xconf-log, JK_LOG_INFO, Service error=%d
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/03/18 00:14:42
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Fix STARTUP logging and use EMERG errors for missing JkShmFile
Revision ChangesPath
1.132 +14 -9 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- mod_jk.c 17 Mar 2005 12:06:03 - 1.131
+++ mod_jk.c 18 Mar 2005 08:14:42 - 1.132
@@ -298,7 +298,7 @@
#ifdef AS400
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_NOERRNO, 0,
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_CRIT, 0,
NULL,
mod_jk: Error on ap_change_request_body_xlate,
rc=%d,
rv);
@@ -368,7 +368,7 @@
#ifdef AS400
rc = ap_change_response_body_xlate(p-r, 65535, 65535); /*
turn off response body translation */
if (rc) {
-ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_CRIT, 0,
NULL,
mod_jk: Error on
ap_change_response_body_xlate, rc=%d,
rc);
@@ -396,7 +396,7 @@
*/
#ifndef AS400
if (ap_rflush(p-r) != APR_SUCCESS) {
-ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_CRIT, 0,
NULL, mod_jk: Error flushing);
return JK_FALSE;
}
@@ -2181,7 +2181,7 @@
status = apr_file_write(p-jklogfp, what, wrote);
if (status != APR_SUCCESS) {
apr_strerror(status, error, 254);
-ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO,
0,
+ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0,
NULL,
mod_jk: jk_log_to_file %s failed: %s,
what, error);
@@ -2349,11 +2349,16 @@
jk_log(conf-log, JK_LOG_ERROR, Initializing shm:%s errno=%d,
jk_shm_name(), rc);
#if !defined(WIN32) !defined(NETWARE)
-if (!jk_shm_file)
-ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
+if (!jk_shm_file) {
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_CRIT,
0, NULL,
No JkShmFile defined in httpd.conf.
LoadBalancer will not function properly!);
+ap_log_error(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO,
+ 0, NULL,
+ No JkShmFile defined in httpd.conf.
+ LoadBalancer will not function properly!);
+}
#endif
/* Set default connection cache size for worker mpm */
@@ -2374,8 +2379,8 @@
/* if(map_alloc(init_map)) { */
if (!jk_map_read_properties(init_map, conf-worker_file, NULL)) {
if (jk_map_size(init_map) == 0) {
-ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO,
- APLOG_EMERG, NULL,
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_CRIT,
+ 0, NULL,
No worker file and no worker options in httpd.conf
use JkWorkerFile to set workers);
return;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 Makefile.in
mturk 2005/03/07 10:38:50
Modified:jk/native/apache-2.0 Makefile.in
Log:
Fix #33843 by adding defined LDFLAGS.
Revision ChangesPath
1.17 +1 -1
jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in
Index: Makefile.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.in 18 Dec 2004 03:49:04 - 1.16
+++ Makefile.in 7 Mar 2005 18:38:50 - 1.17
@@ -63,7 +63,7 @@
# APXS will compile every file, this is derived from apxs
mod_jk.la: mod_jk.lo $(APACHE_OBJECTS)
- $(LIBTOOL) --mode=link ${COMPILE} -o $@ -module -rpath ${libexecdir}
-avoid-version mod_jk.lo $(APACHE_OBJECTS)
+ $(LIBTOOL) --mode=link ${COMPILE} `${APXS} -q LDFLAGS` -o $@ -module
-rpath ${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
mod_jk.so: mod_jk.la
$(LIBTOOL) --mode=install cp $ `pwd`/$@
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33778] New: - AddModule was removed from Apache 2.0, docs need updating
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=33778. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=33778 Summary: AddModule was removed from Apache 2.0, docs need updating Product: Tomcat 5 Version: Unknown Platform: PC OS/Version: Windows XP Status: NEW Severity: minor Priority: P2 Component: Connector:AJP AssignedTo: tomcat-dev@jakarta.apache.org ReportedBy: [EMAIL PROTECTED] SUMMARY: In jakarta-tomcat-connectors/jk/xdocs, several references are made to AddModule, though it prevents Apache 2.0.x to start properly when inserted. Note: this section aims at the impatients!... ROOT CAUSE: AddModule was removed from Apache 2.0, because it no longer makes sense. (See http://archive.apache.org/gnats/8095) CORRECTIONS: Suggested corrections in 2 places: jk/xdocs/howto/quick.xml, 125c125 # Declare the module for lt;IfModule directivegt; --- # Declare the module for lt;IfModule directivegt; (remove this line on Apache 2.0.x) jk\xdocs\howto\apache.xml, 281c281 # Declare the module for lt;IfModule directivegt; --- # Declare the module for lt;IfModule directivegt; (remove this line on Apache 2.0.x) -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/22 06:40:39 Modified:jk/native/apache-1.3 mod_jk.c jk/native/apache-2.0 mod_jk.c Log: Use log warning if JkShmFile was not defined on non WIN32/NETWARE. Revision ChangesPath 1.73 +2 -2 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- mod_jk.c 21 Feb 2005 18:00:41 - 1.72 +++ mod_jk.c 22 Feb 2005 14:40:36 - 1.73 @@ -1985,7 +1985,7 @@ else jk_log(conf-log, JK_LOG_ERROR, Initializing shm:%s errno=%d, jk_shm_name(), rc); -#if !defined (WIN32) || !defined(NETWARE) +#if !defined(WIN32) !defined(NETWARE) if (!jk_shm_file) ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, NULL, No JkShmFile defined in httpd.conf. 1.130 +2 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- mod_jk.c 21 Feb 2005 18:00:41 - 1.129 +++ mod_jk.c 22 Feb 2005 14:40:37 - 1.130 @@ -2348,7 +2348,7 @@ else jk_log(conf-log, JK_LOG_ERROR, Initializing shm:%s errno=%d, jk_shm_name(), rc); -#if !defined (WIN32) || !defined(NETWARE) +#if !defined(WIN32) !defined(NETWARE) if (!jk_shm_file) ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/21 00:29:17
Modified:jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Add JkMountFile directive. This enables to dynamically add or remove
uri mappings without restarting apache. To disable uri mapping add a
minus '-' sign in front of mapping.
Revision ChangesPath
1.71 +52 -3 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- mod_jk.c 17 Feb 2005 15:03:15 - 1.70
+++ mod_jk.c 21 Feb 2005 08:29:17 - 1.71
@@ -95,6 +95,7 @@
*/
jk_map_t *worker_properties;
char *worker_file;
+char *mount_file;
jk_map_t *uri_to_context;
int mountcopy;
@@ -798,6 +799,38 @@
}
/*
+ * JkMountFile Directive Handling
+ *
+ * JkMountFile file
+ */
+
+static const char *jk_set_mount_file(cmd_parms * cmd,
+ void *dummy, char *mount_file)
+{
+server_rec *s = cmd-server;
+struct stat statbuf;
+
+jk_server_conf_t *conf =
+(jk_server_conf_t *) ap_get_module_config(s-module_config,
+ jk_module);
+
+/* we need an absolut path (ap_server_root_relative does the ap_pstrdup)
*/
+conf-mount_file = ap_server_root_relative(cmd-pool, mount_file);
+
+#ifdef CHROOTED_APACHE
+ap_server_strip_chroot(conf-mount_file, 0);
+#endif
+
+if (conf-mount_file == NULL)
+return JkMountFile file name invalid;
+
+if (stat(conf-mount_file, statbuf) == -1)
+return Can't find the mount file specified;
+
+return NULL;
+}
+
+/*
* JkLogFile Directive Handling
*
* JkLogFile file
@@ -1519,6 +1552,16 @@
the name of a worker file for the Jakarta servlet containers},
/*
+ * JkMountFile specifies a full path to the location of the
+ * uriworker properties file.
+ *
+ * This file defines the different mapping for workers used by apache
+ * to redirect servlet requests.
+ */
+{JkMountFile, jk_set_mount_file, NULL, RSRC_CONF, TAKE1,
+ the name of a mount file for the Jakarta servlet uri mappings},
+
+/*
* JkAutoMount specifies that the list of handled URLs must be
* asked to the servlet engine (autoconf feature)
*/
@@ -1788,6 +1831,7 @@
c-worker_properties = NULL;
jk_map_alloc(c-worker_properties);
c-worker_file = NULL;
+c-mount_file = NULL;
c-log_file = NULL;
c-log_level = -1;
c-log = NULL;
@@ -1883,6 +1927,7 @@
copy_jk_map(p, overrides-s, base-uri_to_context,
overrides-uri_to_context);
copy_jk_map(p, overrides-s, base-automount, overrides-automount);
+overrides-mount_file = base-mount_file;
}
if (base-envvars_in_use) {
@@ -1964,7 +2009,7 @@
/*if(map_alloc(init_map)) { */
-if (!jk_map_read_properties(init_map, conf-worker_file)) {
+if (!jk_map_read_properties(init_map, conf-worker_file, NULL)) {
if (jk_map_size(init_map) == 0) {
ap_log_error(APLOG_MARK, APLOG_ERR, NULL,
@@ -1984,7 +2029,11 @@
worker_env.virtual = *; /* for now */
worker_env.server_name = (char *)ap_get_server_version();
if (wc_open(init_map, worker_env, conf-log)) {
-/* we don't need this any more so free it */
+/* XXX: For each virtual host? */
+if (conf conf-mount_file) {
+conf-uw_map-fname = conf-mount_file;
+uri_worker_map_load(conf-uw_map, conf-log);
+}
return;
}
1.128 +56 -7 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- mod_jk.c 17 Feb 2005 15:03:15 - 1.127
+++ mod_jk.c 21 Feb 2005 08:29:17 - 1.128
@@ -130,6 +130,7 @@
*/
jk_map_t *worker_properties;
char *worker_file;
+char *mount_file;
jk_map_t *uri_to_context;
int mountcopy;
@@ -844,6 +845,34 @@
}
/*
+ * JkMountFile Directive Handling
+ *
+ * JkMountFile file
+ */
+
+static const char *jk_set_mount_file(cmd_parms * cmd,
+ void *dummy, const char *mount_file)
+{
+server_rec *s = cmd-server;
+struct stat statbuf;
+
+jk_server_conf_t *conf =
+(jk_server_conf_t
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/21 10:00:41 Modified:jk/native/apache-1.3 mod_jk.c jk/native/apache-2.0 mod_jk.c Log: Add apache log warning if shared memory is not defined for unix platforms. Although it will work, the dynamic config will be unavailable, so inform the user about that fact. Revision ChangesPath 1.72 +7 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- mod_jk.c 21 Feb 2005 08:29:17 - 1.71 +++ mod_jk.c 21 Feb 2005 18:00:41 - 1.72 @@ -1985,6 +1985,12 @@ else jk_log(conf-log, JK_LOG_ERROR, Initializing shm:%s errno=%d, jk_shm_name(), rc); +#if !defined (WIN32) || !defined(NETWARE) +if (!jk_shm_file) +ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, NULL, + No JkShmFile defined in httpd.conf. + LoadBalancer will not function properly!); +#endif /* SREVILAK -- register cleanup handler to clear resources on restart, * to make sure log file gets closed in the parent process */ 1.129 +9 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- mod_jk.c 21 Feb 2005 08:29:17 - 1.128 +++ mod_jk.c 21 Feb 2005 18:00:41 - 1.129 @@ -2348,6 +2348,13 @@ else jk_log(conf-log, JK_LOG_ERROR, Initializing shm:%s errno=%d, jk_shm_name(), rc); +#if !defined (WIN32) || !defined(NETWARE) +if (!jk_shm_file) +ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, + 0, NULL, + No JkShmFile defined in httpd.conf. + LoadBalancer will not function properly!); +#endif /* Set default connection cache size for worker mpm */ #if APR_HAS_THREADS @@ -2392,7 +2399,7 @@ apr_status_t rv; jk_server_conf_t *conf; server_rec *srv = s; - + /* create the jk log lockfiles in the parent */ if ((rv = apr_global_mutex_create(jk_log_lock, NULL, APR_LOCK_DEFAULT, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 bldjk.qclsrc
hgomez 2005/02/14 04:25:31
Modified:jk/native/apache-2.0 bldjk.qclsrc
Log:
Add the *CALLER activation group for *INHERIT
Revision ChangesPath
1.11 +1 -0
jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc
Index: bldjk.qclsrc
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bldjk.qclsrc 11 Feb 2005 08:08:58 - 1.10
+++ bldjk.qclsrc 14 Feb 2005 12:25:31 - 1.11
@@ -311,6 +311,7 @@
SRCMBR(MOD_JK) +
DETAIL(*BASIC) +
STGMDL(*INHERIT) +
+ ACTGRP(*CALLER) +
BNDSRVPGM(QHTTPSVR/QZSRAPR QHTTPSVR/QZSRCORE +
QHTTPSVR/QZSRXMLP QHTTPSVR/QZSRSDBM) +
TEXT('Apache mod_jk tomcat connector module')
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/14 23:30:50
Modified:jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Add $(ServerRoot) to map properties.
Revision ChangesPath
1.68 +3 -2 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mod_jk.c 14 Feb 2005 10:36:12 - 1.67
+++ mod_jk.c 15 Feb 2005 07:30:49 - 1.68
@@ -1817,6 +1817,7 @@
c-envvars = ap_make_table(p, 0);
c-s = s;
+jk_map_put(c-worker_properties, ServerRoot, ap_server_root, NULL);
return c;
}
@@ -1927,7 +1928,7 @@
for (i = 0; i jk_map_size(conf-automount); i++)
{
char *name = jk_map_name_at(conf-automount, i);
-jk_log(conf-log, JK_LOG_DEBUG, worker = %s and virtualhost =
%s, name, map_get_string(conf-automount, name, NULL));
+ jk_log(conf-log, JK_LOG_DEBUG, worker = %s and
virtualhost = %s, name, map_get_string(conf-automount, name, NULL));
}
}
*/
1.125 +2 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- mod_jk.c 13 Feb 2005 12:24:18 - 1.124
+++ mod_jk.c 15 Feb 2005 07:30:49 - 1.125
@@ -2026,7 +2026,7 @@
c-envvars = apr_table_make(p, 0);
c-s = s;
-
+jk_map_put(c-worker_properties, ServerRoot, ap_server_root, NULL);
apr_pool_cleanup_register(p, s, jk_apr_pool_cleanup,
jk_apr_pool_cleanup);
return c;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/13 04:24:18
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Implement new API calls for shm and set vhost uriworker_map
Revision ChangesPath
1.124 +13 -12jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- mod_jk.c 12 Feb 2005 11:55:33 - 1.123
+++ mod_jk.c 13 Feb 2005 12:24:18 - 1.124
@@ -670,7 +670,7 @@
s-num_headers++;
}
}
-
+s-uw_map = conf-uw_map;
return JK_TRUE;
}
@@ -1731,21 +1731,22 @@
( lb is a bit special, it should count as a single worker but
I'm not sure how ). We also have a manual config directive that
explicitely give control to us. */
-worker_name = worker_env.first_worker;
+worker_name = worker_env.worker_list[0];
if (JK_IS_DEBUG_LEVEL(xconf-log))
jk_log(xconf-log, JK_LOG_DEBUG,
Manual configuration for %s %s %d,
- r-uri, worker_env.first_worker,
+ r-uri, worker_env.worker_list[0],
worker_env.num_of_workers);
}
else {
worker_name = map_uri_to_worker(xconf-uw_map, r-uri,
xconf-log);
-if (worker_name == NULL)
-worker_name = worker_env.first_worker;
-if (JK_IS_DEBUG_LEVEL(xconf-log))
-jk_log(xconf-log, JK_LOG_DEBUG,
- Manual configuration for %s %d,
- r-uri, worker_env.first_worker);
+if (worker_name == NULL worker_env.num_of_workers) {
+worker_name = worker_env.worker_list[0];
+if (JK_IS_DEBUG_LEVEL(xconf-log))
+jk_log(xconf-log, JK_LOG_DEBUG,
+ Manual configuration for %s %d,
+ r-uri, worker_env.worker_list[0]);
+}
}
}
@@ -2238,7 +2239,7 @@
JK_TRACE_ENTER(conf-log);
-if ((rc = jk_shm_attach(jk_shm_file)) == 0) {
+if ((rc = jk_shm_attach(jk_shm_file, conf-log)) == 0) {
if (JK_IS_DEBUG_LEVEL(conf-log))
jk_log(conf-log, JK_LOG_DEBUG, Attached shm:%s,
jk_shm_name());
@@ -2272,7 +2273,7 @@
/* jk_map_t *init_map = NULL; */
jk_map_t *init_map = conf-worker_properties;
-if ((rc = jk_shm_open(jk_shm_file)) == 0) {
+if ((rc = jk_shm_open(jk_shm_file, conf-log)) == 0) {
if (JK_IS_DEBUG_LEVEL(conf-log))
jk_log(conf-log, JK_LOG_DEBUG, Initialized shm:%s,
jk_shm_name(), rc);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 NWGNUmakefile
mturk 2005/02/13 04:25:04 Modified:jk/native/apache-2.0 NWGNUmakefile Log: Add -D_POSIX_SOURCE to compiler flags. Revision ChangesPath 1.7 +1 -0 jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile Index: NWGNUmakefile === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- NWGNUmakefile 6 Feb 2005 17:43:09 - 1.6 +++ NWGNUmakefile 13 Feb 2005 12:25:04 - 1.7 @@ -57,6 +57,7 @@ # XDEFINES += \ -D__NOVELL_LIBC__ \ + -D_POSIX_SOURCE \ $(EOLIST) # - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.dsp
mturk 2005/02/13 05:14:17 Modified:jk/native/apache-2.0 mod_jk.dsp Log: Add HAVE_APR define. We have APR for sure with Apache2. Revision ChangesPath 1.11 +2 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp Index: mod_jk.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mod_jk.dsp6 Feb 2005 17:43:09 - 1.10 +++ mod_jk.dsp13 Feb 2005 13:14:17 - 1.11 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MD /W3 /O2 /D WIN32 /D NDEBUG /D _WINDOWS /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /I ..\common /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\srclib\apr\include /I $(APACHE2_HOME)\srclib\apr-util\include /D NDEBUG /D WIN32 /D _WINDOWS /FdRelease/mod_jk_src /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /I ..\common /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\srclib\apr\include /I $(APACHE2_HOME)\srclib\apr-util\include /D NDEBUG /D WIN32 /D _WINDOWS /D HAVE_APR /FdRelease/mod_jk_src /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d NDEBUG @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D WIN32 /D _DEBUG /D _WINDOWS /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I ..\common /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\srclib\apr\include /I $(APACHE2_HOME)\srclib\apr-util\include /D _DEBUG /D WIN32 /D _WINDOWS /FdDebug/mod_jk_src /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I ..\common /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\srclib\apr\include /I $(APACHE2_HOME)\srclib\apr-util\include /D _DEBUG /D WIN32 /D _WINDOWS /D HAVE_APR /FdDebug/mod_jk_src /FD /c # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d _DEBUG - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 bldjk.qclsrc
mturk 2005/02/11 00:08:58
Modified:jk/native/apache-2.0 bldjk.qclsrc
Log:
Remove CRLF and add jk_shm and jk_status to build.
Patch submitted by Eric McIntyre.
Revision ChangesPath
1.10 +318 -289
jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc
Index: bldjk.qclsrc
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bldjk.qclsrc 29 Aug 2003 13:05:36 - 1.9
+++ bldjk.qclsrc 11 Feb 2005 08:08:58 - 1.10
@@ -1,289 +1,318 @@
-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') +
- OPTIMIZE(40) +
- SYSIFCOPT(*IFSIO) +
- TGTCCSID(*JOB) +
- OPTION(*LOGMSG) +
- TERASPACE(*YES *TSIFC) +
- STGMDL(*INHERIT) +
-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=520' +
- 'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_ajp_common.c') +
-OPTIMIZE(40) +
-SYSIFCOPT(*IFSIO) +
-LANGLVL(*ANSI) +
-TGTCCSID(*JOB) +
-OPTION(*LOGMSG) +
-TERASPACE(*YES *TSIFC) +
-STGMDL(*INHERIT) +
-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=520' +
- 'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_ajp12_worker.c') +
-OPTIMIZE(40) +
-SYSIFCOPT(*IFSIO) +
-LANGLVL(*ANSI) +
-TGTCCSID(*JOB) +
-OPTION(*LOGMSG) +
-TERASPACE(*YES *TSIFC) +
-STGMDL(*INHERIT) +
-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=520' +
- 'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_ajp13.c') +
-OPTIMIZE(40) +
-SYSIFCOPT(*IFSIO) +
-LANGLVL(*ANSI) +
-TGTCCSID(*JOB) +
-OPTION(*LOGMSG) +
-TERASPACE(*YES *TSIFC) +
-STGMDL(*INHERIT) +
-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=520' +
- 'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_ajp13_worker.c') +
-OPTIMIZE(40) +
-SYSIFCOPT(*IFSIO) +
-LANGLVL(*ANSI) +
-TGTCCSID(*JOB) +
-OPTION(*LOGMSG) +
-TERASPACE(*YES *TSIFC) +
-STGMDL(*INHERIT) +
-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=520' +
- 'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_ajp14.c') +
-OPTIMIZE(40) +
-SYSIFCOPT(*IFSIO) +
-LANGLVL(*ANSI) +
-TGTCCSID(*JOB) +
-OPTION(*LOGMSG) +
-TERASPACE(*YES *TSIFC) +
-STGMDL(*INHERIT) +
-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=520' +
- 'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_ajp14_worker.c') +
-OPTIMIZE(40) +
-SYSIFCOPT(*IFSIO) +
-LANGLVL(*ANSI) +
-TGTCCSID(*JOB) +
-OPTION(*LOGMSG) +
-TERASPACE(*YES *TSIFC) +
-STGMDL(*INHERIT) +
-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' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
- 'USE_APACHE_MD5' '_REENTRANT') +
-TEXT('jk_connect.c') +
-OPTIMIZE(40) +
-SYSIFCOPT(*IFSIO) +
-LANGLVL(*ANSI) +
-TGTCCSID(*JOB) +
-OPTION(*LOGMSG) +
-TERASPACE(*YES *TSIFC) +
-STGMDL(*INHERIT) +
-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
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/08 23:39:08
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Move jk_set_worker_def_cache_size to post config hook, so that
it is set before the jk configuration is parsed.
Revision ChangesPath
1.122 +12 -12jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- mod_jk.c 7 Feb 2005 19:07:38 - 1.121
+++ mod_jk.c 9 Feb 2005 07:39:08 - 1.122
@@ -2225,7 +2225,6 @@
static void jk_child_init(apr_pool_t * pconf, server_rec * s)
{
jk_server_conf_t *conf;
-int mpm_threads = 1;
apr_status_t rv;
int rc;
@@ -2239,15 +2238,6 @@
JK_TRACE_ENTER(conf-log);
-/* Set default connection cache size for worker mpm */
-#if APR_HAS_THREADS
-#ifndef AS400
-ap_mpm_query(AP_MPMQ_MAX_THREADS, mpm_threads);
-#endif
-#endif
-if (mpm_threads 0)
-jk_set_worker_def_cache_size(mpm_threads);
-
if ((rc = jk_shm_attach(jk_shm_file)) == 0) {
if (JK_IS_DEBUG_LEVEL(conf-log))
jk_log(conf-log, JK_LOG_DEBUG, Attached shm:%s,
@@ -2277,10 +2267,11 @@
server_rec * s)
{
int rc;
+int mpm_threads = 1;
+
/* jk_map_t *init_map = NULL; */
jk_map_t *init_map = conf-worker_properties;
-;
if ((rc = jk_shm_open(jk_shm_file)) == 0) {
if (JK_IS_DEBUG_LEVEL(conf-log))
jk_log(conf-log, JK_LOG_DEBUG, Initialized shm:%s,
@@ -2292,6 +2283,15 @@
jk_log(conf-log, JK_LOG_ERROR, Initializing shm:%s errno=%d,
jk_shm_name(), rc);
+/* Set default connection cache size for worker mpm */
+#if APR_HAS_THREADS
+#ifndef AS400
+if (ap_mpm_query(AP_MPMQ_MAX_THREADS, mpm_threads) != APR_SUCCESS)
+mpm_threads = 1;
+#endif
+#endif
+ jk_set_worker_def_cache_size(mpm_threads);
+
if (!uri_worker_map_alloc((conf-uw_map),
conf-uri_to_context,
conf-log)) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/07 11:07:38
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Use new shmem api that uses single instance shared memory.
Revision ChangesPath
1.121 +23 -18jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- mod_jk.c 6 Feb 2005 13:30:34 - 1.120
+++ mod_jk.c 7 Feb 2005 19:07:38 - 1.121
@@ -190,7 +190,6 @@
static jk_worker_env_t worker_env;
static apr_global_mutex_t *jk_log_lock = NULL;
static char *jk_shm_file = NULL;
-static jk_shm_t jk_shmem = { 0, NULL, -1, NULL, 0};
static int JK_METHOD ws_start_response(jk_ws_service_t *s,
int status,
@@ -1670,10 +1669,11 @@
*/
apr_status_t jk_cleanup_shmem(void *data)
{
-if (jk_shmem.base) {
-jk_shm_close(jk_shmem);
-jk_shmem.base = NULL;
-}
+jk_logger_t *l = data;
+jk_shm_close();
+if (l JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG, Shmem cleanup);
+
return 0;
}
@@ -2248,14 +2248,16 @@
if (mpm_threads 0)
jk_set_worker_def_cache_size(mpm_threads);
-rc = jk_shm_attach(jk_shm_file, 0, 0, jk_shmem);
-if (JK_IS_DEBUG_LEVEL(conf-log))
-jk_log(conf-log, JK_LOG_DEBUG, Attached shm:%s with status %d,
- jk_shmem.filename, rc);
-if (!rc) {
-apr_pool_cleanup_register(pconf, s, jk_cleanup_shmem,
+if ((rc = jk_shm_attach(jk_shm_file)) == 0) {
+if (JK_IS_DEBUG_LEVEL(conf-log))
+jk_log(conf-log, JK_LOG_DEBUG, Attached shm:%s,
+ jk_shm_name());
+apr_pool_cleanup_register(pconf, conf-log, jk_cleanup_shmem,
jk_cleanup_shmem);
}
+else
+jk_log(conf-log, JK_LOG_ERROR, Attachning shm:%s errno=%d,
+ jk_shm_name(), rc);
if (JK_IS_DEBUG_LEVEL(conf-log))
jk_log(conf-log, JK_LOG_DEBUG, Initialized %s,
JK_EXPOSED_VERSION);
@@ -2278,14 +2280,17 @@
/* jk_map_t *init_map = NULL; */
jk_map_t *init_map = conf-worker_properties;
-rc = jk_shm_open(jk_shm_file, 0, 0, jk_shmem);
-if (JK_IS_DEBUG_LEVEL(conf-log))
-jk_log(conf-log, JK_LOG_DEBUG, Initialized shm:%s with status %d,
- jk_shmem.filename, rc);
-if (!rc) {
-apr_pool_cleanup_register(pconf, s, jk_cleanup_shmem,
+;
+if ((rc = jk_shm_open(jk_shm_file)) == 0) {
+if (JK_IS_DEBUG_LEVEL(conf-log))
+jk_log(conf-log, JK_LOG_DEBUG, Initialized shm:%s,
+ jk_shm_name(), rc);
+apr_pool_cleanup_register(pconf, conf-log, jk_cleanup_shmem,
jk_cleanup_shmem);
}
+else
+jk_log(conf-log, JK_LOG_ERROR, Initializing shm:%s errno=%d,
+ jk_shm_name(), rc);
if (!uri_worker_map_alloc((conf-uw_map),
conf-uri_to_context,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/06 01:33:15
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Initialize log file before initializing JK, so that we can see error
messages if config has errors.
Revision ChangesPath
1.117 +74 -73jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- mod_jk.c 5 Feb 2005 12:41:17 - 1.116
+++ mod_jk.c 6 Feb 2005 09:33:15 - 1.117
@@ -56,7 +56,7 @@
/* 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
@@ -104,7 +104,7 @@
/*
* If you are not using SSL, comment out the following line. It will make
- * apache run faster.
+ * apache run faster.
*
* Personally, I (DM), think this may be a lie.
*/
@@ -296,7 +296,7 @@
if (rv = ap_change_request_body_xlate(p-r, 65535, 65535)) {
/* turn off request body translation */
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,
NULL,
- mod_jk: Error on ap_change_request_body_xlate,
rc=%d \n,
+ mod_jk: Error on ap_change_request_body_xlate,
rc=%d,
rv);
return JK_FALSE;
}
@@ -350,7 +350,7 @@
if (!p-response_started) {
if (JK_IS_DEBUG_LEVEL(main_log))
jk_log(main_log, JK_LOG_DEBUG,
- Write without start, starting with defaults\n);
+ Write without start, starting with defaults);
if (!s-start_response(s, 200, NULL, NULL, NULL, 0)) {
return JK_FALSE;
}
@@ -366,7 +366,7 @@
if (rc) {
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,
NULL,
- mod_jk: Error on
ap_change_response_body_xlate, rc=%d \n,
+ mod_jk: Error on
ap_change_response_body_xlate, rc=%d,
rc);
return JK_FALSE;
}
@@ -377,7 +377,7 @@
size_t toSend = (ll CHUNK_SIZE) ? CHUNK_SIZE : ll;
r = ap_rwrite((const char *)bb, toSend, p-r);
jk_log(main_log, JK_LOG_DEBUG,
- writing %ld (%ld) out of %ld \n, toSend, r, ll);
+ writing %ld (%ld) out of %ld, toSend, r, ll);
ll -= CHUNK_SIZE;
bb += CHUNK_SIZE;
@@ -393,7 +393,7 @@
#ifndef AS400
if (ap_rflush(p-r) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,
- NULL, mod_jk: Error flushing \n);
+ NULL, mod_jk: Error flushing);
return JK_FALSE;
}
#endif
@@ -480,7 +480,7 @@
*/
if (JK_IS_DEBUG_LEVEL(conf-log))
jk_log(conf-log, JK_LOG_DEBUG,
- agsp=%u agsn=%s hostn=%s shostn=%s cbsport=%d sport=%d
claport=%d\n,
+ agsp=%u agsn=%s hostn=%s shostn=%s cbsport=%d sport=%d
claport=%d,
ap_get_server_port(r),
ap_get_server_name(r) != NULL ? ap_get_server_name(r) : ,
r-hostname != NULL ? r-hostname : ,
@@ -556,7 +556,7 @@
s-is_ssl = JK_FALSE;
s-ssl_cert = NULL;
s-ssl_cert_len = 0;
-s-ssl_cipher = NULL; /* required by Servlet 2.3 Api,
+s-ssl_cipher = NULL; /* required by Servlet 2.3 Api,
allready in original ajp13 */
s-ssl_session = NULL;
s-ssl_key_size = -1; /* required by Servlet 2.3 Api, added in jtc
*/
@@ -730,7 +730,7 @@
else {
if (worker == NULL)
return JkMount needs a path when not defined in a location;
-else
+else
return JkMount can not have a path when defined in a location;
}
@@ -773,7 +773,7 @@
else {
if (worker == NULL)
return JkUnMount needs a path when not defined in a location;
-else
+else
return JkUnMount can not have a path when defined in a
location;
}
@@ -1244,8 +1244,8 @@
* JkRequestLogFormat format string
*
* %b - Bytes sent, excluding HTTP headers. In CLF format
- * %B - Bytes sent, excluding HTTP headers.
- * %H - The request protocol
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/06 03:21:38
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Initialize shared memory and attach in child process.
Revision ChangesPath
1.118 +57 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- mod_jk.c 6 Feb 2005 09:33:15 - 1.117
+++ mod_jk.c 6 Feb 2005 11:21:37 - 1.118
@@ -95,6 +95,7 @@
#include jk_uri_worker_map.h
#include jk_util.h
#include jk_worker.h
+#include jk_shm.h
#define JK_WORKER_ID(jakarta.worker)
#define JK_HANDLER (jakarta-servlet)
@@ -188,6 +189,8 @@
static jk_logger_t *main_log = NULL;
static jk_worker_env_t worker_env;
static apr_global_mutex_t *jk_log_lock = NULL;
+static char *jk_shm_file = NULL;
+static jk_shm_t jk_shmem = { 0, NULL, -1, NULL, 0};
static int JK_METHOD ws_start_response(jk_ws_service_t *s,
int status,
@@ -867,6 +870,23 @@
}
/*
+ * JkShmFile Directive Handling
+ *
+ * JkShmFile file
+ */
+
+static const char *jk_set_shm_file(cmd_parms * cmd,
+ void *dummy, const char *shm_file)
+{
+/* we need an absolute path */
+jk_shm_file = ap_server_root_relative(cmd-pool, shm_file);
+if (jk_shm_file == NULL)
+return JkShmFile file name invalid;
+
+return NULL;
+}
+
+/*
* JkLogLevel Directive Handling
*
* JkLogLevel debug/info/error/emerg
@@ -1557,6 +1577,10 @@
*/
AP_INIT_TAKE1(JkLogFile, jk_set_log_file, NULL, RSRC_CONF,
Full path to the Jakarta Tomcat module log file),
+
+AP_INIT_TAKE1(JkShmFile, jk_set_shm_file, NULL, RSRC_CONF,
+ Full path to the Jakarta Tomcat module shared memory
file),
+
AP_INIT_TAKE1(JkLogLevel, jk_set_log_level, NULL, RSRC_CONF,
The Jakarta Tomcat module log level, can be debug,
info, error or emerg),
@@ -1642,6 +1666,17 @@
return 0;
}
+/** Util - cleanup shmem.
+ */
+apr_status_t jk_cleanup_shmem(void *data)
+{
+if (jk_shmem.base) {
+jk_shm_close(jk_shmem);
+jk_shmem.base = NULL;
+}
+return 0;
+}
+
/** Main service method, called to forward a request to tomcat
*/
static int jk_handler(request_rec * r)
@@ -2192,6 +2227,7 @@
jk_server_conf_t *conf;
int mpm_threads = 1;
apr_status_t rv;
+int rc;
conf = ap_get_module_config(s-module_config, jk_module);
@@ -2211,6 +2247,16 @@
#endif
if (mpm_threads 0)
jk_set_worker_def_cache_size(mpm_threads);
+
+rc = jk_shm_attach(jk_shm_file, 0, 0, jk_shmem);
+if (JK_IS_DEBUG_LEVEL(conf-log))
+jk_log(conf-log, JK_LOG_DEBUG, Attached shm:%s with status %d,
+ jk_shm_file ? jk_shm_file : memory, rc);
+if (!rc) {
+apr_pool_cleanup_register(pconf, s, jk_cleanup_shmem,
+ jk_cleanup_shmem);
+}
+
if (JK_IS_DEBUG_LEVEL(conf-log))
jk_log(conf-log, JK_LOG_DEBUG, Initialized %s,
JK_EXPOSED_VERSION);
JK_TRACE_EXIT(conf-log);
@@ -2228,9 +2274,19 @@
static void init_jk(apr_pool_t * pconf, jk_server_conf_t * conf,
server_rec * s)
{
+int rc;
/* jk_map_t *init_map = NULL; */
jk_map_t *init_map = conf-worker_properties;
+rc = jk_shm_open(jk_shm_file, 0, 0, jk_shmem);
+if (JK_IS_DEBUG_LEVEL(conf-log))
+jk_log(conf-log, JK_LOG_DEBUG, Initialized shm:%s with status %d,
+ jk_shm_file ? jk_shm_file : memory, rc);
+if (!rc) {
+apr_pool_cleanup_register(pconf, s, jk_cleanup_shmem,
+ jk_cleanup_shmem);
+}
+
if (!uri_worker_map_alloc((conf-uw_map),
conf-uri_to_context,
conf-log)) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/06 03:30:46
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Use shmem name since it can be either true filename or memory.
Revision ChangesPath
1.119 +2 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- mod_jk.c 6 Feb 2005 11:21:37 - 1.118
+++ mod_jk.c 6 Feb 2005 11:30:46 - 1.119
@@ -2251,7 +2251,7 @@
rc = jk_shm_attach(jk_shm_file, 0, 0, jk_shmem);
if (JK_IS_DEBUG_LEVEL(conf-log))
jk_log(conf-log, JK_LOG_DEBUG, Attached shm:%s with status %d,
- jk_shm_file ? jk_shm_file : memory, rc);
+ jk_shmem.filename, rc);
if (!rc) {
apr_pool_cleanup_register(pconf, s, jk_cleanup_shmem,
jk_cleanup_shmem);
@@ -2281,7 +2281,7 @@
rc = jk_shm_open(jk_shm_file, 0, 0, jk_shmem);
if (JK_IS_DEBUG_LEVEL(conf-log))
jk_log(conf-log, JK_LOG_DEBUG, Initialized shm:%s with status %d,
- jk_shm_file ? jk_shm_file : memory, rc);
+ jk_shmem.filename, rc);
if (!rc) {
apr_pool_cleanup_register(pconf, s, jk_cleanup_shmem,
jk_cleanup_shmem);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/05 04:41:17
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Re-open a global log mutex lock in a child process.
From APR documentation:
This function must be called to maintain portability, even
if the underlying lock mechanism does not require it.
Revision ChangesPath
1.116 +8 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- mod_jk.c 12 Jan 2005 17:23:11 - 1.115
+++ mod_jk.c 5 Feb 2005 12:41:17 - 1.116
@@ -2189,9 +2189,16 @@
{
jk_server_conf_t *conf;
int mpm_threads = 1;
+apr_status_t rv;
conf = ap_get_module_config(s-module_config, jk_module);
+rv = apr_global_mutex_child_init(jk_log_lock, NULL, pconf);
+if (rv != APR_SUCCESS) {
+ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
+ mod_jk: could not init JK log lock in child);
+}
+
JK_TRACE_ENTER(conf-log);
/* Set default connection cache size for worker mpm */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
glenn 2005/01/12 09:23:11
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Fix a bug where a mod_dir sub-request was not being handled.
apr_filepath_name_get() would return an empty string rather than
a NULL pointer.
PS: Thanks for the recent work on mod_jk.
Revision ChangesPath
1.115 +3 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- mod_jk.c 7 Jan 2005 09:55:33 - 1.114
+++ mod_jk.c 12 Jan 2005 17:23:11 - 1.115
@@ -2530,7 +2530,8 @@
/* Only if sub-request for a directory, most likely from mod_dir */
if (r-main r-main-filename
-!apr_filepath_name_get(r-main-filename)) {
+(!apr_filepath_name_get(r-main-filename) ||
+ !strlen(apr_filepath_name_get(r-main-filename {
/* The filename from the main request will be set to what should
* be picked up, aliases included. Tomcat will need to know about
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
hgomez 2005/01/07 01:55:33 Modified:jk/native/apache-2.0 mod_jk.c Log: the iSeries version of Apache 2 didn't support yet MPM ;( Revision ChangesPath 1.114 +6 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- mod_jk.c 17 Dec 2004 18:08:52 - 1.113 +++ mod_jk.c 7 Jan 2005 09:55:33 - 1.114 @@ -38,7 +38,10 @@ #include http_main.h #include http_log.h #include util_script.h + +#ifndef AS400 #include ap_mpm.h +#endif #ifdef AS400 #include ap_charset.h @@ -2193,7 +2196,9 @@ /* Set default connection cache size for worker mpm */ #if APR_HAS_THREADS +#ifndef AS400 ap_mpm_query(AP_MPMQ_MAX_THREADS, mpm_threads); +#endif #endif if (mpm_threads 0) jk_set_worker_def_cache_size(mpm_threads); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
[EMAIL PROTECTED] wrote: + +#ifndef AS400 #include ap_mpm.h +#endif That's wrong IMO. Look at the Apache modules: mod_mem_cache mod_cgid mod_cgid mod_info mod_status mod_ssl They all have '#include ap_mpm.h' So, I suppose that's something wrong with your apache build not the way how this file should be included. If the file is not present inside apache/include distribution, then it's apache build error, that we shoudn't fixed like you did thought. Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.dsp
mturk 2004/12/23 06:20:44 Modified:jk/native/apache-1.3 mod_jk.dsp jk/native/apache-2.0 mod_jk.dsp Log: Fix the output module name for Debug build. It's mod_jk.so not mod_jk2.so, Probably a copy/paste error. Revision ChangesPath 1.7 +1 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp Index: mod_jk.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_jk.dsp23 Dec 2004 13:28:00 - 1.6 +++ mod_jk.dsp23 Dec 2004 14:20:44 - 1.7 @@ -79,7 +79,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ApacheCore.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:0x6A6B /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:Debug/mod_jk2.so /libpath:$(APACHE1_HOME)\libexec /libpath:$(APACHE1_HOME)\src\CoreD /libpath:$(APACHE1_HOME)\src\Debug +# ADD LINK32 ApacheCore.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:0x6A6B /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:Debug/mod_jk.so /libpath:$(APACHE1_HOME)\libexec /libpath:$(APACHE1_HOME)\src\CoreD /libpath:$(APACHE1_HOME)\src\Debug !ENDIF 1.8 +1 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp Index: mod_jk.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_jk.dsp23 Dec 2004 13:28:00 - 1.7 +++ mod_jk.dsp23 Dec 2004 14:20:44 - 1.8 @@ -79,7 +79,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /base:0x6A6B /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:Debug/mod_jk2.so /libpath:$(APACHE2_HOME)/Debug /libpath:$(APACHE2_HOME)\srclib\apr\Debug /libpath:$(APACHE2_HOME)\srclib\apr-util\Debug /libpath:$(APACHE2_HOME)\lib +# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /base:0x6A6B /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:Debug/mod_jk.so /libpath:$(APACHE2_HOME)/Debug /libpath:$(APACHE2_HOME)\srclib\apr\Debug /libpath:$(APACHE2_HOME)\srclib\apr-util\Debug /libpath:$(APACHE2_HOME)\lib !ENDIF - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Wait - you mean to tell me instead of converting the hostname
once to lower - we are strcasecmp'ing every time? Outch, that
hurts.
Bill
At 09:14 PM 12/16/2004, [EMAIL PROTECTED] wrote:
billbarker2004/12/16 19:14:56
Modified:jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Now that the SC lookup is case-insensitive, don't waste cycles converting
the header names to lower case
Revision ChangesPath
1.60 +2 -6 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- mod_jk.c 13 Dec 2004 09:11:24 - 1.59
+++ mod_jk.c 17 Dec 2004 03:14:56 - 1.60
@@ -592,12 +592,8 @@
char *hname = ap_pstrdup(r-pool, elts[i].key);
s-headers_values[i] = ap_pstrdup(r-pool, elts[i].val);
s-headers_names[i] = hname;
-while (*hname) {
-*hname = tolower(*hname);
-hname++;
-}
if (need_content_length_header
-!strncmp(s-headers_values[i], content-length, 14)) {
+!strcasecmp(s-headers_values[i], content-length)) {
need_content_length_header = JK_FALSE;
}
}
1.110 +2 -6 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mod_jk.c 13 Dec 2004 09:10:31 - 1.109
+++ mod_jk.c 17 Dec 2004 03:14:56 - 1.110
@@ -636,12 +636,8 @@
char *hname = apr_pstrdup(r-pool, elts[i].key);
s-headers_values[i] = apr_pstrdup(r-pool, elts[i].val);
s-headers_names[i] = hname;
-while (*hname) {
-*hname = tolower(*hname);
-hname++;
-}
if (need_content_length_header
-!strncmp(s-headers_values[i], content-length, 14)) {
+!strcasecmp(s-headers_values[i], content-length)) {
need_content_length_header = JK_FALSE;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
- Original Message -
From: William A. Rowe, Jr. [EMAIL PROTECTED]
To: Tomcat Developers List tomcat-dev@jakarta.apache.org
Sent: Wednesday, December 22, 2004 9:54 PM
Subject: Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0
mod_jk.c
Wait - you mean to tell me instead of converting the hostname
once to lower - we are strcasecmp'ing every time? Outch, that
hurts.
This is nothing to do with the hostname. It's the header names only (not
the values). And it has to be cheaper than converting the name once to
lower and then again to upper later in the code (which is what the change
was in response to :). Choosing a case and sticking to it would probably be
a nice idea for 1.2.9 however.
Actually, AFAIK the entire need_content_length_header logic is obsolete with
the current released versions of Tomcat. If we wanted to drop support for
old versions, we wouldn't need this particular strcasecmp at all.
Host name parsing is done with the usual per-VirtualHost config.
Bill
At 09:14 PM 12/16/2004, [EMAIL PROTECTED] wrote:
billbarker2004/12/16 19:14:56
Modified:jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Now that the SC lookup is case-insensitive, don't waste cycles
converting the header names to lower case
Revision ChangesPath
1.60 +2 -6
jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- mod_jk.c 13 Dec 2004 09:11:24 - 1.59
+++ mod_jk.c 17 Dec 2004 03:14:56 - 1.60
@@ -592,12 +592,8 @@
char *hname = ap_pstrdup(r-pool, elts[i].key);
s-headers_values[i] = ap_pstrdup(r-pool,
elts[i].val);
s-headers_names[i] = hname;
-while (*hname) {
-*hname = tolower(*hname);
-hname++;
-}
if (need_content_length_header
-!strncmp(s-headers_values[i], content-length,
14)) {
+!strcasecmp(s-headers_values[i],
content-length)) {
need_content_length_header = JK_FALSE;
}
}
1.110 +2 -6
jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mod_jk.c 13 Dec 2004 09:10:31 - 1.109
+++ mod_jk.c 17 Dec 2004 03:14:56 - 1.110
@@ -636,12 +636,8 @@
char *hname = apr_pstrdup(r-pool, elts[i].key);
s-headers_values[i] = apr_pstrdup(r-pool,
elts[i].val);
s-headers_names[i] = hname;
-while (*hname) {
-*hname = tolower(*hname);
-hname++;
-}
if (need_content_length_header
-!strncmp(s-headers_values[i], content-length,
14)) {
+!strcasecmp(s-headers_values[i],
content-length)) {
need_content_length_header = JK_FALSE;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
This message is intended only for the use of the person(s) listed above as
the intended recipient(s), and may contain information that is PRIVILEGED and
CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or
distribute this message or any attachment. If you received this communication
in error, please notify us immediately by e-mail and then delete all copies of
this message and any attachments.
In addition you should be aware that ordinary (unencrypted) e-mail sent through
the Internet is not secure. Do not send confidential or sensitive information,
such as social security numbers, account numbers, personal identification
numbers and passwords, to us via ordinary (unencrypted) e-mail.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2004/12/17 00:28:20
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Query mpm to obtain the real default cache size.
Revision ChangesPath
1.111 +13 -5 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- mod_jk.c 17 Dec 2004 03:14:56 - 1.110
+++ mod_jk.c 17 Dec 2004 08:28:20 - 1.111
@@ -38,6 +38,7 @@
#include http_main.h
#include http_log.h
#include util_script.h
+#include ap_mpm.h
#ifdef AS400
#include ap_charset.h
@@ -1851,9 +1852,9 @@
JK_TRACE_EXIT(xconf-log);
return r-status;
}
-jk_log(xconf-log, JK_LOG_INFO, Service returned error=%d
+jk_log(xconf-log, JK_LOG_DEBUG, Service finished
with status=%d for worker=%s\n,
- rc, r-status, worker_name);
+ r-status, worker_name);
JK_TRACE_EXIT(xconf-log);
return OK; /* NOT r-status, even if it has changed. */
}
@@ -2179,9 +2180,18 @@
static void jk_child_init(apr_pool_t * pconf, server_rec * s)
{
jk_server_conf_t *conf;
+int mpm_threads = 1;
+
conf = ap_get_module_config(s-module_config, jk_module);
+
JK_TRACE_ENTER(conf-log);
+/* Set default connection cache size for worker mpm */
+#if APR_HAS_THREADS
+ap_mpm_query(AP_MPMQ_MAX_THREADS, mpm_threads);
+#endif
+if (mpm_threads 0)
+jk_set_worker_def_cache_size(mpm_threads);
jk_log(conf-log, JK_LOG_DEBUG, Initialized %s\n, JK_EXPOSED_VERSION);
JK_TRACE_EXIT(conf-log);
}
@@ -2224,9 +2234,7 @@
worker_env.server_name = (char *)ap_get_server_version();
if (wc_open(init_map, worker_env, conf-log)) {
ap_add_version_component(pconf, JK_EXPOSED_VERSION);
-return;
}
-return;
}
static int jk_post_config(apr_pool_t * pconf,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2004/12/17 10:08:52
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Remove duplicating uri because map_uri now properly reverts the
changes made when jsessionid is found.
Revision ChangesPath
1.113 +2 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- mod_jk.c 17 Dec 2004 14:58:37 - 1.112
+++ mod_jk.c 17 Dec 2004 18:08:52 - 1.113
@@ -1701,8 +1701,7 @@
worker_env.num_of_workers);
}
else {
-char *uri = apr_pstrdup(r-pool, r-uri);
-worker_name = map_uri_to_worker(xconf-uw_map, uri, xconf-log);
+worker_name = map_uri_to_worker(xconf-uw_map, r-uri,
xconf-log);
if (worker_name == NULL)
worker_name = worker_env.first_worker;
if (JK_IS_DEBUG_LEVEL(xconf-log))
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
- Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Friday, December 17, 2004 10:08 AM Subject: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c mturk 2004/12/17 10:08:52 Modified:jk/native/apache-2.0 mod_jk.c Log: Remove duplicating uri because map_uri now properly reverts the changes made when jsessionid is found. This is a very big -1. map_uri_to_worker is going to modify the uri that gets passed in, so it absolutely *must* be duped. This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Bill Barker wrote:
Remove duplicating uri because map_uri now properly reverts the
changes made when jsessionid is found.
This is a very big -1. map_uri_to_worker is going to modify the uri that
gets passed in, so it absolutely *must* be duped.
Yes, but it will revert the changes made.
It's like:
void test(char *str)
{
char save = str[2];
str[2] = '\0';
...
str[2] = save;
}
char some_string[] = abcd;
test(some_string);
After the call it will still be like before.
Since the call to 'test(some_string)' is assured to be thread safe,
why dupping that string and then releasing it after the call?
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 Makefile.in
billbarker2004/12/17 19:49:04
Modified:jk/native/apache-2.0 Makefile.in
Log:
Fix build for --with-apache=/path/to/apache-src
Reported By: Gump [EMAIL PROTECTED]
Revision ChangesPath
1.16 +1 -0
jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in
Index: Makefile.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 9 Sep 2002 15:35:49 - 1.15
+++ Makefile.in 18 Dec 2004 03:49:04 - 1.16
@@ -8,6 +8,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
# Defaults
libexecdir=${APACHE_DIR}/modules
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
billbarker2004/12/16 19:14:56
Modified:jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Now that the SC lookup is case-insensitive, don't waste cycles converting the
header names to lower case
Revision ChangesPath
1.60 +2 -6 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- mod_jk.c 13 Dec 2004 09:11:24 - 1.59
+++ mod_jk.c 17 Dec 2004 03:14:56 - 1.60
@@ -592,12 +592,8 @@
char *hname = ap_pstrdup(r-pool, elts[i].key);
s-headers_values[i] = ap_pstrdup(r-pool, elts[i].val);
s-headers_names[i] = hname;
-while (*hname) {
-*hname = tolower(*hname);
-hname++;
-}
if (need_content_length_header
-!strncmp(s-headers_values[i], content-length, 14)) {
+!strcasecmp(s-headers_values[i], content-length)) {
need_content_length_header = JK_FALSE;
}
}
1.110 +2 -6 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mod_jk.c 13 Dec 2004 09:10:31 - 1.109
+++ mod_jk.c 17 Dec 2004 03:14:56 - 1.110
@@ -636,12 +636,8 @@
char *hname = apr_pstrdup(r-pool, elts[i].key);
s-headers_values[i] = apr_pstrdup(r-pool, elts[i].val);
s-headers_names[i] = hname;
-while (*hname) {
-*hname = tolower(*hname);
-hname++;
-}
if (need_content_length_header
-!strncmp(s-headers_values[i], content-length, 14)) {
+!strcasecmp(s-headers_values[i], content-length)) {
need_content_length_header = JK_FALSE;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2004/12/13 01:10:31
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Add more logging.
Revision ChangesPath
1.109 +59 -30jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- mod_jk.c 12 Dec 2004 15:14:59 - 1.108
+++ mod_jk.c 13 Dec 2004 09:10:31 - 1.109
@@ -1653,7 +1653,6 @@
* if they are directory requests, in case there are no static files
* visible to Apache and/or DirectoryIndex was not used. This is only
* used when JkOptions has ForwardDirectories set. */
-
/* Not for me, try next handler */
if (strcmp(r-handler, JK_HANDLER)
(dmt = strcmp(r-handler, DIR_MAGIC_TYPE)))
@@ -1662,22 +1661,26 @@
xconf =
(jk_server_conf_t *) ap_get_module_config(r-server-module_config,
jk_module);
+JK_TRACE_ENTER(xconf-log);
if (apr_table_get(r-subprocess_env, no-jk)) {
jk_log(xconf-log, JK_LOG_DEBUG,
Into handler no-jk env var detected for uri=%s, declined\n,
r-uri);
+JK_TRACE_EXIT(xconf-log);
return DECLINED;
}
/* Was the option to forward directories to Tomcat set? */
-if (!dmt !(xconf-options JK_OPT_FWDDIRS))
+if (!dmt !(xconf-options JK_OPT_FWDDIRS)) {
+JK_TRACE_EXIT(xconf-log);
return DECLINED;
-
+}
worker_name = apr_table_get(r-notes, JK_WORKER_ID);
/* Set up r-read_chunked flags for chunked encoding, if present */
if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) !=
APR_SUCCESS) {
+JK_TRACE_EXIT(xconf-log);
return rc;
}
@@ -1708,15 +1711,19 @@
}
}
-jk_log(xconf-log, JK_LOG_DEBUG, Into handler r-proxyreq=%d
- r-handler=%s r-notes=%d worker=%s\n,
- r-proxyreq, r-handler, r-notes, worker_name);
+jk_log(xconf-log, JK_LOG_DEBUG, Into handler %s worker=%s
+r-proxyreq=%d\n,
+ r-handler, worker_name, r-proxyreq);
conf = (jk_server_conf_t *)
ap_get_module_config(r-server-module_config,
jk_module);
/* If this is a proxy request, we'll notify an error */
if (r-proxyreq) {
+jk_log(xconf-log, JK_LOG_INFO, Proxy request for worker=%s
+ is not allowed\n,
+ worker_name);
+JK_TRACE_EXIT(xconf-log);
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -1739,6 +1746,10 @@
/* If the remote client has aborted, just ignore the request */
if (r-connection-aborted) {
+jk_log(xconf-log, JK_LOG_INFO, Client connection aborted for
+worker=%s\n,
+ worker_name);
+JK_TRACE_EXIT(xconf-log);
return OK;
}
@@ -1775,24 +1786,9 @@
how to deal with load balancing - but it's usefull for JNI
*/
-/* Disable re-use for now since the following code is currently platform
specific */
-/* #ifdef REUSE_WORKER
-apr_pool_t *rpool=r-pool;
-apr_pool_t *parent_pool= apr_pool_get_parent( rpool );
-apr_pool_t *tpool= apr_pool_get_parent( parent_pool );
-
-apr_pool_userdata_get( (void **)end, jk_thread_endpoint, tpool );
-if(end==NULL ) {
-worker-get_endpoint(worker, end, xconf-log);
-apr_pool_userdata_set( end , jk_thread_endpoint,
- jk_cleanup_endpoint, tpool );
-}
-#else */
/* worker-get_endpoint might fail if we are out of memory
so check */
/* and handle it */
-if (worker-get_endpoint(worker, end, xconf-log))
-/* #endif */
-{
+if (worker-get_endpoint(worker, end, xconf-log)) {
int is_recoverable_error = JK_FALSE;
rc = end-service(end, s, xconf-log,
is_recoverable_error);
@@ -1814,15 +1810,22 @@
}
}
}
-
-/* #ifndef REUSE_WORKER */
end-done(end, xconf-log);
-/* #endif */
}
-else/* this means we couldn't get an endpoint */
-rc = 0; /* just to make sure that we know we've
failed */
+else {/* this means we couldn't get an endpoint
*/
+jk_log(xconf-log
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2004/12/12 07:14:59
Modified:jk/native/apache-2.0 mod_jk.c
Log:
The stupid CRLF's are constantly emerging. Remove them.
Revision ChangesPath
1.108 +9 -9 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mod_jk.c 7 Dec 2004 13:46:55 - 1.107
+++ mod_jk.c 12 Dec 2004 15:14:59 - 1.108
@@ -717,7 +717,7 @@
jk_module);
const char *c, *w;
-if (worker != NULL cmd-path == NULL ) {
+if (worker != NULL cmd-path == NULL ) {
c = context;
w = worker;
}
@@ -726,9 +726,9 @@
w = context;
}
else {
-if (worker == NULL)
-return JkMount needs a path when not defined in a location;
-else
+if (worker == NULL)
+return JkMount needs a path when not defined in a location;
+else
return JkMount can not have a path when defined in a location;
}
@@ -760,7 +760,7 @@
char *uri;
const char *c, *w;
-if (worker != NULL cmd-path == NULL ) {
+if (worker != NULL cmd-path == NULL ) {
c = context;
w = worker;
}
@@ -769,9 +769,9 @@
w = context;
}
else {
-if (worker == NULL)
-return JkUnMount needs a path when not defined in a location;
-else
+if (worker == NULL)
+return JkUnMount needs a path when not defined in a location;
+else
return JkUnMount can not have a path when defined in a
location;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 NWGNUmakefile
mturk 2004/12/09 00:16:44 Modified:jk/native/apache-2.0 NWGNUmakefile Log: Remove CRLF line endings. We should realy consider moving to SVN ... Revision ChangesPath 1.4 +3 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile Index: NWGNUmakefile === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- NWGNUmakefile 2 Dec 2004 14:57:52 - 1.3 +++ NWGNUmakefile 9 Dec 2004 08:16:44 - 1.4 @@ -39,9 +39,9 @@ $(AP_WORK)/include \ $(NWOS) \ $(AP_WORK)/modules/arch/netware \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ + $(APR)/include \ + $(APRUTIL)/include \ + $(APR) \ $(JAVA_HOME)/include \ $(JAVA_HOME)/include/netware \ $(EOLIST) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2004/12/04 04:11:58
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Use ap_get_server_port instead r-connection-local_addr-port.
This was the original behavior changed in the CVS without real
explanation why it was changed.
Revision ChangesPath
1.106 +22 -76jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- mod_jk.c 2 Dec 2004 06:50:01 - 1.105
+++ mod_jk.c 4 Dec 2004 12:11:58 - 1.106
@@ -470,27 +470,31 @@
s-remote_host = NULL_FOR_EMPTY(s-remote_host);
s-remote_addr = NULL_FOR_EMPTY(r-connection-remote_ip);
+/* Dump all connection param so we can trace what's going to
+ * the remote tomcat
+ */
jk_log(conf-log, JK_LOG_DEBUG,
- agsp=%u agsn=%s hostn=%s shostn=%s cbsport=%d sport=%d \n,
+ agsp=%u agsn=%s hostn=%s shostn=%s cbsport=%d sport=%d
claport=%d\n,
ap_get_server_port(r),
ap_get_server_name(r) != NULL ? ap_get_server_name(r) : ,
r-hostname != NULL ? r-hostname : ,
r-server-server_hostname !=
NULL ? r-server-server_hostname : ,
- r-connection-base_server-port, r-server-port);
+ r-connection-base_server-port, r-server-port,
+ r-connection-local_addr-port);
/* get server name */
-/* s-server_name= (char *)(r-hostname ? r-hostname :
r-server-server_hostname); */
-/* XXX : à la jk2 */
s-server_name = (char *)ap_get_server_name(r);
/* get the real port (otherwise redirect failed) */
-s-server_port = r-connection-local_addr-port;
-/* XXX : à la jk2 ??? */
-/* s-server_port = ap_get_server_port(r); */
+/* XXX: use apache API for getting server port
+ *
+ * Pre 1.2.7 versions used:
+ * s-server_port = r-connection-local_addr-port;
+ */
+s-server_port = ap_get_server_port(r);
s-server_software = (char *)ap_get_server_version();
-
s-method = (char *)r-method;
s-content_length = get_content_length(r);
s-is_chunked = r-read_chunked;
@@ -714,7 +718,7 @@
char *old;
const char *c, *w;
-if (worker != NULL cmd-path == NULL ) {
+if (worker != NULL cmd-path == NULL ) {
c = context;
w = worker;
}
@@ -723,9 +727,9 @@
w = context;
}
else {
-if (worker == NULL)
-return JkMount needs a path when not defined in a location;
-else
+if (worker == NULL)
+return JkMount needs a path when not defined in a location;
+else
return JkMount can not have a path when defined in a location;
}
@@ -757,7 +761,7 @@
char *old , *uri;
const char *c, *w;
-if (worker != NULL cmd-path == NULL ) {
+if (worker != NULL cmd-path == NULL ) {
c = context;
w = worker;
}
@@ -766,9 +770,9 @@
w = context;
}
else {
-if (worker == NULL)
-return JkUnMount needs a path when not defined in a location;
-else
+if (worker == NULL)
+return JkUnMount needs a path when not defined in a location;
+else
return JkUnMount can not have a path when defined in a
location;
}
@@ -837,56 +841,6 @@
}
/*
- * JkWorker name value
- * This is an experimental and undocumented extension made in j-t-c/jk.
- */
-static const char *jk_worker_property(cmd_parms * cmd,
- void *dummy,
- const char *name, const char *value)
-{
-server_rec *s = cmd-server;
-char *oldv;
-
-jk_server_conf_t *conf =
-(jk_server_conf_t *) ap_get_module_config(s-module_config,
- jk_module);
-
-jk_map_t *m = conf-worker_properties;
-
-value = jk_map_replace_properties(value, m);
-
-oldv = jk_map_get_string(m, name, NULL);
-
-if (oldv) {
-char *tmpv = apr_palloc(cmd-pool,
-strlen(value) + strlen(oldv) + 3);
-if (tmpv) {
-char sep = '*';
-if (jk_is_path_poperty(name)) {
-sep = PATH_SEPERATOR;
-}
-else if (jk_is_cmd_line_poperty(name)) {
-sep = ' ';
-}
-
-sprintf(tmpv, %s%c%s, oldv, sep, value);
-}
-value = tmpv;
-}
-else {
-value = apr_pstrdup(cmd-pool, value);
-}
-
-if (value
[PATCH] /apache-2.0/NWGNUmakefile
The patch allows mod_jk to build for NetWare with APR existing outside of the httpd/srclib file structure for apache 2.1.x. Could someonecommitthat change tocvs. Thank you, Jean-Jacques --- jk/native/apache-2.0/NWGNUmakefile9 Apr 2004 20:00:18 -1.2+++ jk/native/apache-2.0/NWGNUmakefile1 Dec 2004 22:33:58 -@@ -39,9 +39,9 @@$(AP_WORK)/include \$(NWOS) \$(AP_WORK)/modules/arch/netware \-$(AP_WORK)/srclib/apr/include \-$(AP_WORK)/srclib/apr-util/include \-$(AP_WORK)/srclib/apr \+$(APR)/include \+$(APRUTIL)/include \+$(APR) \$(JAVA_HOME)/include \$(JAVA_HOME)/include/netware \$(EOLIST) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 NWGNUmakefile
mturk 2004/12/02 06:57:52 Modified:jk/native/apache-2.0 NWGNUmakefile Log: The patch allows mod_jk to build for NetWare with APR existing outside of the httpd/srclib file structure for apache 2.1.x. Revision ChangesPath 1.3 +3 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile Index: NWGNUmakefile === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NWGNUmakefile 9 Apr 2004 20:00:18 - 1.2 +++ NWGNUmakefile 2 Dec 2004 14:57:52 - 1.3 @@ -39,9 +39,9 @@ $(AP_WORK)/include \ $(NWOS) \ $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ + $(APR)/include \ + $(APRUTIL)/include \ + $(APR) \ $(JAVA_HOME)/include \ $(JAVA_HOME)/include/netware \ $(EOLIST) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] /apache-2.0/NWGNUmakefile
Jean-Jacques Clar wrote: The patch allows mod_jk to build for NetWare with APR existing outside of the httpd/srclib file structure for apache 2.1.x. Could someone commit that change to cvs. Done. Thank you, Jean-Jacques Thank you :) MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2004/11/30 00:22:47
Modified:jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Allow JkMount and JkUnMount directives to be defined inside
Location and Files sections. This allows security to be implemented
on apache side.
Revision ChangesPath
1.54 +45 -13jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- mod_jk.c 30 Nov 2004 07:30:41 - 1.53
+++ mod_jk.c 30 Nov 2004 08:22:47 - 1.54
@@ -665,20 +665,37 @@
static const char *jk_mount_context(cmd_parms * cmd,
void *dummy,
char *context,
-char *worker, char *maybe_cookie)
+char *worker)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
(jk_server_conf_t *) ap_get_module_config(s-module_config,
jk_module);
char *old;
-if (context[0] != '/')
-return Mount context should start with /;
+const char *c, *w;
+
+if (worker != NULL cmd-path == NULL ) {
+c = context;
+w = worker;
+}
+else if (worker == NULL cmd-path != NULL) {
+c = cmd-path;
+w = context;
+}
+else {
+if (worker == NULL)
+return JkMount needs a path when not defined in a location;
+else
+return JkMount can not have a path when defined in a location;
+}
+
+if (c[0] != '/')
+return JkMount context should start with /;
/*
* Add the new worker to the alias map.
*/
-jk_map_put(conf-uri_to_context, context, worker, (void **)old);
+jk_map_put(conf-uri_to_context, c, w, (void **)old);
return NULL;
}
@@ -691,21 +708,36 @@
static const char *jk_unmount_context(cmd_parms * cmd,
void *dummy,
const char *context,
- const char *worker,
- const char *maybe_cookie)
+ const char *worker)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
(jk_server_conf_t *) ap_get_module_config(s-module_config,
jk_module);
char *old , *uri;
-if (context[0] != '/')
-return Unmount context should start with /;
-uri = ap_pstrcat(cmd-temp_pool, !, context, NULL);
+const char *c, *w;
+
+if (worker != NULL cmd-path == NULL ) {
+c = context;
+w = worker;
+}
+else if (worker == NULL cmd-path != NULL) {
+c = cmd-path;
+w = context;
+}
+else {
+if (worker == NULL)
+return JkUnMount needs a path when not defined in a location;
+else
+return JkUnMount can not have a path when defined in a
location;
+}
+if (c[0] != '/')
+return JkUnMount context should start with /;
+uri = ap_pstrcat(cmd-temp_pool, !, c, NULL);
/*
* Add the new worker to the alias map.
*/
-jk_map_put(conf-uri_to_context, uri, worker, (void **)old);
+jk_map_put(conf-uri_to_context, uri, w, (void **)old);
return NULL;
}
@@ -1453,14 +1485,14 @@
* JkMount mounts a url prefix to a worker (the worker need to be
* defined in the worker properties file.
*/
-{JkMount, jk_mount_context, NULL, RSRC_CONF, TAKE23,
+{JkMount, jk_mount_context, NULL, RSRC_CONF|ACCESS_CONF, TAKE12,
A mount point from a context to a servlet-engine worker},
/*
* JkUnMount unmounts a url prefix to a worker (the worker need to be
* defined in the worker properties file.
*/
-{JkUnMount, jk_unmount_context, NULL, RSRC_CONF, TAKE23,
+{JkUnMount, jk_unmount_context, NULL, RSRC_CONF|ACCESS_CONF, TAKE12,
A no mount point from a context to a servlet-engine worker},
/*
1.103 +47 -14jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- mod_jk.c 30 Nov 2004 07:30:42 - 1.102
+++ mod_jk.c 30 Nov 2004 08:22:47 - 1.103
@@ -705,21 +705,37 @@
static const char *jk_mount_context
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2004/11/30 05:21:57
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Fix compile time warnings about long and remove unused variables.
Revision ChangesPath
1.104 +2 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- mod_jk.c 30 Nov 2004 08:22:47 - 1.103
+++ mod_jk.c 30 Nov 2004 13:21:57 - 1.104
@@ -1882,7 +1882,6 @@
#ifndef NO_GETTIMEOFDAY
if (conf-format != NULL) {
char *duration = NULL;
-char *status = NULL;
long micro, seconds;
gettimeofday(tv_end, NULL);
if (tv_end.tv_usec tv_begin.tv_usec) {
@@ -1891,7 +1890,7 @@
}
micro = tv_end.tv_usec - tv_begin.tv_usec;
seconds = tv_end.tv_sec - tv_begin.tv_sec;
-duration = apr_psprintf(r-pool, %.1d.%.6d, seconds,
micro);
+duration = apr_psprintf(r-pool, %.1ld.%.6ld, seconds,
micro);
apr_table_setn(r-notes, JK_DURATION, duration);
request_log_transaction(r, conf);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2004/11/12 00:24:43
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Added JkWorkerProperty directive that enables omiting
workers.properties file.
For example: JkWorkerProperty worker.ajp13a.port=8009
Revision ChangesPath
1.99 +26 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- mod_jk.c 9 Nov 2004 12:17:43 - 1.98
+++ mod_jk.c 12 Nov 2004 08:24:43 - 1.99
@@ -1473,6 +1473,27 @@
return NULL;
}
+/*
+ * JkWorkerProperty Directive Handling
+ *
+ * JkWorkerProperty name=value
+ */
+
+static const char *jk_set_worker_property(cmd_parms * cmd,
+ void *dummy,
+ const char *line)
+{
+server_rec *s = cmd-server;
+jk_server_conf_t *conf =
+(jk_server_conf_t *) ap_get_module_config(s-module_config,
+ jk_module);
+
+if (jk_map_read_property(conf-worker_properties, line) == JK_FALSE)
+return apr_pstrcat(cmd-temp_pool, Invalid JkWorkerProperty ,
line);
+
+return NULL;
+}
+
static const command_rec jk_cmds[] = {
/*
* JkWorkersFile specifies a full path to the location of the worker
@@ -1583,6 +1604,10 @@
AP_INIT_TAKE2(JkEnvVar, jk_add_env_var, NULL, RSRC_CONF,
Adds a name of environment variable that should be sent
to servlet-engine),
+
+AP_INIT_RAW_ARGS(JkWorkerProperty, jk_set_worker_property,
+ NULL, RSRC_CONF,
+ Set worker.properties directive),
{NULL}
};
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2004/11/12 01:02:04
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Add missing include for unixd, and remove unused vars.
Revision ChangesPath
1.100 +6 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- mod_jk.c 12 Nov 2004 08:24:43 - 1.99
+++ mod_jk.c 12 Nov 2004 09:02:04 - 1.100
@@ -66,6 +66,10 @@
#endif
#include apr_strings.h
+
+#if APR_USE_SYSVSEM_SERIALIZE
+#include unixd.h /* for unixd_set_global_mutex_perms */
+#endif
/*
* Jakarta (jk_) include files
*/
@@ -335,7 +339,6 @@
if (l) {
/* BUFF *bf = p-r-connection-client; */
-size_t w = (size_t) l;
size_t r = 0;
long ll = l;
char *bb = (char *)b;
@@ -1663,7 +1666,7 @@
worker_name = apr_table_get(r-notes, JK_WORKER_ID);
/* Set up r-read_chunked flags for chunked encoding, if present */
-if (rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) {
+if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) !=
APR_SUCCESS) {
return rc;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
hgomez 2004/07/14 05:46:23
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Make use of note, no-jk (a la mod_deflate), to exclude some URL from
being relayed to tomcat even if URL match a JkMount directive.
For instance you could use :
VirtualHost *:80
ServerName testxxx.mysys
DocumentRoot /www/testxxx/htdocs
SetEnvIf Request_URI /home/* no-jk
Alias /home /home/dataxxx/
Directory /home/dataxxx
Options Indexes MultiViews
AllowOverride None
Order allow,deny
Allow from all
/Directory
JkMount /* myssys-xxx
/VirtualHost
With such all requests will be relayed to tomcat worker myssys-xxx
execpt the one containing /home.
Revision ChangesPath
1.95 +22 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- mod_jk.c 10 Mar 2004 12:13:31 - 1.94
+++ mod_jk.c 14 Jul 2004 12:46:23 - 1.95
@@ -1643,6 +1643,12 @@
xconf = (jk_server_conf_t *)ap_get_module_config(r-server-module_config,
jk_module);
+if (apr_table_get(r-subprocess_env, no-jk)) {
+jk_log(xconf-log, JK_LOG_DEBUG, Into handler no-jk env var detected for
uri=%s, declined\n,
+ r-uri);
+
+return DECLINED;
+}
/* Was the option to forward directories to Tomcat set? */
if(!dmt !(xconf-options JK_OPT_FWDDIRS))
@@ -2245,6 +2251,13 @@
return DECLINED;
}
+if (apr_table_get(r-subprocess_env, no-jk)) {
+jk_log(conf-log, JK_LOG_DEBUG, Into translate no-jk env var
detected for uri=%s, declined\n,
+ r-uri);
+
+ return DECLINED;
+}
+
/* Special case to make sure that apache can serve a directory
listing if there are no matches for the DirectoryIndex and
Tomcat webapps are mapped into apache using JkAutoAlias. */
@@ -2393,6 +2406,14 @@
Manually mapped, no need to call uri_to_worker\n);
return DECLINED;
}
+
+if (apr_table_get(r-subprocess_env, no-jk)) {
+jk_log(conf-log, JK_LOG_DEBUG, Into map_to_storage no-jk env var
detected for uri=%s, declined\n,
+r-uri);
+
+return DECLINED;
+}
+
uri = apr_pstrdup(r-pool, r-uri);
worker = map_uri_to_worker(conf-uw_map, uri, conf-log);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25104] - (Apache 2.0.x) mod_jk 1.2.5 ignores -ForwardDirectories
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=25104. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=25104 (Apache 2.0.x) mod_jk 1.2.5 ignores -ForwardDirectories [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2004-06-18 18:42 --- This component is now deprecated. If you still experience this issue, please upgrade to the Coyote JK2 connector. No further work will take place against this bug report. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 NWGNUmakefile
fuankg 2004/04/09 13:00:18 Modified:jk/native2/server/apache2 NWGNUmakefile jk/native/apache-2.0 NWGNUmakefile Log: fix problem with differences between Apache2 build systems of 2.0.x and 2.1.x Revision ChangesPath 1.4 +1 -7 jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile Index: NWGNUmakefile === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- NWGNUmakefile 6 Apr 2004 16:07:58 - 1.3 +++ NWGNUmakefile 9 Apr 2004 20:00:18 - 1.4 @@ -329,13 +329,7 @@ # Any specialized rules here # -$(OBJDIR)/%.o: $(JKCOMMON)/%.c $(OBJDIR)\cc.opt - @echo Compiling $ - $(CC) $(JKCOMMON)/$(F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt - -$(OBJDIR)/%.o: $(JKJNI)/%.c $(OBJDIR)\cc.opt - @echo Compiling $ - $(CC) $(JKJNI)/$(F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt +vpath %.c $(JKCOMMON);$(JKJNI) $(OBJDIR)/version.inc: $(JKINCLUDE)/jk_global.h $(OBJDIR) @echo Creating $@ 1.2 +3 -5 jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile Index: NWGNUmakefile === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NWGNUmakefile 22 Jan 2004 16:42:31 - 1.1 +++ NWGNUmakefile 9 Apr 2004 20:00:18 - 1.2 @@ -145,7 +145,7 @@ # # If this is specified, it will override the default of 64K # -NLM_STACK_SIZE = 32768 +NLM_STACK_SIZE = 49152 # @@ -269,7 +269,7 @@ # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -290,9 +290,7 @@ # Any specialized rules here # -$(OBJDIR)/%.o: $(JKCOMMON)/%.c $(OBJDIR)\cc.opt - @echo Compiling $ - $(CC) $(JKCOMMON)/$(F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt +vpath %.c $(JKCOMMON) $(OBJDIR)/version.inc: $(JKCOMMON)/jk_version.h $(OBJDIR) @echo Creating $@ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
hgomez 2004/03/10 04:13:31 Modified:jk/native/apache-2.0 mod_jk.c Log: Fix a problem with the latest iSeries Apache 2.0.47 Revision ChangesPath 1.94 +10 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- mod_jk.c 24 Feb 2004 08:45:50 - 1.93 +++ mod_jk.c 10 Mar 2004 12:13:31 - 1.94 @@ -38,6 +38,7 @@ #include http_main.h #include http_log.h #include util_script.h + #ifdef AS400 #include ap_charset.h #include util_charset.h /* ap_hdrs_from_ascii */ @@ -50,10 +51,17 @@ #endif /* 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) +(APR_PATCH_VERSION 3) || defined(AS400) #define apr_filepath_name_get apr_filename_of_pathname #endif - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
-Original Message- From: [EMAIL PROTECTED] jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c + #ifdef AS400 #include ap_charset.h #include util_charset.h /* ap_hdrs_from_ascii */ @@ -50,10 +51,17 @@ #endif Is it necessary to conditionally include those two only for AS400? What would happen if they are included always? I'm trying to push out all platform dependent defines as much as possible. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Mladen Turk wrote: -Original Message- From: [EMAIL PROTECTED] jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c + #ifdef AS400 #include ap_charset.h #include util_charset.h /* ap_hdrs_from_ascii */ @@ -50,10 +51,17 @@ #endif Is it necessary to conditionally include those two only for AS400? What would happen if they are included always? I'm trying to push out all platform dependent defines as much as possible. Yes, but EBCDIC porting normaly requires additional conversion and the only way to get them is via #define (mine are #define OSD_POSIX). MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] signature.asc Description: OpenPGP digital signature
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
hgomez 2004/02/24 00:59:10 Modified:webapp/include wa_config.h wa_version.h wa_request.h wa.h wa_main.h webapp/lib wa_request.c pr_warp_network.c pr_info.c Makefile.in pr_warp.h wa_config.c pr_warp.c pr_warp_packet.c wa_main.c pr_warp_socketpool.c pr_warp_config.c Makefile.win webapp/apache-1.3 mod_webapp.c webapp/support wa_version.m4 wa_perl.m4 wa_util.m4 wa_apr.m4 wa_apxs.m4 wa_ant.m4 formatfile.c wa_exec.m4 buildconf.sh webapp CHANGES webapp/apache-2.0 mod_webapp.c Log: Update to Apache License 2.0 Revision ChangesPath 1.7 +16 -57jakarta-tomcat-connectors/webapp/include/wa_config.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/include/wa_config.h.diff?r1=1.6r2=1.7 1.4 +15 -56jakarta-tomcat-connectors/webapp/include/wa_version.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/include/wa_version.h.diff?r1=1.3r2=1.4 1.13 +16 -57jakarta-tomcat-connectors/webapp/include/wa_request.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/include/wa_request.h.diff?r1=1.12r2=1.13 1.17 +16 -57jakarta-tomcat-connectors/webapp/include/wa.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/include/wa.h.diff?r1=1.16r2=1.17 1.8 +16 -57jakarta-tomcat-connectors/webapp/include/wa_main.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/include/wa_main.h.diff?r1=1.7r2=1.8 1.20 +16 -57jakarta-tomcat-connectors/webapp/lib/wa_request.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/wa_request.c.diff?r1=1.19r2=1.20 1.7 +16 -56jakarta-tomcat-connectors/webapp/lib/pr_warp_network.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_warp_network.c.diff?r1=1.6r2=1.7 1.7 +16 -57jakarta-tomcat-connectors/webapp/lib/pr_info.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_info.c.diff?r1=1.6r2=1.7 1.27 +16 -57jakarta-tomcat-connectors/webapp/lib/Makefile.in http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/Makefile.in.diff?r1=1.26r2=1.27 1.10 +16 -56jakarta-tomcat-connectors/webapp/lib/pr_warp.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_warp.h.diff?r1=1.9r2=1.10 1.8 +16 -57jakarta-tomcat-connectors/webapp/lib/wa_config.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/wa_config.c.diff?r1=1.7r2=1.8 1.24 +16 -56jakarta-tomcat-connectors/webapp/lib/pr_warp.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_warp.c.diff?r1=1.23r2=1.24 1.5 +16 -56jakarta-tomcat-connectors/webapp/lib/pr_warp_packet.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_warp_packet.c.diff?r1=1.4r2=1.5 1.12 +16 -57jakarta-tomcat-connectors/webapp/lib/wa_main.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/wa_main.c.diff?r1=1.11r2=1.12 1.2 +15 -55jakarta-tomcat-connectors/webapp/lib/pr_warp_socketpool.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_warp_socketpool.c.diff?r1=1.1r2=1.2 1.10 +16 -56jakarta-tomcat-connectors/webapp/lib/pr_warp_config.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_warp_config.c.diff?r1=1.9r2=1.10 1.5 +16 -57jakarta-tomcat-connectors/webapp/lib/Makefile.win http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/Makefile.win.diff?r1=1.4r2=1.5 1.37 +16 -57jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c.diff?r1=1.36r2=1.37 1.6 +13 -54jakarta-tomcat-connectors/webapp/support/wa_version.m4 http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/support/wa_version.m4.diff?r1=1.5r2=1.6 1.5 +13 -54jakarta-tomcat-connectors/webapp/support/wa_perl.m4 http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/support/wa_perl.m4.diff?r1=1.4r2=1.5 1.9 +13 -54jakarta-tomcat-connectors/webapp/support/wa_util.m4 http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/support/wa_util.m4.diff?r1=1.8r2=1.9 1.8 +13 -54jakarta-tomcat-connectors/webapp/support/wa_apr.m4 http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/support/wa_apr.m4.diff?r1=1.7r2=1.8 1.9 +13 -54jakarta-tomcat-connectors/webapp/support/wa_apxs.m4 http://cvs.apache.org/viewcvs
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
hgomez 2004/02/11 01:50:19 Modified:jk/native/apache-2.0 mod_jk.c Log: Initialize the reco status Revision ChangesPath 1.92 +4 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- mod_jk.c 2 Feb 2004 17:38:04 - 1.91 +++ mod_jk.c 11 Feb 2004 09:50:19 - 1.92 @@ -490,6 +490,9 @@ s-read = ws_read; s-write= ws_write; +/* Clear RECO status */ +s-reco_status = RECO_NONE; + s-auth_type= NULL_FOR_EMPTY(r-ap_auth_type); s-remote_user = NULL_FOR_EMPTY(r-user); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mmanders2004/02/02 09:38:04
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Updated how we get the server port to work with APR 1.0 as well as previous
versions. Patch submitted by Guenter Knauf.
Revision ChangesPath
1.91 +2 -5 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- mod_jk.c 5 Nov 2003 09:15:41 - 1.90
+++ mod_jk.c 2 Feb 2004 17:38:04 - 1.91
@@ -482,8 +482,6 @@
{
request_rec *r = private_data-r;
-apr_port_t port;
-
char *ssl_temp = NULL;
s-jvm_route= NULL;/* Used for sticky session routing */
@@ -518,8 +516,7 @@
s-server_name = (char *)ap_get_server_name(r);
/* get the real port (otherwise redirect failed) */
-apr_sockaddr_port_get(port,r-connection-local_addr);
-s-server_port = port;
+s-server_port = r-connection-local_addr-port;
/* XXX : à la jk2 ???*/
/* s-server_port = ap_get_server_port(r); */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 NWGNUmakefile
mmanders2004/01/22 08:42:31 Added: jk/native/apache-2.0 NWGNUmakefile Log: Makefile for building NetWare version of mod_jk submitted by Guenter Knauf ([EMAIL PROTECTED]). Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile Index: NWGNUmakefile === # # Makefile for mod_jk (uses the build system of Apache2 - gnu make) # created by Guenter Knauf [EMAIL PROTECTED] # #ifeq ($(strip $(JAVA_HOME)),) [EMAIL PROTECTED] You must set the JAVA_HOME environment var pointing to the NetWare Java SDK! #endif # # Declare the sub-directories to be built here # SUBDIRS = \ $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and # paths to tools # include $(AP_WORK)\build\NWGNUhead.inc # # build this level's files # # Make sure all needed macro's are defined # JKCOMMON = ../common # # These directories will be at the beginning of the include list, followed by # INCDIRS # XINCDIRS += \ $(JKCOMMON) \ $(AP_WORK)/include \ $(NWOS) \ $(AP_WORK)/modules/arch/netware \ $(AP_WORK)/srclib/apr/include \ $(AP_WORK)/srclib/apr-util/include \ $(AP_WORK)/srclib/apr \ $(JAVA_HOME)/include \ $(JAVA_HOME)/include/netware \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ $(EOLIST) # # These defines will come after DEFINES # XDEFINES += \ -D__NOVELL_LIBC__ \ $(EOLIST) # # These flags will be added to the link.opt file # XLFLAGS += \ $(EOLIST) # # These values will be appended to the correct variables based on the value of # RELEASE # ifeq $(RELEASE) debug XINCDIRS += \ $(EOLIST) XCFLAGS += \ $(EOLIST) XDEFINES += \ $(EOLIST) XLFLAGS += \ $(EOLIST) endif ifeq $(RELEASE) noopt XINCDIRS += \ $(EOLIST) XCFLAGS += \ $(EOLIST) XDEFINES += \ $(EOLIST) XLFLAGS += \ $(EOLIST) endif ifeq $(RELEASE) release XINCDIRS += \ $(EOLIST) XCFLAGS += \ $(EOLIST) XDEFINES += \ $(EOLIST) XLFLAGS += \ $(EOLIST) endif # # These are used by the link target if an NLM is being generated # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # NLM_NAME = mod_jk # # This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) plugin for Jakarta/Tomcat $(JK_VERSION_STR) # # This is used by the link '-copy ' directive. # If left blank, the ASF copyright defined in NWGNUtail.inc will be used. # NLM_COPYRIGHT = # # This is used by the '-threadname' directive. If left blank, # NLM_NAME Thread will be used. # NLM_THREAD_NAME = JK Module # # If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # NLM_VERSION = $(JK_VERSION) # # If this is specified, it will override the default of 64K # NLM_STACK_SIZE= 32768 # # If this is specified it will be used by the link '-entry' directive # NLM_ENTRY_SYM = _LibCPrelude # # If this is specified it will be used by the link '-exit' directive # NLM_EXIT_SYM = _LibCPostlude # # If this is specified it will be used by the link '-check' directive # NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # # If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # XDCDATA = # # If there is an NLM target, put it here # TARGET_nlm = \ $(OBJDIR)/mod_jk.nlm \ $(EOLIST) # # If there is an LIB target, put it here # TARGET_lib = \ $(EOLIST) # # These are the OBJ files needed to create the NLM target above. # Paths must all use the '/' character
[PATHCH] ./jk/native/apache-2.0/mod_jk.c
# patch for APR 1.0 compatiblity # --- mod_jk.c.orig Wed Nov 05 12:15:18 2003 +++ mod_jk.cWed Jan 21 04:15:56 2004 @@ -518,8 +518,7 @@ s-server_name = (char *)ap_get_server_name(r); /* get the real port (otherwise redirect failed) */ -apr_sockaddr_port_get(port,r-connection-local_addr); -s-server_port = port; +s-server_port = r-connection-local_addr-port; /* XXX : à la jk2 ???*/ /* s-server_port = ap_get_server_port(r); */ Guenter. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATHCH] ./jk/native/apache-2.0/mod_jk.c
oops, take two: forgot to remove the obsolete port var.
# patch for APR 1.0 compatiblity
#
--- mod_jk.c.orig Wed Nov 05 12:15:18 2003
+++ mod_jk.cWed Jan 21 17:39:10 2004
@@ -482,8 +482,6 @@
{
request_rec *r = private_data-r;
-apr_port_t port;
-
char *ssl_temp = NULL;
s-jvm_route= NULL;/* Used for sticky session routing */
@@ -518,8 +516,7 @@
s-server_name = (char *)ap_get_server_name(r);
/* get the real port (otherwise redirect failed) */
-apr_sockaddr_port_get(port,r-connection-local_addr);
-s-server_port = port;
+s-server_port = r-connection-local_addr-port;
/* XXX : à la jk2 ???*/
/* s-server_port = ap_get_server_port(r); */
Guenter.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25104] New: - (Apache 2.0.x) mod_jk 1.2.5 ignores -ForwardDirectories
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25104. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25104 (Apache 2.0.x) mod_jk 1.2.5 ignores -ForwardDirectories Summary: (Apache 2.0.x) mod_jk 1.2.5 ignores -ForwardDirectories Product: Tomcat 4 Version: 4.1.29 Platform: Sun OS/Version: Solaris Status: NEW Severity: Normal Priority: Other Component: Connector:JK/AJP (deprecated) AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Using Apache 2.0.48, Tomcat 4.1.29 and mod_jk 1.2.5 on Solaris. All HTTP-requests for directories without index.html get served by Tomcat even if JkOptions -ForwardDirectories is used (or ForwardDirectories is removed). Apache has no Options Indexes set, so requests to directories without a proper index file should be rejected with a 403 Forbidden. Directories containing index.html should be served by Apache whereas only requests for directories with index.jsp should be directed to Tomcat via mod_jk. DocumentRoot in Apache and appBase in Tomcat point to same directory. Steps to Reproduce: 1.) Relevate settings from httpd.conf: ... DirectoryIndex index.html index.jsp ... IfModule mod_jk.c JkWorkersFile /confdir/workers.properties JkLogFile /logdir/mod_jk.log JkLogLevel info JkLogStampFormat [%d.%m.%Y %H:%M:%S] JkOptions -ForwardDirectories JkMount /*.jsp ajp13 /IfModule 2.) Create a test directory (/fortomcat) with simple index.jsp within and an empty directory (/notfortomcat) as well. 3.) Make HTTP-requests for both directories. Expected Results: http://host/fortomcat/ - 200 OK (Tomcat serving index.jsp) or 500 Internal Server Error (Tomcat complaining about No context configured...) http://host/notfortomcat/ - 403 Forbidden (error from Apache) Actual Results: http://host/fortomcat/ - 200 OK (Tomcat serving index.jsp) or 500 Internal Server Error (Tomcat complaining about No context configured...) http://host/notfortomcat/ - 500 Internal Server Error (Tomcat complaining about No context configured...) WRONG! Additional Information: ForwardDirectories was broken in mod_jk 1.2.4 too. With 1.2.4, requests for directories where never forwarded to Tomcat (JkOptions +ForwardDirectories did not work). This was fixed in 1.2.5: Changes with JK 1.2.5 * Fix Apache 2 connector so that DirectoryIndex works for an index.jsp page if JkOptions ForwardDirectories was configured. [hgomez] Now forwarding works a bit too well. :) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
glenn 2003/11/01 11:20:50
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Fix a special case to make sure that apache can serve a directory
listing if there are no matches for the DirectoryIndex and
Tomcat webapps are mapped into apache using JkAutoAlias.
Revision ChangesPath
1.89 +34 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- mod_jk.c 4 Oct 2003 11:43:14 - 1.88
+++ mod_jk.c 1 Nov 2003 19:20:50 - 1.89
@@ -2278,6 +2278,39 @@
Manually mapped, no need to call uri_to_worker\n);
return DECLINED;
}
+
+/* Special case to make sure that apache can serve a directory
+ listing if there are no matches for the DirectoryIndex and
+ Tomcat webapps are mapped into apache using JkAutoAlias. */
+if(r-main != NULL (conf-alias_dir != NULL)
+ !strcmp(r-main-handler,DIR_MAGIC_TYPE)) {
+
+/* Append the request uri to the JkAutoAlias directory and
+ determine if the file exists. */
+char *clean_uri;
+apr_finfo_t finfo;
+finfo.filetype = APR_NOFILE;
+clean_uri = apr_pstrdup(r-pool, r-uri);
+ap_no2slash(clean_uri);
+/* Map uri to a context static file */
+if (strlen(clean_uri) 1) {
+char *context_path = NULL;
+
+context_path = apr_pstrcat(r-pool,conf-alias_dir,
+
ap_os_escape_path(r-pool,clean_uri,1),
+ NULL);
+if( context_path != NULL ) {
+apr_stat(finfo,context_path,APR_FINFO_TYPE,r-pool);
+}
+}
+if(finfo.filetype != APR_REG) {
+jk_log(conf-log, JK_LOG_DEBUG,
+JkAutoAlias, no DirectoryIndex file for URI %s\n,
+r-uri);
+ return DECLINED;
+}
+}
+
uri = apr_pstrdup(r-pool, r-uri);
worker = map_uri_to_worker(conf-uw_map, uri, conf-log);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Tomcat 5.0.x (5.0.14), Apache 2.0.x (2.0.47), mod_jk2 (2.0.2) *doubt*
Howdy,
For those interested in integrating tomcat5 and apache2, I managed to get the
beasts working together in inprocess mode (tomcat's jvm started within the
apache). It is slightly different compared to tomcat 4.x case. I noticed that one
has to put additional jars on the classpath to prevent ClassNotFoundException
during classloading tomcat bootstrap classes and later on during tomcat startup.
(namely jmx.jar and commons-modeler.jar). However, I suppose we should avoid
placing anything below ${tomcat.home}/server and ${tomcat.home}/common
explicitely on the classpath.
Here is my (stripped-down) working workers2.properties file. Can anyone please
take a look at the contents of -Djava.class.path property. I am not quite sure it
compatible with current classloader architecture.
[logger.file:fl]
file=${serverRoot}/logs/jk2.log
[shm]
file=${serverRoot}/logs/jk2.shm
size=1048576
[workerEnv:]
logger=logger.file:fl
[vm:]
OPT=-Dcatalina.home=c:/Program Files/Apache Group/Tomcat 5.0
OPT=-Dcatalina.base=c:/Program Files/Apache Group/Tomcat 5.0
OPT=-Djava.class.path=c:/Program Files/Apache Group/Tomcat
5.0/server/lib/tomcat-jni.jar;c:/Program Files/Apache Group/Tomcat
5.0/bin/commons-logging-api.jar;c:/Program Files/Apache Group/Tomcat
5.0/common/lib/jmx.jar;c:/Program Files/Apache Group/Tomcat
5.0/bin/bootstrap.jar;;c:/Program Files/Apache Group/Tomcat
5.0/server/lib/commons-modeler.jar
OPT=-Xrs
OPT=-Xmx32m
OPT=-Xms32m
[worker.jni:onStartup]
class=org/apache/jk/apr/TomcatStarter
ARG=start
stdout=${serverRoot}/logs/stdout.log
stderr=${serverRoot}/logs/stderr.log
[worker.jni:onShutdown]
class=org/apache/jk/apr/TomcatStarter
ARG=stop
[status:status]
[uri:/jkstatus]
worker=status:status
[channel.socket:localhost:8009]
host=localhost
port=8009
group=lb
[uri:/jsp-examples/*]
[uri:/jsp-examples/*.jsp]
[uri:/servlets-examples/*]
[uri:/tomcat-docs/*]
[uri:/admin/*]
[uri:/manager/*]
Is there's a better way to integrate tomcat 5 within apache 2?
I also noticed a strange behaviour - tomcat when started (standalone as an nt
service or inprocess as described above) after being shutdown *inprocess* fails
to deserialize persisted sessions. I do not think it happened in tomcat 5.0.12.
Here comes the stdout:
2003-10-30 10:50:17 org.apache.catalina.startup.Catalina load
INFO: Initialization processed in 7762 ms
2003-10-30 10:50:18 org.apache.catalina.core.StandardService start
INFO: Starting service Catalina
2003-10-30 10:50:18 org.apache.catalina.core.StandardEngine start
INFO: Starting Servlet Engine: Apache Tomcat/5.0.14
2003-10-30 10:50:18 org.apache.catalina.core.StandardHost start
INFO: XML validation disabled
2003-10-30 10:50:18 org.apache.catalina.core.StandardHost getDeployer
INFO: Create Host deployer for direct deployment ( non-jmx )
2003-10-30 10:50:18 org.apache.catalina.core.StandardHostDeployer install
INFO: Processing Context configuration file URL file:C:\Program Files\Apache
Group\Tomcat 5.0\conf\Catalina\localhost\admin.xml
2003-10-30 10:50:22 org.apache.catalina.session.StandardManager doLoad
SEVERE: IOException while loading persisted sessions: java.io.EOFException
java.io.EOFException
at java.io.ObjectInputStream$PeekInputStream.readFully(Unknown Source)
at java.io.ObjectInputStream$BlockDataInputStream.readShort(Unknown Source)
at java.io.ObjectInputStream.readStreamHeader(Unknown Source)
at java.io.ObjectInputStream.(Unknown Source)
at
org.apache.catalina.util.CustomObjectInputStream.(CustomObjectInputStream.java:104)
at org.apache.catalina.session.StandardManager.doLoad(StandardManager.java:418)
at org.apache.catalina.session.StandardManager.load(StandardManager.java:377)
at org.apache.catalina.session.StandardManager.start(StandardManager.java:690)
at org.apache.catalina.core.ContainerBase.setManager(ContainerBase.java:542)
at
org.apache.catalina.startup.ContextConfig.managerConfig(ContextConfig.java:353)
at org.apache.catalina.startup.ContextConfig.start(ContextConfig.java:756)
at
org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java:257)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:166)
at org.apache.catalina.core.StandardContext.start(StandardContext.java:4116)
at
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:866)
at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:850)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:633)
at
org.apache.catalina.core.StandardHostDeployer.addChild(StandardHostDeployer.java:831)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
at java.lang.reflect.Method.invoke(Unknown Source)
at
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2003/10/04 02:26:00
Modified:jk/native/apache-2.0 mod_jk.c
Log:
apr_filename_of_pathname has been deprecated since apr
version 0.9.3, and it doesn't exist in version 0.9.4 any more.
Revision ChangesPath
1.87 +6 -4 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mod_jk.c 30 Sep 2003 13:41:54 - 1.86
+++ mod_jk.c 4 Oct 2003 09:26:00 - 1.87
@@ -91,9 +91,11 @@
#include util_date.h
#endif
-/* changed with apr 1.0 */
+/* deprecated with apr 0.9.3 */
#include apr_version.h
-#if (APR_MAJOR_VERSION 1)
+#if (APR_MAJOR_VERSION == 0) \
+(APR_MINOR_VERSION = 9) \
+(APR_PATCH_VERSION 3)
#define apr_filepath_name_get apr_filename_of_pathname
#endif
@@ -2412,7 +2414,7 @@
/* Only if sub-request for a directory, most likely from mod_dir */
if (r-main r-main-filename
-!*apr_filepath_name_get(r-main-filename)){
+!apr_filepath_name_get(r-main-filename)){
/* The filename from the main request will be set to what should
* be picked up, aliases included. Tomcat will need to know about
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2003/10/04 04:43:14
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Let the open_log retuns int instead calling exit(1),
so we can return INTERNL_SERVER_ERROR, instead
getting into endles child create/exit loop.
Revision ChangesPath
1.88 +13 -11jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- mod_jk.c 4 Oct 2003 09:26:00 - 1.87
+++ mod_jk.c 4 Oct 2003 11:43:14 - 1.88
@@ -2092,7 +2092,7 @@
return APR_SUCCESS;
}
-static void open_jklog(server_rec *s, apr_pool_t *p)
+static int open_jklog(server_rec *s, apr_pool_t *p)
{
jk_server_conf_t *conf;
const char *fname;
@@ -2107,13 +2107,13 @@
if (main_log != NULL) {
conf-log = main_log;
-return;
+return 0;
}
if (conf-log_file == NULL) {
-return;
+return 0;
}
if (*(conf-log_file) == '\0') {
-return;
+return 0;
}
if (*conf-log_file == '|') {
@@ -2121,17 +2121,17 @@
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
mod_jk: could not open reliable pipe
to jk log %s, conf-log_file+1);
-exit(1);
+return -1;
}
conf-jklogfp = (void *)ap_piped_log_write_fd(pl);
}
-else if (*conf-log_file != '\0') {
+else {
fname = ap_server_root_relative(p, conf-log_file);
if (!fname) {
ap_log_error(APLOG_MARK, APLOG_ERR, APR_EBADPATH, s,
mod_jk: Invalid JkLog
path %s, conf-log_file);
-exit(1);
+return -1;
}
if ((rc = apr_file_open(conf-jklogfp, fname,
jklog_flags, jklog_mode, p))
@@ -2139,7 +2139,7 @@
ap_log_error(APLOG_MARK, APLOG_ERR, rc, s,
mod_jk: could not open JkLog
file %s, fname);
-exit(1);
+return -1;
}
apr_file_inherit_set(conf-jklogfp);
}
@@ -2154,10 +2154,10 @@
if (main_log == NULL)
main_log = conf-log;
apr_pool_cleanup_register(p, main_log, jklog_cleanup, jklog_cleanup);
-return;
+return 0;
}
-exit(1);
+return -1;
}
@@ -2248,7 +2248,9 @@
* - open each jk logfile
*/
for (; s; s = s-next) {
-open_jklog(s, pconf);
+if (open_jklog(s, pconf))
+return HTTP_INTERNAL_SERVER_ERROR;
+
}
return OK;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] ./jk/native/apache-2.0/mod_jk.c compile with Apache 2.1
Günter Knauf a écrit : Thanks Gunter, I'll apply it ASAP - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
hgomez 2003/09/30 06:41:54
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Update for APR 1.0 (Apache 2.1)
Provided by Günter Knauf eflash at gmx.net
Revision ChangesPath
1.86 +38 -32jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- mod_jk.c 25 Sep 2003 15:22:09 - 1.85
+++ mod_jk.c 30 Sep 2003 13:41:54 - 1.86
@@ -67,7 +67,6 @@
* mod_jk: keeps all servlet/jakarta related ramblings together.
*/
-#include apu_compat.h
#include ap_config.h
#include apr_lib.h
#include apr_date.h
@@ -88,9 +87,16 @@
/* moved to apr since http-2.0.19-dev */
#if (MODULE_MAGIC_NUMBER_MAJOR 20010523)
+#define apr_date_parse_http ap_parseHTTPdate
#include util_date.h
#endif
+/* changed with apr 1.0 */
+#include apr_version.h
+#if (APR_MAJOR_VERSION 1)
+#define apr_filepath_name_get apr_filename_of_pathname
+#endif
+
#include apr_strings.h
/*
* Jakarta (jk_) include files
@@ -273,7 +279,7 @@
* If the script gave us a Last-Modified header, we can't just
* pass it on blindly because of restrictions on future values.
*/
-ap_update_mtime(r, ap_parseHTTPdate(header_values[h]));
+ap_update_mtime(r, apr_date_parse_http(header_values[h]));
ap_set_last_modified(r);
} else {
apr_table_add(r-headers_out,
@@ -833,7 +839,7 @@
}
value = tmpv;
} else {
-value = ap_pstrdup(cmd-pool, value);
+value = apr_pstrdup(cmd-pool, value);
}
if(value) {
@@ -959,8 +965,8 @@
int *strl;
apr_array_header_t *format = conf-format;
-strs = ap_palloc(r-pool, sizeof(char *) * (format-nelts));
-strl = ap_palloc(r-pool, sizeof(int) * (format-nelts));
+strs = apr_palloc(r-pool, sizeof(char *) * (format-nelts));
+strl = apr_palloc(r-pool, sizeof(int) * (format-nelts));
items = (request_log_format_item *) format-elts;
for (i = 0; i format-nelts; ++i) {
strs[i] = process_item(r, items[i]);
@@ -968,7 +974,7 @@
for (i = 0; i format-nelts; ++i) {
len += strl[i] = strlen(strs[i]);
}
-str = ap_palloc(r-pool, len + 1);
+str = apr_palloc(r-pool, len + 1);
for (i = 0, s = str; i format-nelts; ++i) {
memcpy(s, strs[i], strl[i]);
s += strl[i];
@@ -1006,13 +1012,13 @@
static const char *log_worker_name(request_rec *r, char *a)
{
-return ap_table_get(r-notes, JK_WORKER_ID);
+return apr_table_get(r-notes, JK_WORKER_ID);
}
static const char *log_request_duration(request_rec *r, char *a)
{
-return ap_table_get(r-notes, JK_DURATION);
+return apr_table_get(r-notes, JK_DURATION);
}
static const char *log_request_line(request_rec *r, char *a)
@@ -1022,7 +1028,7 @@
* (note the truncation before the protocol string for HTTP/0.9
requests)
* (note also that r-the_request contains the unmodified request)
*/
-return (r-parsed_uri.password) ? ap_pstrcat(r-pool, r-method, ,
+return (r-parsed_uri.password) ? apr_pstrcat(r-pool, r-method, ,
apr_uri_unparse(r-pool, r-parsed_uri,
0),
r-assbackwards ? NULL : , r-protocol,
NULL)
: r-the_request;
@@ -1065,7 +1071,7 @@
}
static const char *log_request_query(request_rec *r, char *a)
{
-return (r-args != NULL) ? ap_pstrcat(r-pool, ?, r-args, NULL)
+return (r-args != NULL) ? apr_pstrcat(r-pool, ?, r-args, NULL)
: ;
}
static const char *log_status(request_rec *r, char *a)
@@ -1171,7 +1177,7 @@
* This might allocate a few chars extra if there's a backslash
* escape in the format string.
*/
-it-arg = ap_palloc(p, s - *sa + 1);
+it-arg = apr_palloc(p, s - *sa + 1);
d = it-arg;
s = *sa;
@@ -1232,7 +1238,7 @@
dummy[0] = s[-1];
dummy[1] = '\0';
-return ap_pstrcat(p, Unrecognized JkRequestLogFormat directive %,
+return apr_pstrcat(p, Unrecognized JkRequestLogFormat directive %,
dummy, NULL);
}
it-func = l-func;
@@ -1243,18 +1249,18 @@
static apr_array_header_t *parse_request_log_string(apr_pool_t *p, const char *s,
const char **err)
{
-apr_array_header_t
[PATCH] ./jk/native/apache-2.0/mod_jk.c compile with Apache 2.1
Hi,
with Apache 2.1 and APR 1.0 seems that apu_compat.h is removed (see APR-util Changes);
attached a patch which works for me with both APR 0.9.4 and APR 1.0.0
Guenter.
--- mod_jk.c.orig Sat Sep 06 17:37:20 2003
+++ mod_jk.cTue Sep 30 03:57:24 2003
@@ -67,7 +67,6 @@
* mod_jk: keeps all servlet/jakarta related ramblings together.
*/
-#include apu_compat.h
#include ap_config.h
#include apr_lib.h
#include apr_date.h
@@ -88,9 +87,16 @@
/* moved to apr since http-2.0.19-dev */
#if (MODULE_MAGIC_NUMBER_MAJOR 20010523)
+#define apr_date_parse_http ap_parseHTTPdate
#include util_date.h
#endif
+/* changed with apr 1.0 */
+#include apr_version.h
+#if (APR_MAJOR_VERSION 1)
+#define apr_filepath_name_get apr_filename_of_pathname
+#endif
+
#include apr_strings.h
/*
* Jakarta (jk_) include files
@@ -273,7 +279,7 @@
* If the script gave us a Last-Modified header, we can't just
* pass it on blindly because of restrictions on future values.
*/
-ap_update_mtime(r, ap_parseHTTPdate(header_values[h]));
+ap_update_mtime(r, apr_date_parse_http(header_values[h]));
ap_set_last_modified(r);
} else {
apr_table_add(r-headers_out,
@@ -833,7 +839,7 @@
}
value = tmpv;
} else {
-value = ap_pstrdup(cmd-pool, value);
+value = apr_pstrdup(cmd-pool, value);
}
if(value) {
@@ -959,8 +965,8 @@
int *strl;
apr_array_header_t *format = conf-format;
-strs = ap_palloc(r-pool, sizeof(char *) * (format-nelts));
-strl = ap_palloc(r-pool, sizeof(int) * (format-nelts));
+strs = apr_palloc(r-pool, sizeof(char *) * (format-nelts));
+strl = apr_palloc(r-pool, sizeof(int) * (format-nelts));
items = (request_log_format_item *) format-elts;
for (i = 0; i format-nelts; ++i) {
strs[i] = process_item(r, items[i]);
@@ -968,7 +974,7 @@
for (i = 0; i format-nelts; ++i) {
len += strl[i] = strlen(strs[i]);
}
-str = ap_palloc(r-pool, len + 1);
+str = apr_palloc(r-pool, len + 1);
for (i = 0, s = str; i format-nelts; ++i) {
memcpy(s, strs[i], strl[i]);
s += strl[i];
@@ -1006,13 +1012,13 @@
static const char *log_worker_name(request_rec *r, char *a)
{
-return ap_table_get(r-notes, JK_WORKER_ID);
+return apr_table_get(r-notes, JK_WORKER_ID);
}
static const char *log_request_duration(request_rec *r, char *a)
{
-return ap_table_get(r-notes, JK_DURATION);
+return apr_table_get(r-notes, JK_DURATION);
}
static const char *log_request_line(request_rec *r, char *a)
@@ -1022,7 +1028,7 @@
* (note the truncation before the protocol string for HTTP/0.9 requests)
* (note also that r-the_request contains the unmodified request)
*/
-return (r-parsed_uri.password) ? ap_pstrcat(r-pool, r-method, ,
+return (r-parsed_uri.password) ? apr_pstrcat(r-pool, r-method, ,
apr_uri_unparse(r-pool, r-parsed_uri, 0),
r-assbackwards ? NULL : , r-protocol,
NULL)
: r-the_request;
@@ -1065,7 +1071,7 @@
}
static const char *log_request_query(request_rec *r, char *a)
{
-return (r-args != NULL) ? ap_pstrcat(r-pool, ?, r-args, NULL)
+return (r-args != NULL) ? apr_pstrcat(r-pool, ?, r-args, NULL)
: ;
}
static const char *log_status(request_rec *r, char *a)
@@ -1171,7 +1177,7 @@
* This might allocate a few chars extra if there's a backslash
* escape in the format string.
*/
-it-arg = ap_palloc(p, s - *sa + 1);
+it-arg = apr_palloc(p, s - *sa + 1);
d = it-arg;
s = *sa;
@@ -1232,7 +1238,7 @@
dummy[0] = s[-1];
dummy[1] = '\0';
-return ap_pstrcat(p, Unrecognized JkRequestLogFormat directive %,
+return apr_pstrcat(p, Unrecognized JkRequestLogFormat directive %,
dummy, NULL);
}
it-func = l-func;
@@ -1243,18 +1249,18 @@
static apr_array_header_t *parse_request_log_string(apr_pool_t *p, const char *s,
const char **err)
{
-apr_array_header_t *a = ap_make_array(p, 15, sizeof(request_log_format_item));
+apr_array_header_t *a = apr_array_make(p, 15, sizeof(request_log_format_item));
char *res;
while (*s) {
-if ((res = parse_request_log_item(p, (request_log_format_item *)
ap_push_array(a), s))) {
+if ((res = parse_request_log_item(p, (request_log_format_item *)
apr_array_push(a), s))) {
*err = res;
return NULL;
}
}
s = \n;
-parse_request_log_item(p, (request_log_format_item *) ap_push_array(a), s);
+parse_request_log_item(p, (request_log_format_item *)
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 bldjk.qclsrc
hgomez 2003/08/29 06:05:36
Modified:jk/native/apache-2.0 bldjk.qclsrc
Log:
Update the build file to have iSeries recognise Unix98 calls
Revision ChangesPath
1.9 +39 -20jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc
Index: bldjk.qclsrc
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bldjk.qclsrc 25 Jul 2003 14:29:00 - 1.8
+++ bldjk.qclsrc 29 Aug 2003 13:05:36 - 1.9
@@ -1,7 +1,8 @@
PGM
CRTCMOD MODULE(MOD_JK/MOD_JK) +
SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
+ DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+'USE_APACHE_MD5' '_REENTRANT') +
TEXT('mod_jk.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -13,7 +14,8 @@
CRTCMOD MODULE(MOD_JK/JK_AJP_COM) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp_common.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp_common.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -26,7 +28,8 @@
CRTCMOD MODULE(MOD_JK/JK_AJP12_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp12_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp12_worker.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -39,7 +42,8 @@
CRTCMOD MODULE(MOD_JK/JK_AJP13) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp13.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp13.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -52,7 +56,8 @@
CRTCMOD MODULE(MOD_JK/JK_AJP13_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp13_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp13_worker.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -65,7 +70,8 @@
CRTCMOD MODULE(MOD_JK/JK_AJP14) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp14.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp14.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -78,7 +84,8 @@
CRTCMOD MODULE(MOD_JK/JK_AJP14_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp14_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp14_worker.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -91,7 +98,8 @@
CRTCMOD MODULE(MOD_JK/JK_CONNECT) +
SRCSTMF('/home/apache/jk/native/common/jk_connect.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_connect.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -104,7 +112,8 @@
CRTCMOD MODULE(MOD_JK/JK_CONTEXT) +
SRCSTMF('/home/apache/jk/native/common/jk_context.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_context.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -117,7 +126,8 @@
CRTCMOD MODULE(MOD_JK/JK_JNI_WOR) +
SRCSTMF('/home/apache/jk/native/common/jk_jni_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'OS400_JVM_12' 'USE_APACHE_MD5' +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'OS400_JVM_12' +
+ '_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' +
'_REENTRANT') +
TEXT('jk_jni_worker.c') +
OPTIMIZE(40) +
@@ -131,7 +141,8 @@
CRTCMOD MODULE(MOD_JK/JK_LB_WORK) +
SRCSTMF('/home/apache/jk/native/common/jk_lb_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_lb_worker.c
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
hgomez 2003/08/29 07:10:31
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Fix typo, apr_pstrdup should be used
Revision ChangesPath
1.84 +3 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- mod_jk.c 28 Aug 2003 09:48:22 - 1.83
+++ mod_jk.c 29 Aug 2003 14:10:31 - 1.84
@@ -1720,7 +1720,7 @@
if(conf ! worker_name ) {
/* Direct mapping ( via setHandler ). Try overrides */
-char *uri = apr_strdup(r-pool, r-uri);
+char *uri = apr_pstrdup(r-pool, r-uri);
worker_name = map_uri_to_worker(conf-uw_map, uri, conf-log);
if( ! worker_name ) {
/* Since we are here, an explicit (native) mapping has been used */
@@ -2384,7 +2384,7 @@
Manually mapped, no need to call uri_to_worker\n);
return DECLINED;
}
-uri = apr_strdup(r-pool, r-uri);
+uri = apr_pstrdup(r-pool, r-uri);
worker = map_uri_to_worker(conf-uw_map, uri, conf-log);
if(worker) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
billbarker2003/08/25 21:28:12
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Changes for Apache2 to support the new contract.
Revision ChangesPath
1.82 +11 -5 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- mod_jk.c 15 Jul 2003 12:16:05 - 1.81
+++ mod_jk.c 26 Aug 2003 04:28:12 - 1.82
@@ -1696,7 +1696,8 @@
Manual configuration for %s %s %d\n,
r-uri, worker_env.first_worker, worker_env.num_of_workers);
} else {
- worker_name = map_uri_to_worker(xconf-uw_map, r-uri, xconf-log);
+ char *uri = apr_pstrdup(r-pool, r-uri);
+ worker_name = map_uri_to_worker(xconf-uw_map, uri, xconf-log);
if( worker_name == NULL )
worker_name= worker_env.first_worker;
jk_log(xconf-log, JK_LOG_DEBUG,
@@ -1719,7 +1720,8 @@
if(conf ! worker_name ) {
/* Direct mapping ( via setHandler ). Try overrides */
-worker_name = map_uri_to_worker(conf-uw_map, r-uri, conf-log);
+char *uri = apr_strdup(r-pool, r-uri);
+worker_name = map_uri_to_worker(conf-uw_map, uri, conf-log);
if( ! worker_name ) {
/* Since we are here, an explicit (native) mapping has been used */
/* Use default worker */
@@ -2256,6 +2258,7 @@
if(conf) {
char *worker;
+char *uri;
if( (r-handler != NULL )
(! strcmp( r-handler, JK_HANDLER ) )) {
/* Somebody already set the handler, probably manual config
@@ -2265,7 +2268,8 @@
Manually mapped, no need to call uri_to_worker\n);
return DECLINED;
}
-worker = map_uri_to_worker(conf-uw_map, r-uri, conf-log);
+uri = apr_pstrdup(r-pool, r-uri);
+worker = map_uri_to_worker(conf-uw_map, uri, conf-log);
if(worker) {
r-handler=apr_pstrdup(r-pool,JK_HANDLER);
@@ -2370,6 +2374,7 @@
if(conf) {
char *worker;
+char *uri;
if( (r-handler != NULL )
(! strcmp( r-handler, JK_HANDLER ) )) {
/* Somebody already set the handler, probably manual config
@@ -2379,7 +2384,8 @@
Manually mapped, no need to call uri_to_worker\n);
return DECLINED;
}
-worker = map_uri_to_worker(conf-uw_map, r-uri, conf-log);
+uri = apr_strdup(r-pool, r-uri);
+worker = map_uri_to_worker(conf-uw_map, uri, conf-log);
if(worker) {
r-handler=apr_pstrdup(r-pool,JK_HANDLER);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 bldjk.qclsrc
hgomez 2003/07/25 07:29:00
Modified:jk/native/apache-2.0 bldjk.qclsrc
Log:
Avoid CL compile errors with defaults 80 columns
Revision ChangesPath
1.8 +2 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc
Index: bldjk.qclsrc
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bldjk.qclsrc 24 Jul 2003 08:17:44 - 1.7
+++ bldjk.qclsrc 25 Jul 2003 14:29:00 - 1.8
@@ -117,7 +117,8 @@
CRTCMOD MODULE(MOD_JK/JK_JNI_WOR) +
SRCSTMF('/home/apache/jk/native/common/jk_jni_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'OS400_JVM_12' 'USE_APACHE_MD5'
'_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'OS400_JVM_12' 'USE_APACHE_MD5' +
+'_REENTRANT') +
TEXT('jk_jni_worker.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 bldjk.qclsrc
hgomez 2003/07/24 01:17:45
Modified:jk/native/apache-2.0 bldjk.qclsrc
Log:
Add HAVE_APR in iSeries (AS/400) build script source
Revision ChangesPath
1.7 +19 -19jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc
Index: bldjk.qclsrc
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qclsrc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bldjk.qclsrc 17 Dec 2002 09:44:35 - 1.6
+++ bldjk.qclsrc 24 Jul 2003 08:17:44 - 1.7
@@ -1,7 +1,7 @@
PGM
CRTCMOD MODULE(MOD_JK/MOD_JK) +
SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
- DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5' '_REENTRANT') +
+ DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('mod_jk.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -13,7 +13,7 @@
CRTCMOD MODULE(MOD_JK/JK_AJP_COM) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp_common.c') +
-DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp_common.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -26,7 +26,7 @@
CRTCMOD MODULE(MOD_JK/JK_AJP12_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp12_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp12_worker.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -39,7 +39,7 @@
CRTCMOD MODULE(MOD_JK/JK_AJP13) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp13.c') +
-DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp13.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -52,7 +52,7 @@
CRTCMOD MODULE(MOD_JK/JK_AJP13_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp13_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp13_worker.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -65,7 +65,7 @@
CRTCMOD MODULE(MOD_JK/JK_AJP14) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp14.c') +
-DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp14.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -78,7 +78,7 @@
CRTCMOD MODULE(MOD_JK/JK_AJP14_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp14_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp14_worker.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -91,7 +91,7 @@
CRTCMOD MODULE(MOD_JK/JK_CONNECT) +
SRCSTMF('/home/apache/jk/native/common/jk_connect.c') +
-DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_connect.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -104,7 +104,7 @@
CRTCMOD MODULE(MOD_JK/JK_CONTEXT) +
SRCSTMF('/home/apache/jk/native/common/jk_context.c') +
-DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_context.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -117,7 +117,7 @@
CRTCMOD MODULE(MOD_JK/JK_JNI_WOR) +
SRCSTMF('/home/apache/jk/native/common/jk_jni_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'OS400_JVM_12' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'OS400_JVM_12' 'USE_APACHE_MD5'
'_REENTRANT') +
TEXT('jk_jni_worker.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -130,7 +130,7 @@
CRTCMOD MODULE(MOD_JK/JK_LB_WORK) +
SRCSTMF('/home/apache/jk/native/common/jk_lb_worker.c') +
-DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_lb_worker.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -143,7 +143,7 @@
CRTCMOD MODULE(MOD_JK/JK_MAP) +
SRCSTMF('/home/apache/jk/native/common/jk_map.c') +
-DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5' '_REENTRANT') +
+DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_map.c') +
OPTIMIZE(40) +
SYSIFCOPT(*IFSIO) +
@@ -156,7 +156,7 @@
CRTCMOD MODULE(MOD_JK/JK_MD5) +
SRCSTMF('/home/apache/jk/native/common/jk_md5.c
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
glenn 2003/07/15 05:16:06
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Fix double open of mod_jk.log for apache 2
Revision ChangesPath
1.81 +2 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- mod_jk.c 27 Jun 2003 03:10:43 - 1.80
+++ mod_jk.c 15 Jul 2003 12:16:05 - 1.81
@@ -2097,6 +2097,7 @@
if (main_log != NULL) {
conf-log = main_log;
+return;
}
if (conf-log_file == NULL) {
return;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
