cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_ajp13_worker.c jk_ajp14_worker.c jk_ajp_common.c jk_ajp_common.h jk_lb_worker.c jk_service.h jk_worker.c jk_worker.h
mturk 2005/04/24 02:54:47
Modified:jk/native/common jk_ajp12_worker.c jk_ajp13_worker.c
jk_ajp14_worker.c jk_ajp_common.c jk_ajp_common.h
jk_lb_worker.c jk_service.h jk_worker.c jk_worker.h
Log:
Added wc_maintain, that will recycle all connections regardless of the
elected worker. Added new worker callback 'maintain' that does the
actual job.
Revision ChangesPath
1.28 +3 -2
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_ajp12_worker.c 17 Feb 2005 07:10:23 - 1.27
+++ jk_ajp12_worker.c 24 Apr 2005 09:54:47 - 1.28
@@ -16,7 +16,7 @@
/***
* Description: ajpv1.2 worker, used to call local or remote jserv hosts *
- * This worker is deprecated *
+ * This worker is deprecated *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on:jserv_ajpv12.c from Jserv *
* Version: $Revision$ *
@@ -254,6 +254,7 @@
private_data-worker.init = init;
private_data-worker.get_endpoint = get_endpoint;
private_data-worker.destroy = destroy;
+private_data-worker.maintain = NULL;
private_data-worker.retries = JK_RETRIES;
*w = private_data-worker;
1.25 +3 -2
jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c
Index: jk_ajp13_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_ajp13_worker.c 15 Feb 2005 08:52:53 - 1.24
+++ jk_ajp13_worker.c 24 Apr 2005 09:54:47 - 1.25
@@ -86,7 +86,7 @@
JK_TRACE_EXIT(l);
return 0;
}
-
+
aw = (ajp_worker_t *) calloc(1, sizeof(ajp_worker_t));
if (!aw) {
jk_log(l, JK_LOG_ERROR,
@@ -108,6 +108,7 @@
aw-worker.init = init;
aw-worker.get_endpoint = get_endpoint;
aw-worker.destroy = destroy;
+aw-worker.maintain = ajp_maintain;
aw-worker.retries = JK_RETRIES;
aw-logon = NULL; /* No Logon on AJP13 */
1.29 +5 -4
jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c
Index: jk_ajp14_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_ajp14_worker.c 15 Feb 2005 08:52:53 - 1.28
+++ jk_ajp14_worker.c 24 Apr 2005 09:54:47 - 1.29
@@ -133,10 +133,10 @@
return JK_TRUE;
}
-/*
- * AJP14 Logon Phase
+/*
+ * AJP14 Logon Phase
*
- * INIT + REPLY / NEGO + REPLY
+ * INIT + REPLY / NEGO + REPLY
*/
static int handle_logon(ajp_endpoint_t * ae,
@@ -423,6 +423,7 @@
aw-worker.init = init;
aw-worker.get_endpoint = get_endpoint;
aw-worker.destroy = destroy;
+aw-worker.maintain = ajp_maintain;
aw-worker.retries = JK_RETRIES;
aw-logon = logon; /* LogOn Handler for AJP14 */
1.102 +143 -115
jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- jk_ajp_common.c 21 Apr 2005 12:04:18 - 1.101
+++ jk_ajp_common.c 24 Apr 2005 09:54:47 - 1.102
@@ -52,7 +52,7 @@
tv.tv_sec = 0;
select(0, NULL, NULL, NULL, tv);
#endif
-}
+}
const char *response_trans_headers[] = {
Content-Type,
@@ -68,7 +68,7 @@
WWW-Authenticate
};
-static const char *long_res_header_for_sc(int sc)
+static const char *long_res_header_for_sc(int sc)
{
const char *rc = NULL;
sc = sc 0X00FF;
@@ -248,7 +248,7 @@
}
/* NOTREACHED */
-}
+}
static int sc_for_req_header(const char *header_name)
{
@@ -262,7 +262,7 @@
*/
if (len 4 || len 15)
return UNKNOWN_METHOD;
-
+
while (*p)
header[i++] =
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c
mturk 2005/02/16 00:15:56
Modified:jk/native/common jk_ajp12_worker.c
Log:
Added missing semicolon for AS400 build.
Revision ChangesPath
1.23 +2 -2
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_ajp12_worker.c 15 Feb 2005 08:52:53 - 1.22
+++ jk_ajp12_worker.c 16 Feb 2005 08:15:56 - 1.23
@@ -319,7 +319,7 @@
#if defined(AS400) || defined(_OSD_POSIX)
char buf[2048];
if (bufferlen 2048) {
-memcpy(buf, buffer, bufferlen)
+memcpy(buf, buffer, bufferlen);
jk_xlate_to_ascii(buf, bufferlen);
return ajpv12_sendnbytes(p, buf, bufferlen);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c
mturk 2005/02/16 07:22:46
Modified:jk/native/common jk_ajp12_worker.c
Log:
Ajp12 protocol is not recoverable, so set the return error to 500
in case of failrue.
Revision ChangesPath
1.25 +6 -9
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_ajp12_worker.c 16 Feb 2005 15:09:20 - 1.24
+++ jk_ajp12_worker.c 16 Feb 2005 15:22:46 - 1.25
@@ -91,9 +91,11 @@
if (e e-endpoint_private s is_error) {
ajp12_endpoint_t *p = e-endpoint_private;
-unsigned attempt;
-
-*is_error = 0;
+unsigned int attempt;
+/*
+ * AJP12 protocol is not recoverable.
+ */
+*is_error = JK_HTTP_SERVER_ERROR;
for (attempt = 0; attempt p-worker-connect_retry_attempts;
attempt++) {
@@ -109,11 +111,6 @@
}
if (p-sd = 0) {
-/*
- * After we are connected, each error that we are going to
- * have is probably unrecoverable
- */
-*is_error = JK_HTTP_SERVER_ERROR;
jk_sb_open(p-sb, p-sd);
if (ajpv12_handle_request(p, s, l)) {
jk_log(l, JK_LOG_DEBUG,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_ajp_common.c jk_connect.c jk_connect.h
mturk 2005/02/16 07:28:28
Modified:jk/native/common jk_ajp12_worker.c jk_ajp_common.c
jk_connect.c jk_connect.h
Log:
Disable Nagle algorithm by default. It was disabled anyhow, so
just clean up the API. No functional change.
Revision ChangesPath
1.26 +2 -2
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_ajp12_worker.c 16 Feb 2005 15:22:46 - 1.25
+++ jk_ajp12_worker.c 16 Feb 2005 15:28:28 - 1.26
@@ -100,7 +100,7 @@
for (attempt = 0; attempt p-worker-connect_retry_attempts;
attempt++) {
p-sd =
-jk_open_socket(p-worker-worker_inet_addr, JK_TRUE,
+jk_open_socket(p-worker-worker_inet_addr,
JK_FALSE, -1, l);
jk_log(l, JK_LOG_DEBUG, In jk_endpoint_t::service, sd = %d,
1.84 +2 -2
jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- jk_ajp_common.c 16 Feb 2005 15:09:20 - 1.83
+++ jk_ajp_common.c 16 Feb 2005 15:28:28 - 1.84
@@ -835,7 +835,7 @@
JK_TRACE_ENTER(l);
for (attempt = 0; attempt ae-worker-connect_retry_attempts;
attempt++) {
-ae-sd = jk_open_socket(ae-worker-worker_inet_addr, JK_TRUE,
+ae-sd = jk_open_socket(ae-worker-worker_inet_addr,
ae-worker-keepalive,
ae-worker-socket_timeout, l);
if (ae-sd = 0) {
1.39 +8 -13 jakarta-tomcat-connectors/jk/native/common/jk_connect.c
Index: jk_connect.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jk_connect.c 6 Feb 2005 13:30:34 - 1.38
+++ jk_connect.c 16 Feb 2005 15:28:28 - 1.39
@@ -122,11 +122,12 @@
/** connect to Tomcat */
-int jk_open_socket(struct sockaddr_in *addr, int ndelay,
+int jk_open_socket(struct sockaddr_in *addr,
int keepalive, int timeout, jk_logger_t *l)
{
char buf[32];
int sock;
+int set = 1;
JK_TRACE_ENTER(l);
@@ -186,21 +187,15 @@
JK_TRACE_EXIT(l);
return -1;
}
-if (ndelay) {
-int set = 1;
-if (JK_IS_DEBUG_LEVEL(l))
-jk_log(l, JK_LOG_DEBUG,
- jk_open_socket, set TCP_NODELAY to on);
-setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (const char *)set,
- sizeof(set));
-}
+setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (const char *)set,
+ sizeof(set));
if (keepalive) {
-int keep = 1;
+set = 1;
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
jk_open_socket, set SO_KEEPALIVE to on);
-setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (const char *)keep,
-sizeof(keep));
+setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (const char *)set,
+sizeof(set));
}
len = 8*1024; /* Default AJP packet size */
1.12 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_connect.h
Index: jk_connect.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_connect.h 6 Feb 2005 13:30:34 - 1.11
+++ jk_connect.h 16 Feb 2005 15:28:28 - 1.12
@@ -37,7 +37,7 @@
int jk_resolve(const char *host, int port, struct sockaddr_in *rc);
-int jk_open_socket(struct sockaddr_in *addr, int ndelay,
+int jk_open_socket(struct sockaddr_in *addr,
int keepalive, int timeout, jk_logger_t *l);
int jk_close_socket(int s);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c
mturk 2005/02/16 23:10:23
Modified:jk/native/common jk_ajp12_worker.c
Log:
Use hard timeout of zero for sockets.
Revision ChangesPath
1.27 +2 -2
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_ajp12_worker.c 16 Feb 2005 15:28:28 - 1.26
+++ jk_ajp12_worker.c 17 Feb 2005 07:10:23 - 1.27
@@ -101,7 +101,7 @@
attempt++) {
p-sd =
jk_open_socket(p-worker-worker_inet_addr,
- JK_FALSE, -1, l);
+ JK_FALSE, -1, 0, l);
jk_log(l, JK_LOG_DEBUG, In jk_endpoint_t::service, sd = %d,
p-sd);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_ajp12_worker.h jk_ajp13_worker.c jk_ajp13_worker.h jk_ajp14_worker.c jk_ajp14_worker.h jk_jni_worker.c jk_jni_worker.h jk_lb_worker.c jk_lb_worker.h jk_service.h jk_status.c jk_status.h jk_worker.c jk_worker_list.h
mturk 2005/02/15 00:52:54
Modified:jk/native/common jk_ajp12_worker.c jk_ajp12_worker.h
jk_ajp13_worker.c jk_ajp13_worker.h
jk_ajp14_worker.c jk_ajp14_worker.h jk_jni_worker.c
jk_jni_worker.h jk_lb_worker.c jk_lb_worker.h
jk_service.h jk_status.c jk_status.h jk_worker.c
jk_worker_list.h
Log:
Make worker factory to return the numeric type of the worker,
and use that type instead of string.
Revision ChangesPath
1.22 +3 -3
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_ajp12_worker.c 15 Feb 2005 07:17:17 - 1.21
+++ jk_ajp12_worker.c 15 Feb 2005 08:52:53 - 1.22
@@ -260,7 +260,7 @@
private_data-worker.retries = JK_RETRIES;
*w = private_data-worker;
-return JK_TRUE;
+return JK_AJP12_WORKER_TYPE;
}
free(private_data);
@@ -271,7 +271,7 @@
jk_log(l, JK_LOG_ERROR, In ajp12_worker_factory, NULL parameters);
}
-return JK_FALSE;
+return 0;
}
static int ajpv12_sendnbytes(ajp12_endpoint_t * p,
1.9 +2 -1
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.h
Index: jk_ajp12_worker.h
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_ajp12_worker.h 8 Nov 2004 13:23:25 - 1.8
+++ jk_ajp12_worker.h 15 Feb 2005 08:52:53 - 1.9
@@ -32,6 +32,7 @@
#endif /* __cplusplus */
#define JK_AJP12_WORKER_NAME (ajp12)
+#define JK_AJP12_WORKER_TYPE (1)
int JK_METHOD ajp12_worker_factory(jk_worker_t **w,
const char *name, jk_logger_t *l);
1.24 +4 -4
jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c
Index: jk_ajp13_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_ajp13_worker.c 6 Feb 2005 13:45:11 - 1.23
+++ jk_ajp13_worker.c 15 Feb 2005 08:52:53 - 1.24
@@ -84,7 +84,7 @@
if (name == NULL || w == NULL) {
JK_LOG_NULL_PARAMS(l);
JK_TRACE_EXIT(l);
-return JK_FALSE;
+return 0;
}
aw = (ajp_worker_t *) calloc(1, sizeof(ajp_worker_t));
@@ -92,7 +92,7 @@
jk_log(l, JK_LOG_ERROR,
malloc of private_data failed);
JK_TRACE_EXIT(l);
-return JK_FALSE;
+return 0;
}
aw-name = name;
@@ -114,5 +114,5 @@
*w = aw-worker;
JK_TRACE_EXIT(l);
-return JK_TRUE;
+return JK_AJP13_WORKER_TYPE;
}
1.11 +2 -1
jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.h
Index: jk_ajp13_worker.h
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_ajp13_worker.h 8 Nov 2004 13:24:46 - 1.10
+++ jk_ajp13_worker.h 15 Feb 2005 08:52:53 - 1.11
@@ -37,6 +37,7 @@
#endif /* __cplusplus */
#define JK_AJP13_WORKER_NAME (ajp13)
+#define JK_AJP13_WORKER_TYPE (2)
int JK_METHOD ajp13_worker_factory(jk_worker_t **w,
const char *name, jk_logger_t *l);
1.28 +6 -6
jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c
Index: jk_ajp14_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_ajp14_worker.c 6 Feb 2005 13:45:11 - 1.27
+++ jk_ajp14_worker.c 15 Feb 2005 08:52:53 - 1.28
@@ -376,7 +376,7 @@
if (name == NULL || w == NULL) {
JK_LOG_NULL_PARAMS(l);
JK_TRACE_EXIT(l);
-return JK_FALSE;
+return 0;
}
aw = (ajp_worker_t *) calloc(1, sizeof(ajp_worker_t));
@@ -384,7 +384,7 @@
jk_log(l, JK_LOG_ERROR,
malloc of private data failed);
JK_TRACE_EXIT(l);
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c
mturk 2005/02/14 23:17:17
Modified:jk/native/common jk_ajp12_worker.c
Log:
Fix typo.
Revision ChangesPath
1.21 +2 -2
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_ajp12_worker.c 12 Feb 2005 11:36:31 - 1.20
+++ jk_ajp12_worker.c 15 Feb 2005 07:17:17 - 1.21
@@ -318,7 +318,7 @@
if (buffer (bufferlen = strlen(buffer))) {
#if defined(AS400) || defined(_OSD_POSIX)
char buf[2048];
-if (buflen 2048) {
+if (bufferlen 2048) {
memcpy(buf, buffer, bufferlen)
jk_xlate_to_ascii(buf, bufferlen);
return ajpv12_sendnbytes(p, buf, bufferlen);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_service.h
mturk 2005/02/12 03:34:00
Modified:jk/native/common jk_ajp12_worker.c jk_service.h
Log:
Use const char* for all constant params passed to AJP.
Also resolve AS400 constness issues.
Revision ChangesPath
1.19 +12 -8
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_ajp12_worker.c 6 Feb 2005 13:30:34 - 1.18
+++ jk_ajp12_worker.c 12 Feb 2005 11:33:59 - 1.19
@@ -298,7 +298,7 @@
}
#ifdef AS400
-static int ajpv12_sendasciistring(ajp12_endpoint_t * p, char *buffer)
+static int ajpv12_sendasciistring(ajp12_endpoint_t * p, const char *buffer)
{
int bufferlen;
@@ -311,19 +311,23 @@
}
#endif
-#ifdef AS400
-static int ajpv12_sendstring(ajp12_endpoint_t * p, char *buffer)
-#else
static int ajpv12_sendstring(ajp12_endpoint_t * p, const char *buffer)
-#endif
{
int bufferlen;
if (buffer (bufferlen = strlen(buffer))) {
#if defined(AS400) || defined(_OSD_POSIX)
-jk_xlate_to_ascii(buffer, bufferlen);
-#endif
+char buf[2048];
+if (buflen 2048) {
+memcpy(buf, buffer, bufferlen)
+jk_xlate_to_ascii(buf, bufferlen);
+return ajpv12_sendnbytes(p, buffer, bufferlen);
+}
+else
+return -1;
+#else
return ajpv12_sendnbytes(p, buffer, bufferlen);
+#endif
}
else {
return ajpv12_sendnbytes(p, NULL, 0);
1.22 +10 -10jakarta-tomcat-connectors/jk/native/common/jk_service.h
Index: jk_service.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_service.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_service.h 6 Feb 2005 13:30:34 - 1.21
+++ jk_service.h 12 Feb 2005 11:33:59 - 1.22
@@ -121,15 +121,15 @@
/*
* CGI Environment needed by servlets
*/
-char *method;
-char *protocol;
-char *req_uri;
-char *remote_addr;
-char *remote_host;
-char *remote_user;
-char *auth_type;
-char *query_string;
-char *server_name;
+const char *method;
+const char *protocol;
+const char *req_uri;
+const char *remote_addr;
+const char *remote_host;
+const char *remote_user;
+const char *auth_type;
+const char *query_string;
+const char *server_name;
unsigned server_port;
char *server_software;
unsigned content_length;/* integer that represents the content
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_ajp13_worker.c jk_ajp14_worker.c jk_jni_worker.c jk_lb_worker.c
mturk 2004/11/19 04:58:18
Modified:jk/native/common jk_ajp12_worker.c jk_ajp13_worker.c
jk_ajp14_worker.c jk_jni_worker.c jk_lb_worker.c
Log:
Fix retries for worker adding initialization to 'init'.
Revision ChangesPath
1.16 +2 -1
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_ajp12_worker.c 8 Nov 2004 13:23:01 - 1.15
+++ jk_ajp12_worker.c 19 Nov 2004 12:58:18 - 1.16
@@ -257,6 +257,7 @@
private_data-worker.init = init;
private_data-worker.get_endpoint = get_endpoint;
private_data-worker.destroy = destroy;
+private_data-worker.retries = JK_RETRIES;
*w = private_data-worker;
return JK_TRUE;
1.20 +7 -1
jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c
Index: jk_ajp13_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_ajp13_worker.c 11 Nov 2004 17:28:59 - 1.19
+++ jk_ajp13_worker.c 19 Nov 2004 12:58:18 - 1.20
@@ -43,7 +43,12 @@
jk_worker_env_t *we, jk_logger_t *l)
{
int rc;
+ajp_worker_t *aw = ( ajp_worker_t *)pThis-worker_private;
JK_TRACE_ENTER(l);
+
+pThis-retries = jk_get_worker_retries(props, aw-name,
+ JK_RETRIES);
+
rc = ajp_init(pThis, props, we, l, AJP13_PROTO);
JK_TRACE_EXIT(l);
return rc;
@@ -110,6 +115,7 @@
aw-worker.init = init;
aw-worker.get_endpoint = get_endpoint;
aw-worker.destroy = destroy;
+aw-worker.retries = JK_RETRIES;
aw-logon = NULL; /* No Logon on AJP13 */
1.23 +4 -1
jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c
Index: jk_ajp14_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_ajp14_worker.c 11 Nov 2004 17:52:04 - 1.22
+++ jk_ajp14_worker.c 19 Nov 2004 12:58:18 - 1.23
@@ -306,6 +306,8 @@
return JK_FALSE;
}
aw = pThis-worker_private;
+pThis-retries = jk_get_worker_retries(props, aw-name,
+ JK_RETRIES);
/* Set Secret Key (used at logon time) */
aw-login-secret_key = strdup(jk_get_worker_secret_key(props,
aw-name));
@@ -431,6 +433,7 @@
aw-worker.init = init;
aw-worker.get_endpoint = get_endpoint;
aw-worker.destroy = destroy;
+aw-worker.retries = JK_RETRIES;
aw-logon = logon; /* LogOn Handler for AJP14 */
*w = aw-worker;
1.28 +2 -1
jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_jni_worker.c 11 Nov 2004 19:00:56 - 1.27
+++ jk_jni_worker.c 19 Nov 2004 12:58:18 - 1.28
@@ -700,6 +700,7 @@
private_data-worker.init = init;
private_data-worker.get_endpoint = get_endpoint;
private_data-worker.destroy = destroy;
+private_data-worker.retries = JK_RETRIES;
*w = private_data-worker;
the_singleton_jni_worker = private_data-worker;
1.30 +6 -2 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_lb_worker.c11 Nov 2004 18:43:07 - 1.29
+++ jk_lb_worker.c19 Nov 2004 12:58:18 - 1.30
@@ -495,7 +495,10 @@
jk_map_t *props,
jk_worker_env_t *we, jk_logger_t *log)
{
-/* Nothing to do for now */
+
+lb_worker_t *p = (lb_worker_t *)pThis-worker_private;
+pThis-retries = jk_get_worker_retries(props, p-name,
+ JK_RETRIES);
return JK_TRUE;
}
@@ -567,6 +570,7 @@
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c
mturk 2004/11/08 05:23:02
Modified:jk/native/common jk_ajp12_worker.c
Log:
Added timeout param to jk_open_socket
Revision ChangesPath
1.15 +3 -2
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_ajp12_worker.c 8 Oct 2004 07:50:39 - 1.14
+++ jk_ajp12_worker.c 8 Nov 2004 13:23:01 - 1.15
@@ -16,9 +16,10 @@
/***
* Description: ajpv1.2 worker, used to call local or remote jserv hosts *
+ * This worker is deprecated *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on:jserv_ajpv12.c from Jserv *
- * Version: $Revision$ *
+ * Version: $Revision$ *
***/
#include jk_ajp12_worker.h
@@ -98,7 +99,7 @@
attempt++) {
p-sd =
jk_open_socket(p-worker-worker_inet_addr, JK_TRUE,
- JK_FALSE, l);
+ JK_FALSE, -1, l);
jk_log(l, JK_LOG_DEBUG, In jk_endpoint_t::service, sd = %d\n,
p-sd);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_ajp13.c jk_ajp13_worker.c jk_ajp14.c jk_ajp14_worker.c jk_ajp_common.c jk_connect.c jk_context.c jk_jni_worker.c jk_lb_worker.c jk_map.c jk_md5.c jk_msg_buff.c jk_nwmain.c jk_pool.c jk_sockbuf.c jk_uri_worker_map.c jk_util.c jk_worker.c jk_ajp12_worker.h jk_ajp13.h jk_ajp13_worker.h jk_ajp14.h jk_ajp14_worker.h jk_ajp_common.h jk_connect.h jk_context.h jk_global.h jk_jni_worker.h jk_lb_worker.h jk_logger.h jk_map.h jk_md5.h jk_msg_buff.h jk_mt.h jk_pool.h jk_service.h jk_sockbuf.h jk_uri_worker_map.h jk_util.h jk_version.h jk_worker.h jk_worker_list.h
mturk 2004/10/08 00:50:41 Modified:jk/native/common jk_ajp12_worker.c jk_ajp13.c jk_ajp13_worker.c jk_ajp14.c jk_ajp14_worker.c jk_ajp_common.c jk_connect.c jk_context.c jk_jni_worker.c jk_lb_worker.c jk_map.c jk_md5.c jk_msg_buff.c jk_nwmain.c jk_pool.c jk_sockbuf.c jk_uri_worker_map.c jk_util.c jk_worker.c jk_ajp12_worker.h jk_ajp13.h jk_ajp13_worker.h jk_ajp14.h jk_ajp14_worker.h jk_ajp_common.h jk_connect.h jk_context.h jk_global.h jk_jni_worker.h jk_lb_worker.h jk_logger.h jk_map.h jk_md5.h jk_msg_buff.h jk_mt.h jk_pool.h jk_service.h jk_sockbuf.h jk_uri_worker_map.h jk_util.h jk_version.h jk_worker.h jk_worker_list.h Log: Indent the entire source code, unifying all those different styles. Revision ChangesPath 1.14 +266 -250 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c.diff?r1=1.13r2=1.14 1.10 +5 -5 jakarta-tomcat-connectors/jk/native/common/jk_ajp13.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13.c.diff?r1=1.9r2=1.10 1.15 +38 -42jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c.diff?r1=1.14r2=1.15 1.20 +216 -186 jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c.diff?r1=1.19r2=1.20 1.21 +200 -192 jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c.diff?r1=1.20r2=1.21 1.59 +540 -503 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c.diff?r1=1.58r2=1.59 1.27 +85 -88jakarta-tomcat-connectors/jk/native/common/jk_connect.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c.diff?r1=1.26r2=1.27 1.11 +59 -54jakarta-tomcat-connectors/jk/native/common/jk_context.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_context.c.diff?r1=1.10r2=1.11 1.26 +479 -506 jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c.diff?r1=1.25r2=1.26 1.24 +222 -227 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c.diff?r1=1.23r2=1.24 1.14 +130 -141 jakarta-tomcat-connectors/jk/native/common/jk_map.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c.diff?r1=1.13r2=1.14 1.11 +123 -120 jakarta-tomcat-connectors/jk/native/common/jk_md5.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_md5.c.diff?r1=1.10r2=1.11 1.18 +99 -122 jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c.diff?r1=1.17r2=1.18 1.6 +17 -23jakarta-tomcat-connectors/jk/native/common/jk_nwmain.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_nwmain.c.diff?r1=1.5r2=1.6 1.9 +23 -34jakarta-tomcat-connectors/jk/native/common/jk_pool.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_pool.c.diff?r1=1.8r2=1.9 1.10 +57 -60jakarta-tomcat-connectors/jk/native/common/jk_sockbuf.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_sockbuf.c.diff?r1=1.9r2=1.10 1.23 +245 -220 jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c.diff?r1=1.22r2=1.23 1.30 +248 -302 jakarta-tomcat-connectors/jk/native/common/jk_util.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c.diff?r1=1.29r2=1.30 1.16 +81 -85jakarta-tomcat-connectors/jk/native/common/jk_worker.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c.diff?r1=1.15r2=1.16 1.7 +8 -8 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.h.diff?r1=1.6r2=1.7
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_ajp_common.c jk_jni_worker.c jk_msg_buff.c
jfclere 2002/09/20 04:28:16
Modified:jk/native/common jk_ajp12_worker.c jk_ajp_common.c
jk_jni_worker.c jk_msg_buff.c
Log:
Add BS2000 support.
Revision ChangesPath
1.9 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_ajp12_worker.c 4 Sep 2002 11:31:32 - 1.8
+++ jk_ajp12_worker.c 20 Sep 2002 11:28:16 - 1.9
@@ -357,7 +357,7 @@
int bufferlen;
if(buffer (bufferlen = strlen(buffer))) {
-#ifdef AS400
+#if defined(AS400) || defined(_OSD_POSIX)
jk_xlate_to_ascii(buffer, bufferlen);
#endif
return ajpv12_sendnbytes(p, buffer, bufferlen);
@@ -559,7 +559,7 @@
jk_log(l, JK_LOG_ERROR, ajpv12_handle_response, error reading header
line\n);
return JK_FALSE;
}
-#ifdef AS400
+#if defined(AS400) || defined(_OSD_POSIX)
jk_xlate_from_ascii(line, strlen(line));
#endif
1.30 +7 -1 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_ajp_common.c 4 Sep 2002 11:31:32 - 1.29
+++ jk_ajp_common.c 20 Sep 2002 11:28:16 - 1.30
@@ -475,7 +475,9 @@
d-msg = (char *)jk_b_get_string(msg);
if (d-msg) {
+#if defined(AS400) || defined(_OSD_POSIX)
jk_xlate_from_ascii(d-msg, strlen(d-msg));
+#endif
}
jk_log(l, JK_LOG_DEBUG, ajp_unmarshal_response: status = %d\n, d-status);
@@ -509,8 +511,10 @@
jk_log(l, JK_LOG_ERROR, Error ajp_unmarshal_response -
Null header name\n);
return JK_FALSE;
}
+#if defined(AS400) || defined(_OSD_POSIX)
jk_xlate_from_ascii(d-header_names[i],
strlen(d-header_names[i]));
+#endif
}
@@ -520,8 +524,10 @@
return JK_FALSE;
}
+#if defined(AS400) || defined(_OSD_POSIX)
jk_xlate_from_ascii(d-header_values[i],
strlen(d-header_values[i]));
+#endif
jk_log(l, JK_LOG_DEBUG, ajp_unmarshal_response: Header[%d] [%s] =
[%s]\n,
i,
1.19 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_jni_worker.c 16 Sep 2002 11:46:06 - 1.18
+++ jk_jni_worker.c 20 Sep 2002 11:28:16 - 1.19
@@ -250,7 +250,7 @@
/*
Duplicate string and convert it to ASCII on EBDIC based system
- Needed for at least AS/400, what about BS2000 ?
+ Needed for at least AS/400, BS2000 and what about other EBDIC systems ?
*/
static void *strdup_ascii(jk_pool_t *p,
char *s)
@@ -258,7 +258,7 @@
char * rc;
rc = jk_pool_strdup(p, s);
-#ifdef AS400
+#if defined(AS400) || defined(_OSD_POSIX)
jk_xlate_to_ascii(rc, strlen(rc));
#endif
1.12 +5 -2 jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c
Index: jk_msg_buff.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_msg_buff.c 4 Sep 2002 11:31:33 - 1.11
+++ jk_msg_buff.c 20 Sep 2002 11:28:16 - 1.12
@@ -319,7 +319,10 @@
/* We checked for space !! */
strncpy((char *)msg-buf + msg-len , param, len+1);/* including \0 */
-jk_xlate_to_ascii((char *)msg-buf + msg-len, len+1); /* convert from EBCDIC
if needed */
+#if defined(AS400) || defined(_OSD_POSIX)
+/* convert from EBCDIC if needed */
+jk_xlate_to_ascii((char *)msg-buf + msg-len, len+1);
+#endif
msg-len += len + 1;
return 0;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_ajp_common.c jk_ajp_common.h jk_connect.c jk_global.h jk_map.c jk_msg_buff.c jk_msg_buff.h jk_pool.c jk_pool.h jk_util.c
hgomez 2002/09/04 04:31:33
Modified:jk/native/apache-2.0 mod_jk.c
jk/native/common jk_ajp12_worker.c jk_ajp_common.c
jk_ajp_common.h jk_connect.c jk_global.h jk_map.c
jk_msg_buff.c jk_msg_buff.h jk_pool.c jk_pool.h
jk_util.c
Log:
Patches to make mod_jk works on iSeries (AS/400) and Apache 2.0.
These patches have been provided by IBM Rochester labs.
Nota:
You'll need an OS400 V5R1 or V5R2, both with latest PTF containing
Apache 2.0.39
Apache 2.0.39 PTFs for V5R1 are scheduled in mid-september.
Many thanks to IBMers, Walt, Jim and Brian.
Revision ChangesPath
1.55 +41 -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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mod_jk.c 24 Jul 2002 04:48:52 - 1.54
+++ mod_jk.c 4 Sep 2002 11:31:32 - 1.55
@@ -79,6 +79,10 @@
#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 */
+#endif
/* moved to apr since http-2.0.19-dev */
#if (MODULE_MAGIC_NUMBER_MAJOR 20010523)
@@ -230,6 +234,11 @@
ap_content_type_tolower(tmp);
r-content_type = tmp;
} else if(!strcasecmp(header_names[h], Location)) {
+#ifdef AS400
+/* Fix escapes in Location Header URL*/
+ap_fixup_escapes((char *)header_values[h],
+strlen(header_values[h]), ap_hdrs_from_ascii);
+#endif
apr_table_set(r-headers_out,
header_names[h], header_values[h]);
} else if(!strcasecmp(header_names[h], Content-Length)) {
@@ -283,7 +292,18 @@
}
if(p-read_body_started) {
-long rv;
+#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,
+ NULL, mod_jk: Error on ap_change_request_body_xlate, rc=%d
\n, rv);
+return JK_FALSE;
+}
+#else
+long rv;
+#endif
+
if ((rv = ap_get_client_block(p-r, b, len)) 0) {
*actually_read = 0;
} else {
@@ -315,6 +335,10 @@
const void *b,
unsigned l)
{
+#ifdef AS400
+int rc;
+#endif
+
if(s s-ws_private b) {
apache_private_data_t *p = s-ws_private;
@@ -332,6 +356,14 @@
return JK_FALSE;
}
}
+#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,
+ NULL, mod_jk: Error on ap_change_response_body_xlate,
rc=%d \n, rc);
+ return JK_FALSE;
+}
+#endif
/* Debug - try to get around rwrite */
while( ll 0 ) {
@@ -351,11 +383,13 @@
/*
* To allow server push. After writing full buffers
*/
+#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 );
return JK_FALSE;
}
+#endif
}
@@ -459,7 +493,12 @@
s-content_length = get_content_length(r);
s-is_chunked = r-read_chunked;
s-no_more_chunks = 0;
+#ifdef AS400
+/* Get the query string that is not translated to EBCDIC */
+s-query_string = ap_get_original_query_string(r);
+#else
s-query_string = r-args;
+#endif
/*
* The 2.2 servlet spec errata says the uri from
1.8 +65 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_ajp12_worker.c 25 Jun 2002 07:08:47 - 1.7
+++ jk_ajp12_worker.c 4 Sep 2002 11:31:32 - 1.8
@@ -67,6 +67,10 @@
#include jk_connect.h
#include jk_util.h
#include jk_sockbuf.h
+#ifdef AS400
+#include util_ebcdic.h
+#include string.h
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_ajp12_worker.h jk_sockbuf.c jk_sockbuf.h
costin 01/12/04 11:39:55 Added: jk/native/common jk_ajp12_worker.c jk_ajp12_worker.h jk_sockbuf.c jk_sockbuf.h Log: Rolling back ( Nov 1 ) Revision ChangesPath 1.6 +0 -0 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c 1.4 +0 -0 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.h 1.6 +0 -0 jakarta-tomcat-connectors/jk/native/common/jk_sockbuf.c 1.4 +0 -0 jakarta-tomcat-connectors/jk/native/common/jk_sockbuf.h -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c
marcsaeg01/10/05 14:52:08
Modified:jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
jk/native/common jk_ajp12_worker.c
Log:
Porting change from tomcat_32.
Fixes Bugzilla 2333. Instead of the proposed patch, which did its own
memory allocation, I used jk_pool_strdup(), but the end result is the same.
In the process of fixing this one I noticed that the jk_pool created in
mod_jk was not being closed. This usually doesn't leak because the pool's
buffer is allocated on the stack in jk_handler(), but it would leak any
dynamically allocated memory.
Revision ChangesPath
1.19 +3 -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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_jk.c 2001/10/01 21:30:49 1.18
+++ mod_jk.c 2001/10/05 21:52:08 1.19
@@ -61,7 +61,7 @@
* Author: Gal Shachor [EMAIL PROTECTED] *
* Dan Milstein [EMAIL PROTECTED]*
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.18 $ *
+ * Version: $Revision: 1.19 $ *
***/
/*
@@ -1132,6 +1132,8 @@
end-done(end, l);
}
}
+
+jk_close_pool(private_data.p);
if(rc) {
return OK; /* NOT r-status, even if it has changed. */
1.29 +3 -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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mod_jk.c 2001/10/04 13:09:42 1.28
+++ mod_jk.c 2001/10/05 21:52:08 1.29
@@ -60,7 +60,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.28 $ *
+ * Version: $Revision: 1.29 $ *
***/
/*
@@ -1235,6 +1235,8 @@
#endif
}
}
+
+jk_close_pool(private_data.p);
if(rc) {
return OK;/* NOT r-status, even if it has changed. */
1.4 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_ajp12_worker.c 2001/06/18 14:15:11 1.3
+++ jk_ajp12_worker.c 2001/10/05 21:52:08 1.4
@@ -59,7 +59,7 @@
* Description: ajpv1.2 worker, used to call local or remote jserv hosts *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on:jserv_ajpv12.c from Jserv *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***/
#include jk_ajp12_worker.h
@@ -545,7 +545,7 @@
jk_log(l, JK_LOG_ERROR, ajpv12_handle_response, invalid status
code\n);
return JK_FALSE;
}
-reason = strtok(NULL, \t);
+reason = jk_pool_strdup(s-pool, strtok(NULL, \t));
} else {
if(headers_capacity == headers_len) {
jk_log(l, JK_LOG_DEBUG, ajpv12_handle_response, allocating header
arrays\n);
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_ajp13_worker.c jk_jni_worker.c jk_lb_worker.c jk_service.h jk_worker.c jk_worker.h
hgomez 01/06/11 23:26:25
Modified:jk/native/common jk_ajp12_worker.c jk_ajp13_worker.c
jk_jni_worker.c jk_lb_worker.c jk_service.h
jk_worker.c jk_worker.h
Log:
init/validate methods of worker get now a copy of
worker_env (autoconf)
Revision ChangesPath
1.2 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_ajp12_worker.c 2001/05/14 09:32:19 1.1
+++ jk_ajp12_worker.c 2001/06/12 06:26:24 1.2
@@ -57,7 +57,7 @@
* Description: ajpv1.2 worker, used to call local or remote jserv hosts *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on:jserv_ajpv12.c from Jserv *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***/
#include jk_ajp12_worker.h
@@ -177,6 +177,7 @@
static int JK_METHOD validate(jk_worker_t *pThis,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *l)
{
jk_log(l, JK_LOG_DEBUG, Into jk_worker_t::validate\n);
@@ -210,6 +211,7 @@
static int JK_METHOD init(jk_worker_t *pThis,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *log)
{
/* Nothing to do for now */
1.5 +7 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c
Index: jk_ajp13_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_ajp13_worker.c 2001/06/07 14:33:02 1.4
+++ jk_ajp13_worker.c 2001/06/12 06:26:24 1.5
@@ -58,7 +58,7 @@
* Author: Henri Gomez [EMAIL PROTECTED] *
* Author: Costin [EMAIL PROTECTED] *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***/
#include jk_ajp13_worker.h
@@ -67,17 +67,19 @@
/* Method */
static int JK_METHOD validate(jk_worker_t *pThis,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *l)
{
- return (ajp_validate(pThis, props, l, AJP13_PROTO));
+ return (ajp_validate(pThis, props, we, l, AJP13_PROTO));
}
static int JK_METHOD init(jk_worker_t *pThis,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *l)
{
- return (ajp_init(pThis, props, l, AJP13_PROTO));
+ return (ajp_init(pThis, props, we, l, AJP13_PROTO));
}
@@ -134,6 +136,8 @@
aw-worker.get_endpoint= get_endpoint;
aw-worker.destroy = destroy;
+ aw-logon = NULL; /* No Logon on AJP13 */
+
*w = aw-worker;
return JK_TRUE;
}
1.2 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_jni_worker.c 2001/05/14 09:34:48 1.1
+++ jk_jni_worker.c 2001/06/12 06:26:25 1.2
@@ -57,7 +57,7 @@
* Description: In process JNI worker *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on: *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***/
#if !defined(WIN32) !defined(NETWARE)
@@ -337,6 +337,7 @@
static int JK_METHOD
