hgomez 2003/10/16 01:41:06
Modified: jk/native2/common jk_channel_apr_socket.c
jk_channel_socket.c jk_worker_ajp13.c
Log:
Now it compile
Revision Changes Path
1.33 +2 -3
jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
Index: jk_channel_apr_socket.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jk_channel_apr_socket.c 16 Oct 2003 07:51:48 -0000 1.32
+++ jk_channel_apr_socket.c 16 Oct 2003 08:41:06 -0000 1.33
@@ -91,7 +91,6 @@
short port;
int keepalive;
int timeout;
- int
};
typedef struct jk_channel_apr_private jk_channel_apr_private_t;
@@ -146,8 +145,8 @@
char *name )
{
jk_channel_t *ch=(jk_channel_t *)bean->object;
- jk_channel_socket_private_t *socketInfo=
- (jk_channel_socket_private_t *)(ch->_privatePtr);
+ jk_channel_apr_private_t *socketInfo=
+ (jk_channel_apr_private_t *)(ch->_privatePtr);
if( strcmp( name, "name" )==0 ) {
return bean->name;
1.58 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- jk_channel_socket.c 16 Oct 2003 07:51:48 -0000 1.57
+++ jk_channel_socket.c 16 Oct 2003 08:41:06 -0000 1.58
@@ -244,7 +244,7 @@
static int JK_METHOD jk2_channel_socket_hasinput(jk_env_t *env,
jk_channel_t *ch,
jk_endpoint_t *endpoint,
-
int timeout)
+ int timeout)
{
fd_set rset;
fd_set eset;
@@ -259,7 +259,7 @@
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout % 1000) * 1000;
- rc = select(ae->sd + 1, &rset, NULL, &eset, &tv);
+ rc = select(endpoint->sd + 1, &rset, NULL, &eset, &tv);
if ((rc < 1) || (FD_ISSET(endpoint->sd, &eset)))
{
1.51 +4 -5 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- jk_worker_ajp13.c 16 Oct 2003 07:51:48 -0000 1.50
+++ jk_worker_ajp13.c 16 Oct 2003 08:41:06 -0000 1.51
@@ -124,7 +124,7 @@
} else if (strcmp( name, "graceful" )==0 ) {
return jk2_env_itoa( env, worker->graceful );
} else if (strcmp( name, "connectTimeout" )==0 ) {
- return jk2_env_itoa( env, worket->connect_timeout);
+ return jk2_env_itoa( env, worker->connect_timeout);
} else if (strcmp( name, "replyTimeout" )==0 ) {
return jk2_env_itoa( env, worker->reply_timeout);
} else if (strcmp( name, "prepostTimeout" )==0 ) {
@@ -277,9 +277,9 @@
*/
static int jk2_check_alive(jk_env_t *env, jk_endpoint_t *ae, int timeout) {
+ int err;
jk_channel_t *channel=ae->worker->channel;
jk_msg_t * msg=ae->reply;
-;
jk2_serialize_cping( env, msg, ae );
err = ae->worker->channel->send( env, ae->worker->channel, ae, msg );
@@ -312,7 +312,6 @@
return JK_ERR;
}
-
return JK_OK;
}
@@ -353,7 +352,7 @@
/** XXX use a 'connected' field */
if( ae->sd == -1 ) ae->sd=0;
- if (ae->worker->connect_timeout != 0 )
+ if (ae->worker->connect_timeout != 0 ) {
if (jk2_check_alive(env, ae, ae->worker->connect_timeout) != JK_OK)
return JK_ERR;
}
@@ -582,7 +581,7 @@
s->content_read=0;
if (w->prepost_timeout != 0) {
- if (jk2_check_alive(env, ae, ae->worker->prepost_timeout) != JK_OK)
+ if (jk2_check_alive(env, e, e->worker->prepost_timeout) != JK_OK)
return JK_ERR;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
