cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c jk_config.c jk_env.c jk_handler_logon.c jk_requtil.c jk_uriEnv.c jk_worker_ajp13.c
jfclere 02/05/23 07:54:07
Modified:jk/native2/common jk_channel_socket.c jk_config.c jk_env.c
jk_handler_logon.c jk_requtil.c jk_uriEnv.c
jk_worker_ajp13.c
Log:
Arrange comments for Solaris8 native compiler.
Revision ChangesPath
1.28 +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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_channel_socket.c 16 May 2002 21:03:44 - 1.27
+++ jk_channel_socket.c 23 May 2002 14:54:07 - 1.28
@@ -250,7 +250,7 @@
jk_channel_t *ch,
jk_endpoint_t *endpoint)
{
-//int err;
+/*int err; */
jk_channel_socket_private_t *socketInfo=
(jk_channel_socket_private_t *)(ch-_privatePtr);
@@ -588,7 +588,7 @@
result-setAttribute= jk2_channel_socket_setAttribute;
-//result-getAttributeInfo=jk2_channel_socket_getAttributeInfo;
+/*result-getAttributeInfo=jk2_channel_socket_getAttributeInfo;*/
result-multiValueInfo=jk2_channel_socket_multiValueInfo;
result-setAttributeInfo=jk2_channel_socket_setAttributeInfo;
1.21 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Index: jk_config.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_config.c 22 May 2002 23:40:36 - 1.20
+++ jk_config.c 23 May 2002 14:54:07 - 1.21
@@ -58,7 +58,7 @@
/***
* Description: General purpose config object *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.20 $ *
+ * Version: $Revision: 1.21 $ *
***/
#include jk_global.h
@@ -96,7 +96,7 @@
char *workerFile)
{
FILE *fp;
-//char buf[LENGTH_OF_LINE + 1];
+/*char buf[LENGTH_OF_LINE + 1];*/
int i,j;
if( workerFile==NULL )
@@ -168,9 +168,9 @@
jk_bean_t *w = NULL;
char *type=NULL;
char *dot=0;
-//int i;
-//char **comp;
-//int nrComp;
+/*int i; */
+/*char **comp; */
+/*int nrComp; */
char *lastDot;
char *lastDot1;
1.27 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Index: jk_env.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_env.c 16 May 2002 23:48:27 - 1.26
+++ jk_env.c 23 May 2002 14:54:07 - 1.27
@@ -154,7 +154,7 @@
static jk_bean_t *jk2_env_createBean( jk_env_t *env, jk_pool_t *pool, char *objName
)
{
char *type=NULL;
-//void *obj;
+/*void *obj; */
char *localName;
localName=strchr( objName, ':' );
@@ -406,7 +406,7 @@
const char *fmt, ... )
{
va_list args;
-//char *buf;
+/*char *buf; */
va_start(args, fmt);
env-l-jkVLog(env, env-l, file, line, JK_LOG_ERROR_LEVEL, fmt, args );
1.17 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c
Index: jk_handler_logon.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_handler_logon.c15 May 2002 19:45:45 - 1.16
+++ jk_handler_logon.c23 May 2002 14:54:07 - 1.17
@@ -58,7 +58,7 @@
/**
* Description: AJP14 Login handler
* Author: Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.16 $
+ * Version: $Revision: 1.17 $
*/
#include jk_global.h
@@ -173,7 +173,7 @@
{
unsigned long nego;
char *sname;
-//int rc;
+/*int rc; */
nego = msg-getLong(env, msg);
1.19 +3 -3
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c jk_config.c
costin 02/05/14 13:42:49
Modified:jk/native2/common jk_channel_socket.c jk_config.c
Log:
Various small fixes, reduce logging verbosity ( by using the component debug level )
Revision ChangesPath
1.25 +4 -3 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_channel_socket.c 14 May 2002 17:27:21 - 1.24
+++ jk_channel_socket.c 14 May 2002 20:42:49 - 1.25
@@ -308,9 +308,10 @@
int set = 1;
setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,(char *)set,sizeof(set));
}
-
-env-l-jkLog(env, env-l, JK_LOG_INFO,
- channelSocket.connect(), sock = %d\n, sock);
+
+if( ch-mbean-debug 0 )
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ channelSocket.connect(), sock = %d\n, sock);
{
jk_channel_socket_data_t *sd=endpoint-channelData;
1.17 +16 -11jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Index: jk_config.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_config.c 14 May 2002 17:12:45 - 1.16
+++ jk_config.c 14 May 2002 20:42:49 - 1.17
@@ -58,7 +58,7 @@
/***
* Description: General purpose config object *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.16 $ *
+ * Version: $Revision: 1.17 $ *
***/
#include jk_global.h
@@ -624,6 +624,7 @@
int *didReload, int firstTime)
{
int rc;
+int csOk;
struct stat statbuf;
time_t mtime;
jk_map_t *cfgData;
@@ -631,8 +632,11 @@
if( didReload!=NULL )
*didReload=JK_FALSE;
-if( cfg-file==NULL )
+if( cfg-file==NULL ) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ config.update(): No config file );
return JK_ERR;
+}
rc=stat(cfg-file, statbuf);
if (rc == -1) {
@@ -641,12 +645,12 @@
return JK_ERR;
}
-if( statbuf.st_mtime cfg-mtime )
+if( !firstTime statbuf.st_mtime cfg-mtime )
return JK_OK;
-JK_ENTER_CS(cfg-cs, rc);
+JK_ENTER_CS(cfg-cs, csOk);
-if(rc !=JK_TRUE) {
+if(csOk !=JK_TRUE) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
cfg.update() Can't enter critical section\n);
return JK_ERR;
@@ -658,12 +662,12 @@
if (rc == -1) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
config.update(): Can't find config file %s, cfg-file );
-JK_LEAVE_CS(cfg-cs, rc);
+JK_LEAVE_CS(cfg-cs, csOk);
return JK_ERR;
}
-if( statbuf.st_mtime = cfg-mtime ) {
-JK_LEAVE_CS(cfg-cs, rc);
+if( ! firstTime statbuf.st_mtime = cfg-mtime ) {
+JK_LEAVE_CS(cfg-cs, csOk);
return JK_OK;
}
@@ -683,7 +687,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
config.setConfig(): Error reading properties %s\n,
cfg-file );
-JK_LEAVE_CS(cfg-cs, rc);
+JK_LEAVE_CS(cfg-cs, csOk);
return JK_ERR;
}
@@ -691,9 +695,10 @@
if( didReload!=NULL )
*didReload=JK_TRUE;
+
cfg-mtime= statbuf.st_mtime;
-JK_LEAVE_CS(cfg-cs, rc);
+JK_LEAVE_CS(cfg-cs, csOk);
return rc;
}
@@ -707,7 +712,7 @@
/** Set a property for this config object
*/
static int JK_METHOD jk2_config_setAttribute( struct jk_env *env, struct jk_bean
*mbean,
-char *name, void *valueP)
+ char *name, void *valueP)
{
jk_config_t *cfg=mbean-object;
char *value=valueP;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c jk_config.c
costin 02/04/25 11:49:37
Modified:jk/native2/common jk_channel_socket.c jk_config.c
Log:
Update return codes.
Revision ChangesPath
1.20 +16 -16jakarta-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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_channel_socket.c 12 Apr 2002 21:49:03 - 1.19
+++ jk_channel_socket.c 25 Apr 2002 18:49:37 - 1.20
@@ -131,9 +131,9 @@
} else if( strcmp( port, name ) == 0 ) {
socketInfo-port=atoi( value );
} else {
- return JK_FALSE;
+ return JK_ERR;
}
-return JK_TRUE;
+return JK_OK;
}
/** resolve the host IP ( jk_resolve ) and initialize the channel.
@@ -180,7 +180,7 @@
socketInfo-host=DEFAULT_HOST;
rc=jk2_channel_socket_resolve( env, socketInfo-host, socketInfo-port,
socketInfo-addr );
-if( rc!= JK_TRUE ) {
+if( rc!= JK_OK ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR, jk2_channel_socket_init:
can't resolve %s:%d errno=%d\n, socketInfo-host,
socketInfo-port, errno );
}
@@ -213,7 +213,7 @@
/* If we found also characters we use gethostbyname()*/
struct hostent *hoste = gethostbyname(host);
if(!hoste) {
-return JK_FALSE;
+return JK_ERR;
}
laddr = ((struct in_addr *)hoste-h_addr_list[0])-s_addr;
@@ -223,7 +223,7 @@
}
memcpy((rc-sin_addr), laddr , sizeof(laddr));
-return JK_TRUE;
+return JK_OK;
}
static int jk2_close_socket(jk_env_t *env, int s)
@@ -268,7 +268,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelSocket.open(): can't create socket %d %s\n,
errno, strerror( errno ) );
-return JK_FALSE;
+return JK_ERR;
}
/* Tries to connect to JServ (continues trying while error is EINTR) */
@@ -292,7 +292,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelSocket.connect() connect failed %s:%d %d %s \n,
socketInfo-host, socketInfo-port, errno, strerror( errno )
);
-return JK_FALSE;
+return JK_ERR;
}
if(ndelay) {
@@ -313,7 +313,7 @@
}
sd-sock=sock;
}
-return JK_TRUE;
+return JK_OK;
}
@@ -325,7 +325,7 @@
int sd;
jk_channel_socket_data_t *chD=endpoint-channelData;
if( chD==NULL )
- return JK_FALSE;
+ return JK_ERR;
sd=chD-sock;
chD-sock=-1;
@@ -357,7 +357,7 @@
jk_channel_socket_data_t *chD=endpoint-channelData;
if( chD==NULL )
- return JK_FALSE;
+ return JK_ERR;
msg-end( env, msg );
len=msg-len;
@@ -376,7 +376,7 @@
sent += this_time;
}
/* return sent; */
-return JK_TRUE;
+return JK_OK;
}
@@ -398,7 +398,7 @@
int rdlen;
if( chD==NULL )
- return JK_FALSE;
+ return JK_ERR;
sd=chD-sock;
rdlen = 0;
@@ -451,7 +451,7 @@
if( blen 0 ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelSocket.receive(): Bad header\n );
-return JK_FALSE;
+return JK_ERR;
}
rc= jk2_channel_socket_readN( env, ch, endpoint, msg-buf + hlen, blen);
@@ -460,13 +460,13 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
channelSocket.receive(): Error receiving message body %d %d\n,
rc, errno);
-return JK_FALSE;
+return JK_ERR;
}
env-l-jkLog(env, env-l, JK_LOG_INFO,
channelSocket.receive(): Received len=%d type=%d\n,
blen, (int)msg-buf[hlen]);
-return JK_TRUE;
+return JK_OK;
}
@@ -499,5 +499,5 @@
ch-workerEnv=env-getByName( env, workerEnv );
ch-workerEnv-addChannel( env, ch-workerEnv, ch );
-return JK_TRUE;
+return JK_OK;
}
1.12 +31 -31jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Index: jk_config.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_config.c 12 Apr 2002 23:08:45 - 1.11
+++ jk_config.c 25 Apr 2002 18:49:37 - 1.12
@@ -58,7 +58,7 @@
/***
* Description: General purpose config object
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c jk_config.c jk_env.c jk_uriEnv.c jk_worker_ajp13.c jk_worker_status.c
costin 02/03/24 11:24:26
Modified:jk/native2/common jk_channel_socket.c jk_config.c jk_env.c
jk_uriEnv.c jk_worker_ajp13.c jk_worker_status.c
Log:
Small fixes, cosmetic changes, move closer to the target documented behavior.
( hopefully the implemented reality and the plan will meet in the midle :-)
Revision ChangesPath
1.16 +3 -3 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_channel_socket.c 18 Mar 2002 18:25:05 - 1.15
+++ jk_channel_socket.c 24 Mar 2002 19:24:26 - 1.16
@@ -148,7 +148,7 @@
short port=socketInfo-port;
if( port=0 )
-port=8007;
+port=8009;
if( host==NULL )
host=DEFAULT_HOST;
@@ -264,8 +264,8 @@
if(ret != 0 ) {
jk2_close_socket(env, sock);
env-l-jkLog(env, env-l, JK_LOG_ERROR,
- channelSocket.connect() connect failed %d %s\n,
- errno, strerror( errno ) );
+ channelSocket.connect() connect failed %s:%d %d %s \n,
+ socketInfo-host, socketInfo-port, errno, strerror( errno )
);
return JK_FALSE;
}
1.5 +17 -17jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Index: jk_config.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_config.c 23 Mar 2002 17:21:56 - 1.4
+++ jk_config.c 24 Mar 2002 19:24:26 - 1.5
@@ -58,7 +58,7 @@
/***
* Description: General purpose config object *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***/
#include jk_global.h
@@ -95,13 +95,13 @@
if (stat(workerFile, statbuf) == -1) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
- Can't find config file %s, workerFile );
+ config.setConfig(): Can't find config file %s, workerFile );
return JK_FALSE;
}
/** Read worker files
*/
-env-l-jkLog(env, env-l, JK_LOG_DEBUG, Reading config %s %d\n,
+env-l-jkLog(env, env-l, JK_LOG_INFO, config.setConfig(): Reading config %s
%d\n,
workerFile, cfg-map-size(env, cfg-map) );
jk2_map_default_create(env, props, wEnv-pool);
@@ -110,11 +110,11 @@
if( err==JK_TRUE ) {
env-l-jkLog(env, env-l, JK_LOG_INFO,
- mod_jk.initJk() Reading worker properties %s %d\n,
+ config.setConfig(): Reading properties %s %d\n,
workerFile, props-size( env, props ) );
} else {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
- mod_jk.initJk() Error reading worker properties %s\n,
+ config.setConfig(): Error reading properties %s\n,
workerFile );
return JK_FALSE;
}
@@ -163,7 +163,7 @@
for( j=0; j mbean-settings-size( env, mbean-settings ); j++ ) {
char *pname=mbean-settings-nameAt( env, mbean-settings, j);
/* Don't save redundant information */
-if( strcmp( pname, name ) != NULL ) {
+if( strcmp( pname, name ) != 0 ) {
fprintf( fp, %s=%s\n,
pname,
mbean-settings-valueAt( env, mbean-settings, j));
@@ -252,27 +252,27 @@
(objName[len] == '\0') ) ) {
/* We found the factory. */
type=factName;
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
- Found %s %s %s %d %d\n, type, objName,
- factName, len, strncmp( objName, factName, len));
+/* env-l-jkLog(env, env-l, JK_LOG_INFO, */
+/* Found %s %s %s %d %d\n, type,
objName, */
+/* factName, len, strncmp( objName, factName,
len)); */
break;
}
}
if( type==NULL ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
-
