cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
mturk 2004/04/02 22:47:23
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
Read from client in the loop until all the requested data is read or timeout
occurs. This fixes random errors during read large post data.
Revision ChangesPath
1.30 +19 -11
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_service_iis.c 21 Mar 2004 09:45:16 - 1.29
+++ jk_service_iis.c 3 Apr 2004 06:47:23 - 1.30
@@ -156,6 +156,7 @@
if ((DWORD) s-content_read lpEcb-cbTotalBytes) {
DWORD rdlen, toread = len;
+DWORD cblen = 0;
LPBYTE buff = (LPBYTE) b;
/*
@@ -199,19 +200,26 @@
/*
* Now try to read from the client ...
*/
-if (lpEcb-ReadClient(lpEcb-ConnID, buff, rdlen)) {
-*actually_read += rdlen;
-env-l-jkLog(env, env-l, JK_LOG_DEBUG,
- jk_ws_service_t::read ReadClient readed %d (actually
%d) bytes\n,
- rdlen, *actually_read);
+
+while (cblen rdlen) {
+toread = rdlen - cblen;
+if (lpEcb-ReadClient(lpEcb-ConnID, buff + cblen, toread)) {
+if (toread == 0)
+break;
+cblen += toread;
+env-l-jkLog(env, env-l, JK_LOG_DEBUG,
+ jk_ws_service_t::read ReadClient readed %d
(actually %d) bytes\n,
+ toread, *actually_read + cblen);
+}
+else {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ jk_ws_service_t::read, ReadClient failed\n);
+/* XXX: We should return here HSE_STATUS_ERROR */
+break;
+}
}
-else {
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
- jk_ws_service_t::read, ReadClient failed\n);
-/* XXX: We should return here HSE_STATUS_ERROR */
-return JK_OK;
-}
+*actually_read += cblen;
}
env-l-jkLog(env, env-l, JK_LOG_DEBUG,
jk_ws_service_t::read actually readed %d from already %d of
total %d bytes\n,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
mturk 2004/03/15 00:25:34
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
Fix the case when the initial read brom buffer is mixed with ReadClient.
Revision ChangesPath
1.28 +6 -3
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_service_iis.c 28 Feb 2004 08:12:43 - 1.27
+++ jk_service_iis.c 15 Mar 2004 08:25:34 - 1.28
@@ -173,21 +173,24 @@
/* if that's all what that server wants to read, return... */
if (toread == rdlen) {
env-l-jkLog(env, env-l, JK_LOG_DEBUG,
- jk_ws_service_t::read buffer readed %d from
already %d of total %d bytes\n,
- toread, s-content_read, lpEcb-cbAvailable);
+ jk_ws_service_t::read buffer readed %d from
already %d of initial %d bytes from %d\n,
+ toread, s-content_read, lpEcb-cbAvailable,
lpEcb-cbTotalBytes);
return JK_OK;
}
else {
/* Adjust the read buffer and length */
rdlen -= toread;
buff += toread;
+env-l-jkLog(env, env-l, JK_LOG_DEBUG,
+ jk_ws_service_t::read initial readed %d going to
read %d\n,
+ toread, rdlen);
}
}
/*
* Now try to read from the client ...
*/
-if (lpEcb-ReadClient(lpEcb-ConnID, b, rdlen)) {
+if (lpEcb-ReadClient(lpEcb-ConnID, buff, rdlen)) {
*actually_read += rdlen;
env-l-jkLog(env, env-l, JK_LOG_DEBUG,
jk_ws_service_t::read ReadClient readed %d
(actually %d) bytes\n,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
This account does not exist - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
mturk 2004/02/28 00:12:43
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
Fix the POST data reads, rewriting service-read.
The previous implementation was total mess, dealing with
negative numbers to see if we read past the contol buffer,
etc...
Revision ChangesPath
1.27 +83 -49
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_service_iis.c 24 Feb 2004 08:44:42 - 1.26
+++ jk_service_iis.c 28 Feb 2004 08:12:43 - 1.27
@@ -43,7 +43,7 @@
extern int send_groups;
static int JK_METHOD jk2_service_iis_head(jk_env_t *env, jk_ws_service_t *s ){
-static char crlf[3] = { (char)13, (char)10, '\0' };
+static char crlf[3] = { '\r', '\n', '\0' };
const char *reason;
LPEXTENSION_CONTROL_BLOCK lpEcb=(LPEXTENSION_CONTROL_BLOCK)s-ws_private;
DWORD len_of_status;
@@ -124,66 +124,100 @@
}
static int JK_METHOD jk2_service_iis_read(jk_env_t *env, jk_ws_service_t *s,
- void *b, unsigned len, unsigned
*actually_read)
+ void *b, unsigned int len,
+ unsigned int *actually_read)
{
+
env-l-jkLog(env, env-l, JK_LOG_DEBUG,
- Into jk_ws_service_t::read\n);
+ Into jk_ws_service_t::read\n);
-if (s s-ws_private b actually_read) {
-LPEXTENSION_CONTROL_BLOCK lpEcb=(LPEXTENSION_CONTROL_BLOCK)s-ws_private;
+*actually_read = 0;
+if (!len) {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ jk_ws_service_t::read, requested read length is zero\n);
+return JK_OK;
+}
+if (s s-ws_private b) {
+LPEXTENSION_CONTROL_BLOCK lpEcb = (LPEXTENSION_CONTROL_BLOCK)s-ws_private;
-*actually_read = 0;
-if ((s-content_read (long)lpEcb-cbTotalBytes) !s-end_of_stream ){
-if (len) {
-char *buf = b;
-long already_read = (long)lpEcb-cbAvailable - s-content_read;
-
-if (already_read = (long)len) {
-memcpy(buf, lpEcb-lpbData + s-content_read, len);
-*actually_read = len;
-} else {
-/*
- * Try to copy what we already have
- */
-if (already_read 0) {
-memcpy(buf, lpEcb-lpbData + s-content_read, already_read);
-buf += already_read;
-len -= already_read;
-//s-content_read = lpEcb-cbAvailable;
-
-*actually_read = already_read;
-}
-if ((s-content_read+*actually_read)==lpEcb-cbTotalBytes) {
-s-end_of_stream=JK_TRUE;
-}
-/*
- * Now try to read from the client ...
- */
-if (!s-end_of_stream ) {
-if ( lpEcb-ReadClient(lpEcb-ConnID, buf, len)) {
-*actually_read += len;
-} else {
-env-l-jkLog(env,env-l, JK_LOG_ERROR,
- jk_ws_service_t::read, ReadClient failed\n);
-return JK_OK;
-}
-}
+if (s-end_of_stream) {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ jk_ws_service_t::read, end of stram allready reached\n);
+return JK_OK;
+}
+
+if ((DWORD)s-content_read lpEcb-cbTotalBytes) {
+DWORD rdlen, toread = len;
+LPBYTE buff = (LPBYTE)b;
+
+/*
+ * Fix the read length in case the requested
+ * is larger then what's available
+ */
+if (s-content_read + toread lpEcb-cbTotalBytes)
+toread = lpEcb-cbTotalBytes - s-content_read;
+rdlen = toread;
+
+/*
+ * First read the already sent data from the client
+ * No need to call the ReadClient fuction for the
+ * data held in the control buffer
+ */
+if ((DWORD)s-content_read lpEcb-cbAvailable) {
+/* Read the avail buffer */
+if (s-content_read + toread lpEcb-cbAvailable)
+toread =
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c jk_isapi_plugin.c jk_iis_thread_pool.c jk_iis.h
mturk 2003/02/03 23:44:23 Modified:jk/native2/server/isapi jk_service_iis.c jk_isapi_plugin.c jk_iis_thread_pool.c jk_iis.h Log: Update license to 2003. Revision ChangesPath 1.24 +1 -1 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c Index: jk_service_iis.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jk_service_iis.c 1 Feb 2003 22:28:39 - 1.23 +++ jk_service_iis.c 4 Feb 2003 07:44:23 - 1.24 @@ -2,7 +2,7 @@ * * * The Apache Software License, Version 1.1 * * * - * Copyright (c) 1999-2002 The Apache Software Foundation. * + * Copyright (c) 1999-2003 The Apache Software Foundation. * * All rights reserved.* * * * = * 1.53 +2 -2 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c Index: jk_isapi_plugin.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- jk_isapi_plugin.c 1 Feb 2003 22:17:16 - 1.52 +++ jk_isapi_plugin.c 4 Feb 2003 07:44:23 - 1.53 @@ -2,7 +2,7 @@ * * * The Apache Software License, Version 1.1 * * * - * Copyright (c) 1999-2002 The Apache Software Foundation. * + * Copyright (c) 1999-2003 The Apache Software Foundation. * * All rights reserved.* * * * = * 1.4 +2 -2 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis_thread_pool.c Index: jk_iis_thread_pool.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis_thread_pool.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jk_iis_thread_pool.c 16 Jul 2002 17:27:21 - 1.3 +++ jk_iis_thread_pool.c 4 Feb 2003 07:44:23 - 1.4 @@ -2,7 +2,7 @@ * * * The Apache Software License, Version 1.1 * * * - * Copyright (c) 1999-2002 The Apache Software Foundation. * + * Copyright (c) 1999-2003 The Apache Software Foundation. * * All rights reserved.* * * * = * 1.12 +1 -1 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h Index: jk_iis.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jk_iis.h 16 Jul 2002 17:30:15 - 1.11 +++ jk_iis.h 4 Feb 2003 07:44:23 - 1.12 @@ -2,7 +2,7 @@ * * * The Apache Software License, Version 1.1 * * * - * Copyright (c) 1999-2001 The Apache Software Foundation. * + * Copyright (c) 1999-2003 The Apache Software Foundation. * * All rights reserved.* * * * = * - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
nacho 2003/02/01 14:28:39
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
Oops, traslating to proper C ;)
Revision ChangesPath
1.23 +1 -1
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_service_iis.c 1 Feb 2003 22:17:16 - 1.22
+++ jk_service_iis.c 1 Feb 2003 22:28:39 - 1.23
@@ -409,7 +409,7 @@
* Add SSL IIS environment
*/
-if ( send_groups (strlen(s-remote_user) 0 )){
+if ( send_groups *s-remote_user ){
char *groups=jk2_service_iis_get_roles(env, s);
if( groups != NULL){
s-attributes-put( env,
s-attributes,ROLES_ATTRIBUTE_NAME,groups,NULL);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
mturk 2002/09/21 00:28:48
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
Fix the memory leaks using service's pool intead of worker
Revision ChangesPath
1.21 +13 -11
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_service_iis.c 8 Jul 2002 00:26:07 - 1.20
+++ jk_service_iis.c 21 Sep 2002 07:28:48 - 1.21
@@ -351,26 +351,26 @@
s-jvm_route = NULL;
-GET_SERVER_VARIABLE_VALUE(w-mbean-pool,HTTP_URI_HEADER_NAME, s-req_uri);
-GET_SERVER_VARIABLE_VALUE(w-mbean-pool,HTTP_QUERY_HEADER_NAME,
s-query_string);
+GET_SERVER_VARIABLE_VALUE(s-pool,HTTP_URI_HEADER_NAME, s-req_uri);
+GET_SERVER_VARIABLE_VALUE(s-pool,HTTP_QUERY_HEADER_NAME, s-query_string);
if (s-req_uri == NULL) {
s-query_string = lpEcb-lpszQueryString;
/* *worker_name= DEFAULT_WORKER_NAME; */
-GET_SERVER_VARIABLE_VALUE(w-mbean-pool,URL, s-req_uri);
+GET_SERVER_VARIABLE_VALUE(s-pool,URL, s-req_uri);
if (jk_requtil_unescapeUrl(s-req_uri) 0)
return JK_ERR;
jk_requtil_getParents(s-req_uri);
}
-GET_SERVER_VARIABLE_VALUE(w-mbean-pool,AUTH_TYPE, s-auth_type);
-GET_SERVER_VARIABLE_VALUE(w-mbean-pool,REMOTE_USER, s-remote_user);
-GET_SERVER_VARIABLE_VALUE(w-mbean-pool,SERVER_PROTOCOL, s-protocol);
-GET_SERVER_VARIABLE_VALUE(w-mbean-pool,REMOTE_HOST, s-remote_host);
-GET_SERVER_VARIABLE_VALUE(w-mbean-pool,REMOTE_ADDR, s-remote_addr);
-GET_SERVER_VARIABLE_VALUE(w-mbean-pool,SERVER_NAME, s-server_name);
+GET_SERVER_VARIABLE_VALUE(s-pool,AUTH_TYPE, s-auth_type);
+GET_SERVER_VARIABLE_VALUE(s-pool,REMOTE_USER, s-remote_user);
+GET_SERVER_VARIABLE_VALUE(s-pool,SERVER_PROTOCOL, s-protocol);
+GET_SERVER_VARIABLE_VALUE(s-pool,REMOTE_HOST, s-remote_host);
+GET_SERVER_VARIABLE_VALUE(s-pool,REMOTE_ADDR, s-remote_addr);
+GET_SERVER_VARIABLE_VALUE(s-pool,SERVER_NAME, s-server_name);
GET_SERVER_VARIABLE_VALUE_INT(SERVER_PORT, s-server_port, 80);
-GET_SERVER_VARIABLE_VALUE(w-mbean-pool,SERVER_SOFTWARE, s-server_software);
+GET_SERVER_VARIABLE_VALUE(s-pool,SERVER_SOFTWARE, s-server_software);
GET_SERVER_VARIABLE_VALUE_INT(SERVER_PORT_SECURE, s-is_ssl, 0);
s-method = lpEcb-lpszMethod;
@@ -441,7 +441,7 @@
unsigned num_of_vars = 0;
for(i = 0 ; i 9 ; i++) {
-GET_SERVER_VARIABLE_VALUE(w-mbean-pool,ssl_env_names[i],
ssl_env_values[i]);
+GET_SERVER_VARIABLE_VALUE(s-pool,ssl_env_names[i], ssl_env_values[i]);
if (ssl_env_values[i]) {
num_of_vars++;
}
@@ -588,6 +588,7 @@
LPEXTENSION_CONTROL_BLOCK lpEcb=(LPEXTENSION_CONTROL_BLOCK)s-ws_private;
+#if 0
char *buff = s-pool-calloc(env,s-pool, 2048);
if (buff != NULL) {
/* int rd; */
@@ -596,6 +597,7 @@
/* s-content_read += rd; */
/* } */
}
+#endif
}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
nacho 2002/06/14 16:39:52
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
* Better name for the roles attribute
Revision ChangesPath
1.19 +3 -1
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_service_iis.c 14 Jun 2002 23:12:05 - 1.18
+++ jk_service_iis.c 14 Jun 2002 23:39:52 - 1.19
@@ -79,6 +79,8 @@
#include jk_iis.h
+#define ROLES_ATTRIBUTE_NAME org.apache.tomcat.jk.roles
+
static int JK_METHOD jk2_service_iis_head(jk_env_t *env, jk_ws_service_t *s ){
static char crlf[3] = { (char)13, (char)10, '\0' };
const char *reason;
@@ -399,7 +401,7 @@
if ( strlen(s-remote_user) 0 ){
char *groups=jk2_service_iis_get_roles(env, s);
if( groups != NULL){
-s-attributes-put( env, s-attributes,ROLES,groups,NULL);
+s-attributes-put( env,
s-attributes,ROLES_ATTRIBUTE_NAME,groups,NULL);
}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
nacho 2002/06/05 14:41:28
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
* No warnings
Revision ChangesPath
1.17 +3 -3
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_service_iis.c 18 May 2002 22:40:47 - 1.16
+++ jk_service_iis.c 5 Jun 2002 21:41:28 - 1.17
@@ -82,7 +82,7 @@
static int JK_METHOD jk2_service_iis_head(jk_env_t *env, jk_ws_service_t *s ){
static char crlf[3] = { (char)13, (char)10, '\0' };
-char *reason;
+const char *reason;
LPEXTENSION_CONTROL_BLOCK lpEcb=(LPEXTENSION_CONTROL_BLOCK)s-ws_private;
DWORD len_of_status;
char *status_str;
@@ -519,8 +519,8 @@
char *buff = s-pool-calloc(env,s-pool, 2048);
if (buff != NULL) {
-int rd;
-/* Is there a IIS equivalent ? */
+/* int rd; */
+/* FIXME Is there a IIS equivalent ? */
/* while ((rd = ap_get_client_block(r, buff, 2048)) 0) {
*/
/* s-content_read += rd; */
/* } */
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
nacho 02/05/18 15:40:48
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
* Now i_r2.dll starts jk when the filter is first loaded, and later when first used
reads the config file and continues..
* Added properies file config in addition to Rehistry one
* Changed names of Regitry and properties init settings to match wk2.p file ones
server_root-serverRoot and so on..
Revision ChangesPath
1.16 +21 -7
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_service_iis.c 10 May 2002 23:15:35 - 1.15
+++ jk_service_iis.c 18 May 2002 22:40:47 - 1.16
@@ -90,7 +90,7 @@
int headerCount;
env-l-jkLog(env,env-l, JK_LOG_DEBUG,
- Into jk_ws_service_t::start_response\n);
+ Into jk_ws_service_t::head\n);
if (s-status 100 || s-status 1000) {
env-l-jkLog(env,env-l, JK_LOG_ERROR,
@@ -100,7 +100,7 @@
if( lpEcb == NULL ) {
env-l-jkLog(env,env-l, JK_LOG_ERROR,
- jk_ws_service_t::start_response, no lpEcp\n);
+ jk_ws_service_t::head, no lpEcp\n);
return JK_ERR;
}
@@ -109,7 +109,7 @@
/*
* Create the status line
*/
-if (!s-msg) {
+if (s-msg==NULL) {
reason = ;
} else {
reason = s-msg;
@@ -154,7 +154,7 @@
(LPDWORD)len_of_status,
(LPDWORD)headers_str)) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
- jk_ws_service_t::start_response, ServerSupportFunction
failed\n);
+ jk_ws_service_t::head, ServerSupportFunction failed\n);
return JK_ERR;
}
@@ -317,9 +317,23 @@
s-ssl_session = NULL;
s-ssl_key_size = -1;
-jk2_map_default_create(env, s-headers_out, s-pool );
-jk2_map_default_create(env, s-attributes, s-pool );
-jk2_map_default_create(env, s-headers_in, s-pool );
+if (JK_OK!=jk2_map_default_create(env, s-headers_out, s-pool )){
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ jk_ws_service_t::init, Failed to create headers_out map \n);
+return JK_ERR;
+
+}
+if (JK_OK!=jk2_map_default_create(env, s-attributes, s-pool )){
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ jk_ws_service_t::init, Failed to create attributes map \n);
+return JK_ERR;
+
+}
+if (JK_OK!=jk2_map_default_create(env, s-headers_in, s-pool )){
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ jk_ws_service_t::init, Failed to create headers_in map \n);
+return JK_ERR;
+}
//s-headers_values = NULL;
// s-num_headers = 0;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
costin 02/04/25 12:25:11
Modified:jk/native2/server/apache13 jk_service_apache13.c mod_jk2.c
jk/native2/server/apache2 jk_logger_apache2.c
jk_map_aprtable.c jk_service_apache2.c mod_jk2.c
jk/native2/server/isapi jk_service_iis.c
Log:
Update rc.
Revision ChangesPath
1.4 +12 -12
jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c
Index: jk_service_apache13.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_service_apache13.c 24 Mar 2002 19:22:19 - 1.3
+++ jk_service_apache13.c 25 Apr 2002 19:25:10 - 1.4
@@ -92,7 +92,7 @@
jk_map_t *headers;
if(s==NULL || s-ws_private==NULL )
-return JK_FALSE;
+return JK_ERR;
r = (request_rec *)s-ws_private;
@@ -149,7 +149,7 @@
/* ap_send_http_header(r); */
s-response_started = JK_TRUE;
-return JK_TRUE;
+return JK_OK;
}
/*
@@ -179,10 +179,10 @@
} else {
*actually_read = (unsigned) rv;
}
-return JK_TRUE;
+return JK_OK;
}
}
-return JK_FALSE;
+return JK_ERR;
}
/*
@@ -217,7 +217,7 @@
env-l-jkLog(env, env-l, JK_LOG_INFO,
service.write() default head\n);
if(!s-head(env, s)) {
-return JK_FALSE;
+return JK_ERR;
}
{
array_header *t = ap_table_elts(rr-headers_out);
@@ -244,7 +244,7 @@
bb+=CHUNK_SIZE;
if(toSend != r) {
-return JK_FALSE;
+return JK_ERR;
}
}
@@ -254,9 +254,9 @@
*/
ap_bflush(s-ws_private);
}
-return JK_TRUE;
+return JK_OK;
}
-return JK_FALSE;
+return JK_ERR;
}
/* = */
@@ -364,7 +364,7 @@
break;
default :
-return JK_FALSE;
+return JK_ERR;
}
s-is_ssl = JK_FALSE;
@@ -450,7 +450,7 @@
jk2_map_default_create(env, s-headers_out, s-pool );
-return JK_TRUE;
+return JK_OK;
}
/*
@@ -484,7 +484,7 @@
int jk2_service_apache13_init(jk_env_t *env, jk_ws_service_t *s)
{
if(s==NULL ) {
-return JK_FALSE;
+return JK_ERR;
}
s-head = jk2_service_apache13_head;
@@ -493,5 +493,5 @@
s-init = jk2_init_ws_service;
s-afterRequest = jk2_service_apache13_afterRequest;
-return JK_TRUE;
+return JK_OK;
}
1.10 +15 -8 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_jk2.c 9 Apr 2002 21:00:38 - 1.9
+++ mod_jk2.c 25 Apr 2002 19:25:11 - 1.10
@@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.9 $ *
+ * Version: $Revision: 1.10 $ *
***/
/*
@@ -123,7 +123,7 @@
int rc;
rc=workerEnv-config-setPropertyString( env, workerEnv-config, name, value );
-if( rc!=JK_TRUE ) {
+if( rc!=JK_OK ) {
fprintf( stderr, mod_jk2: Unrecognized option %s %s\n, name, value);
}
@@ -158,19 +158,26 @@
to a file. Check the logger for default settings.
*/
jkb=env-createBean2( env, env-globalPool, logger.file, );
-l = jkb-object;
+if( jkb==NULL ) {
+fprintf(stderr, Error creating logger );
+return JK_ERR;
+}
env-l=l;
env-alias( env, logger.file:, logger);
/* Create the workerEnv
*/
jkb=env-createBean2( env, env-globalPool,workerEnv, );
+if( jkb==NULL ) {
+fprintf(stderr, Error creating workerEnv );
+return JK_ERR;
+}
workerEnv=
RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
Update, after merging few dozens cvs conflicts :-) :-) , sorry bout that, I'll try to follow up your changes this evening ( here ), please wait for commits.. Saludos , Ignacio J. Ortega -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
nacho 02/04/19 07:17:08
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
Cleaning format, detabbify
Revision ChangesPath
1.6 +4 -4
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_service_iis.c 19 Apr 2002 14:03:28 - 1.5
+++ jk_service_iis.c 19 Apr 2002 14:17:08 - 1.6
@@ -59,7 +59,7 @@
* Description: IIS Jk2 Service
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Ignacio J. Ortega [EMAIL PROTECTED]
+ * Ignacio J. Ortega [EMAIL PROTECTED]
*/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -286,7 +286,7 @@
{
LPEXTENSION_CONTROL_BLOCK lpEcb=(LPEXTENSION_CONTROL_BLOCK)serverObj;
char *worker_name;
- char huge_buf[16 * 1024]; /* should be enough for all */
+char huge_buf[16 * 1024]; /* should be enough for all */
DWORD huge_buf_sz;
@@ -403,7 +403,7 @@
huge_buf_sz = sizeof(huge_buf);
if (get_server_value(env,
- lpEcb,
+lpEcb,
ALL_HTTP,
huge_buf,
huge_buf_sz,
@@ -508,7 +508,7 @@
if (s-content_read s-content_length ||
(s-is_chunked ! s-no_more_chunks)) {
- LPEXTENSION_CONTROL_BLOCK
lpEcb=(LPEXTENSION_CONTROL_BLOCK)s-ws_private;
+LPEXTENSION_CONTROL_BLOCK
lpEcb=(LPEXTENSION_CONTROL_BLOCK)s-ws_private;
char *buff = s-pool-calloc(env,s-pool, 2048);
if (buff != NULL) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
On Fri, 19 Apr 2002, Ignacio J. Ortega wrote: Update, after merging few dozens cvs conflicts :-) :-) , sorry bout that, I'll try to follow up your changes this evening ( here ), please wait for commits.. Today is shared memory-day, I'll not touch the IIS. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
nacho 02/04/19 11:48:57
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
* Work in progress
Adapting to jk_requtil.c
Revision ChangesPath
1.7 +3 -3
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_service_iis.c 19 Apr 2002 14:17:08 - 1.6
+++ jk_service_iis.c 19 Apr 2002 18:48:57 - 1.7
@@ -286,7 +286,7 @@
{
LPEXTENSION_CONTROL_BLOCK lpEcb=(LPEXTENSION_CONTROL_BLOCK)serverObj;
char *worker_name;
-char huge_buf[16 * 1024]; /* should be enough for all */
+char huge_buf[16 * 1024]; /* should be enough for all */
DWORD huge_buf_sz;
@@ -300,9 +300,9 @@
s-query_string = lpEcb-lpszQueryString;
/* *worker_name= DEFAULT_WORKER_NAME; */
GET_SERVER_VARIABLE_VALUE(URL, s-req_uri);
-if (unescape_url(s-req_uri) 0)
+if (jk_requtil_unescapeUrl(s-req_uri) 0)
return JK_FALSE;
-getparents(s-req_uri);
+jk_requtil_getParents(s-req_uri);
}
GET_SERVER_VARIABLE_VALUE(AUTH_TYPE, s-auth_type);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
costin 02/04/18 19:34:38
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
Update, after merging few dozens cvs conflicts :-)
Nacho already did most of the changes - I moved some stuff that is
not iis-specific in common and tried to reduce it to the essential.
Revision ChangesPath
1.4 +227 -454
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_service_iis.c 19 Apr 2002 00:23:45 - 1.3
+++ jk_service_iis.c 19 Apr 2002 02:34:38 - 1.4
@@ -59,8 +59,7 @@
* Description: IIS Jk2 Service
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Ignacio J. Ortega [EMAIL PROTECTED]
- * Version: $Revision: 1.3 $
+ * Ignacio J. Ortega [EMAIL PROTECTED]
*/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -71,7 +70,7 @@
#include wininet.h
#include jk_global.h
-//#include jk_util.h
+#include jk_requtil.h
#include jk_map.h
#include jk_pool.h
#include jk_env.h
@@ -79,387 +78,134 @@
#include jk_worker.h
#include jk_iis.h
-//#include jk_uri_worker_map.h
static char *SERVER_NAME = SERVER_NAME;
static char *SERVER_SOFTWARE = SERVER_SOFTWARE;
-static const char begin_cert [] =
- -BEGIN CERTIFICATE-\r\n;
-static const char end_cert [] =
- -END CERTIFICATE-\r\n;
-
-static const char basis_64[] =
-ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/;
-
-static int base64_encode_cert_len(int len)
-{
- int n = ((len + 2) / 3 * 4) + 1; // base64 encoded size
- n += (n + 63 / 64) * 2; // add CRLF's
- n += sizeof(begin_cert) + sizeof(end_cert) - 2; // add enclosing strings.
-return n;
-}
-
-static int base64_encode_cert(char *encoded,
- const unsigned char *string, int len)
-{
-int i,c;
-char *p;
- const char *t;
-
-p = encoded;
-
- t = begin_cert;
- while (*t != '\0')
- *p++ = *t++;
-
-c = 0;
-for (i = 0; i len - 2; i += 3) {
-*p++ = basis_64[(string[i] 2) 0x3F];
-*p++ = basis_64[((string[i] 0x3) 4) |
-((int) (string[i + 1] 0xF0) 4)];
-*p++ = basis_64[((string[i + 1] 0xF) 2) |
-((int) (string[i + 2] 0xC0) 6)];
-*p++ = basis_64[string[i + 2] 0x3F];
-c += 4;
-if ( c = 64 ) {
-*p++ = '\r';
-*p++ = '\n';
-c = 0;
- }
-}
-if (i len) {
-*p++ = basis_64[(string[i] 2) 0x3F];
-if (i == (len - 1)) {
-*p++ = basis_64[((string[i] 0x3) 4)];
-*p++ = '=';
-}
-else {
-*p++ = basis_64[((string[i] 0x3) 4) |
-((int) (string[i + 1] 0xF0) 4)];
-*p++ = basis_64[((string[i + 1] 0xF) 2)];
-}
-*p++ = '=';
-c++;
-}
-if ( c != 0 ) {
-*p++ = '\r';
-*p++ = '\n';
-}
-
- t = end_cert;
- while (*t != '\0')
- *p++ = *t++;
-
-*p++ = '\0';
-return p - encoded;
-}
-
-
-static char x2c(const char *what)
-{
-register char digit;
-
-digit = ((what[0] = 'A') ? ((what[0] 0xdf) - 'A') + 10 : (what[0] - '0'));
-digit *= 16;
-digit += (what[1] = 'A' ? ((what[1] 0xdf) - 'A') + 10 : (what[1] - '0'));
-return (digit);
-}
-
-static int unescape_url(char *url)
-{
-register int x, y, badesc, badpath;
-
-badesc = 0;
-badpath = 0;
-for (x = 0, y = 0; url[y]; ++x, ++y) {
-if (url[y] != '%')
-url[x] = url[y];
-else {
-if (!isxdigit(url[y + 1]) || !isxdigit(url[y + 2])) {
-badesc = 1;
-url[x] = '%';
-}
-else {
-url[x] = x2c(url[y + 1]);
-y += 2;
-if (url[x] == '/' || url[x] == '\0')
-badpath = 1;
-}
-}
-}
-url[x] = '\0';
-if (badesc)
-return BAD_REQUEST;
-else if (badpath)
-return BAD_PATH;
-else
-return 0;
-}
-
-static void getparents(char *name)
-{
-int l, w;
-
-/* Four paseses, as per RFC 1808 */
-/* a) remove ./ path segments */
-
-for (l = 0, w =
