jfclere 2004/01/29 06:17:41
Modified: jk/native2/common jk_channel_apr_socket.c
jk_channel_socket.c jk_worker_ajp13.c
jk/native2/include jk_global.h
Log:
Arrange default values, add AJP13_DEF_PORT and AJP13_DEF_HOST.
Use 9009 on NETWARE because 8009 is already used on those systems.
Submitted by Guenter Knauf, eflash at gmx.net.
Revision Changes Path
1.35 +3 -5
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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jk_channel_apr_socket.c 30 Oct 2003 20:08:36 -0000 1.34
+++ jk_channel_apr_socket.c 29 Jan 2004 14:17:41 -0000 1.35
@@ -70,8 +70,6 @@
#include "jk_global.h"
#include "jk_registry.h"
-#define DEFAULT_HOST "127.0.0.1"
-
/** Information specific for the socket channel
*/
struct jk_channel_apr_private {
@@ -179,7 +177,7 @@
char *portIdx=strchr( localName, ':' );
if( portIdx==NULL || portIdx[1]=='\0' ) {
- socketInfo->port=8009;
+ socketInfo->port=AJP13_DEF_PORT;
} else {
portIdx++;
socketInfo->port=atoi( portIdx );
@@ -196,10 +194,10 @@
}
if( socketInfo->port<=0 )
- socketInfo->port=8009;
+ socketInfo->port=AJP13_DEF_PORT;
if( socketInfo->host==NULL )
- socketInfo->host=DEFAULT_HOST;
+ socketInfo->host=AJP13_DEF_HOST;
rc=jk2_channel_apr_resolve( env, socketInfo->host, socketInfo->port, socketInfo
);
if( rc!= JK_OK ) {
1.61 +5 -7 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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- jk_channel_socket.c 30 Oct 2003 20:25:38 -0000 1.60
+++ jk_channel_socket.c 29 Jan 2004 14:17:41 -0000 1.61
@@ -94,8 +94,6 @@
#include "apr_general.h"
#endif
-#define DEFAULT_HOST "127.0.0.1"
-
/** Information specific for the socket channel
*/
struct jk_channel_socket_private {
@@ -199,12 +197,12 @@
char *localName=ch->mbean->localName;
if( *localName=='\0' ) {
/* Empty local part */
- socketInfo->port=8009;
- if( socketInfo->host==NULL) socketInfo->host=DEFAULT_HOST;
+ socketInfo->port=AJP13_DEF_PORT;
+ if( socketInfo->host==NULL) socketInfo->host=AJP13_DEF_HOST;
} else {
char *portIdx=strchr( localName, ':' );
if( portIdx==NULL || portIdx[1]=='\0' ) {
- socketInfo->port=8009;
+ socketInfo->port=AJP13_DEF_PORT;
} else {
portIdx++;
socketInfo->port=atoi( portIdx );
@@ -224,11 +222,11 @@
/* error if port= 40009 ( for example */
/*
if( socketInfo->port<=0 )
- socketInfo->port=8009;
+ socketInfo->port=AJP13_DEF_PORT;
*/
if( socketInfo->host==NULL )
- socketInfo->host=DEFAULT_HOST;
+ socketInfo->host=AJP13_DEF_HOST;
rc=jk2_channel_socket_resolve( env, socketInfo->host, socketInfo->port,
&socketInfo->addr );
if( rc!= JK_OK ) {
1.53 +0 -6 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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- jk_worker_ajp13.c 30 Oct 2003 20:08:36 -0000 1.52
+++ jk_worker_ajp13.c 29 Jan 2004 14:17:41 -0000 1.53
@@ -75,12 +75,6 @@
#include "jk_requtil.h"
#include "jk_registry.h"
-#define AJP_DEF_RETRY_ATTEMPTS (2)
-#define AJP13_PROTO 13
-
-#define AJP13_DEF_HOST ("localhost")
-#define AJP13_DEF_PORT (8009)
-
/* -------------------- Impl -------------------- */
static char *jk2_worker_ajp13_getAttributeInfo[]={ "lb_factor", "lb_value",
"debug", "channel", "level",
"route", "routeRedirect",
"errorState", "graceful", "groups", "disabled",
1.21 +11 -1 jakarta-tomcat-connectors/jk/native2/include/jk_global.h
Index: jk_global.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_global.h 19 Nov 2003 23:58:20 -0000 1.20
+++ jk_global.h 29 Jan 2004 14:17:41 -0000 1.21
@@ -128,6 +128,16 @@
#define JK_VERSION JK_MAKEVERSION(JK_VERMAJOR, JK_VERMINOR, JK_VERFIX, JK_VERBETA)
+#define AJP_DEF_RETRY_ATTEMPTS (2)
+#define AJP13_PROTO 13
+
+#define AJP13_DEF_HOST "127.0.0.1"
+#ifdef NETWARE
+ #define AJP13_DEF_PORT 9009 /* default to 9009 since 8009 is used by OS */
+#else
+ #define AJP13_DEF_PORT 8009
+#endif
+
#ifdef WIN32
#include <windows.h>
#include <winsock.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
