cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
hgomez 2004/03/24 05:32:20 Modified:jk/native2/include jk_global.h Log: Mark as release Revision ChangesPath 1.24 +2 -2 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.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jk_global.h 21 Mar 2004 09:39:57 - 1.23 +++ jk_global.h 24 Mar 2004 13:32:20 - 1.24 @@ -60,7 +60,7 @@ #define JK_VERBETA 0 #define JK_BETASTRING 1 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 0 +#define JK_VERISRELEASE 1 /** END OF AREA TO MODIFY BEFORE RELEASING */ #define PACKAGE mod_jk2/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
hgomez 2004/03/24 05:40:48 Modified:jk/native2/include jk_global.h Log: jk2 2.0.4 has been tagged as jk2_2_0_4. Switch to jk2 2.0.5-dev Revision ChangesPath 1.25 +4 -4 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.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- jk_global.h 24 Mar 2004 13:32:20 - 1.24 +++ jk_global.h 24 Mar 2004 13:40:48 - 1.25 @@ -53,14 +53,14 @@ /** START OF AREA TO MODIFY BEFORE RELEASING */ #define JK_VERMAJOR 2 #define JK_VERMINOR 0 -#define JK_VERFIX 4 -#define JK_VERSTRING2.0.4 +#define JK_VERFIX 5 +#define JK_VERSTRING2.0.5 /* Beta number */ #define JK_VERBETA 0 #define JK_BETASTRING 1 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 1 +#define JK_VERISRELEASE 0 /** END OF AREA TO MODIFY BEFORE RELEASING */ #define PACKAGE mod_jk2/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
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 ChangesPath
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 - 1.34
+++ jk_channel_apr_socket.c 29 Jan 2004 14:17:41 - 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 - 1.60
+++ jk_channel_socket.c 29 Jan 2004 14:17:41 - 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 - 1.52
+++ jk_worker_ajp13.c 29 Jan 2004 14:17:41 - 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
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
mmanders2003/11/19 15:58:20
Modified:jk/native2/include jk_global.h
Log:
Patch submitted by Guenter Knauf to get mod_jk2 to build for NetWare.
Revision ChangesPath
1.20 +38 -24jakarta-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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_global.h 30 Oct 2003 20:11:33 - 1.19
+++ jk_global.h 19 Nov 2003 23:58:20 - 1.20
@@ -133,24 +133,28 @@
#include winsock.h
#else
#include unistd.h
-#include netdb.h
-
-#include netinet/in.h
-#include sys/socket.h
-#ifndef NETWARE
-#include netinet/tcp.h
-#include arpa/inet.h
-#include sys/un.h
-#if !defined(_OSD_POSIX) !defined(AS400) !defined(CYGWIN)
-#include sys/socketvar.h
-#endif
-#if !defined(HPUX11) !defined(AS400)
-#include sys/select.h
+#ifdef __NOVELL_LIBC__
+#include novsock2.h
+#else
+#include netdb.h
+
+#include netinet/in.h
+#include sys/socket.h
+#ifndef NETWARE
+#include netinet/tcp.h
+#include arpa/inet.h
+#include sys/un.h
+#if !defined(_OSD_POSIX) !defined(AS400) !defined(CYGWIN)
+#include sys/socketvar.h
+#endif
+#if !defined(HPUX11) !defined(AS400)
+#include sys/select.h
+#endif
#endif
+
+#include sys/time.h
+#include sys/ioctl.h
#endif
-
-#include sys/time.h
-#include sys/ioctl.h
#endif
#ifdef WIN32
@@ -219,11 +223,19 @@
#endif
#if defined(WIN32) || defined(NETWARE)
-#define JK_METHOD __stdcall
-#define C_LEVEL_TRY_START __try {
-#define C_LEVEL_TRY_END }
-#define C_LEVEL_FINALLY_START __finally {
-#define C_LEVEL_FINALLY_END }
+#ifdef __GNUC__
+#define JK_METHOD
+#define C_LEVEL_TRY_START
+#define C_LEVEL_TRY_END
+#define C_LEVEL_FINALLY_START
+#define C_LEVEL_FINALLY_END
+#else
+#define JK_METHOD __stdcall
+#define C_LEVEL_TRY_START __try {
+#define C_LEVEL_TRY_END }
+#define C_LEVEL_FINALLY_START __finally {
+#define C_LEVEL_FINALLY_END }
+#endif
#define PATH_SEPERATOR (';')
#define PATH_SEPARATOR_STR (;)
#define FILE_SEPERATOR ('\\')
@@ -238,8 +250,10 @@
#define strncasecmp strnicmp
#endif
-#ifndef vsnprintf
-#define vsnprintf _vsnprintf
+#ifndef __NOVELL_LIBC__
+#ifndef vsnprintf
+#define vsnprintf _vsnprintf
+#endif
#endif
#else
#define JK_METHOD
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
mturk 2002/11/27 09:12:05 Modified:jk/native2/include jk_global.h Log: Change the version number to the 2.0.3 and mark as not nonreleased. The exposed version will be mod_jk2/2.0.3-beta-1. Perhaps we should change the beta to dev? Revision ChangesPath 1.16 +4 -4 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.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jk_global.h 18 Oct 2002 11:25:44 - 1.15 +++ jk_global.h 27 Nov 2002 17:12:05 - 1.16 @@ -86,14 +86,14 @@ /** START OF AREA TO MODIFY BEFORE RELEASING */ #define JK_VERMAJOR 2 #define JK_VERMINOR 0 -#define JK_VERFIX 2 -#define JK_VERSTRING2.0.2 +#define JK_VERFIX 3 +#define JK_VERSTRING2.0.3 /* Beta number */ #define JK_VERBETA 1 #define JK_BETASTRING 1 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 1 +#define JK_VERISRELEASE 0 /** END OF AREA TO MODIFY BEFORE RELEASING */ #define PACKAGE mod_jk2/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
[EMAIL PROTECTED] wrote: mturk 2002/11/27 09:12:05 Modified:jk/native2/include jk_global.h Log: Change the version number to the 2.0.3 and mark as not nonreleased. The exposed version will be mod_jk2/2.0.3-beta-1. Perhaps we should change the beta to dev? +1 to switch jk/jk2 to -dev, it's the Apache HTTPD numbering schema -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
mturk 2002/11/27 23:36:31
Modified:jk/native2/include jk_global.h
Log:
Change the versioning scheme.
If the JK_VERISRELEASE is 0, then the '-dev' suffix will be added.
If the JK_VERBETA is greater then 0, the '-beta-X' suffix will be added.
So for example:
JK_VERISRELEASE 0, JK_VERBETA 1 - mod_jk2/2.0.3-dev-beta-1
JK_VERISRELEASE 0, JK_VERBETA 0 - mod_jk2/2.0.3-dev
JK_VERISRELEASE 1, JK_VERBETA 1 - mod_jk2/2.0.3-beta-1
JK_VERISRELEASE 0, JK_VERBETA 0 - mod_jk2/2.0.3
Revision ChangesPath
1.17 +22 -8 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_global.h 27 Nov 2002 17:12:05 - 1.16
+++ jk_global.h 28 Nov 2002 07:36:31 - 1.17
@@ -90,7 +90,7 @@
#define JK_VERSTRING2.0.3
/* Beta number */
-#define JK_VERBETA 1
+#define JK_VERBETA 0
#define JK_BETASTRING 1
/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
#define JK_VERISRELEASE 0
@@ -100,12 +100,19 @@
/* Build JK_EXPOSED_VERSION and JK_VERSION */
#define JK_EXPOSED_VERSION_INT PACKAGE JK_VERSTRING
+
#if ( JK_VERISRELEASE == 1 )
-#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT
-#undef JK_VERBETA
-#define JK_VERBETA 255
+ #define JK_RELEASE_STR JK_EXPOSED_VERSION_INT
+#else
+ #define JK_RELEASE_STR JK_EXPOSED_VERSION_INT -dev
+#endif
+
+#if ( JK_VERBETA == 0 )
+#define JK_EXPOSED_VERSION JK_RELEASE_STR
+#undef JK_VERBETA
+#define JK_VERBETA 255
#else
-#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT -beta- JK_BETASTRING
+#define JK_EXPOSED_VERSION JK_RELEASE_STR -beta- JK_BETASTRING
#endif
#define JK_MAKEVERSION(major, minor, fix, beta) (((major) 24) + ((minor) 16)
+ ((fix) 8) + (beta))
@@ -193,7 +200,14 @@
/* Some compileers support 'inline'. How to guess ?
#define INLINE inline
*/
-#define INLINE
+
+/* For VC the __inline keyword is available in both C and C++.*/
+#if defined(_WIN32) defined(_MSC_VER)
+#define INLINE __inline
+#else
+/* XXX: Other compilers? */
+#define INLINE
+#endif
#define JK_WORKER_FILE_TAG (worker_file)
#define JK_MOUNT_FILE_TAG (worker_mount_file)
@@ -201,7 +215,7 @@
#define JK_LOG_FILE_TAG (log_file)
#define JK_WORKER_NAME_TAG (worker)
-#define JK_WORKER_FILE_DEF (workers.properties)
+#define JK_WORKER_FILE_DEF (${serverRoot}/conf/workers2.properties)
#define JK_LOG_LEVEL_DEF(emerg)
#define JK_TRUE (1)
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
mturk 2002/10/18 04:25:44 Modified:jk/native2/include jk_global.h Log: Change the exposed version number and string to 2.0.2 Revision ChangesPath 1.15 +3 -3 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.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jk_global.h 24 Sep 2002 22:45:18 - 1.14 +++ jk_global.h 18 Oct 2002 11:25:44 - 1.15 -86,8 +86,8 /** START OF AREA TO MODIFY BEFORE RELEASING */ #define JK_VERMAJOR 2 #define JK_VERMINOR 0 -#define JK_VERFIX 0 -#define JK_VERSTRING2.0.0 +#define JK_VERFIX 2 +#define JK_VERSTRING2.0.2 /* Beta number */ #define JK_VERBETA 1 -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
costin 2002/06/10 16:58:52 Modified:jk/native2/common jk_logger_file.c jk/native2/include jk_global.h Log: Remove apr include from logger_file ( which can still be used without APR, for apache13 use ), move it to global, in the section that deals with the other apr includes. Revision ChangesPath 1.30 +1 -3 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c Index: jk_logger_file.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- jk_logger_file.c 10 Jun 2002 22:13:15 - 1.29 +++ jk_logger_file.c 10 Jun 2002 23:58:52 - 1.30 @@ -63,8 +63,6 @@ ***/ -#include apr_strings.h - #include jk_env.h #include jk_map.h #include jk_logger.h 1.13 +2 -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.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jk_global.h 16 May 2002 20:49:53 - 1.12 +++ jk_global.h 10 Jun 2002 23:58:52 - 1.13 @@ -151,6 +151,7 @@ #include apr.h #include apr_errno.h #include apr_time.h +#include apr_strings.h #else -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
hgomez 02/05/13 03:35:48 Modified:jk/native2/include jk_global.h Log: change from mod_jk/ to mod_jk2/, just to prevent users which could have both jk1 (native) and jk2 (native2) installed at the same time (it's possible), to see reports like mod_jk/1.2.1 mod_jk/2.0.0. Revision ChangesPath 1.10 +2 -2 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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jk_global.h 11 May 2002 17:29:28 - 1.9 +++ jk_global.h 13 May 2002 10:35:48 - 1.10 @@ -59,7 +59,7 @@ * Description: Global definitions and include files that should exist * * anywhere * * Author: Gal Shachor [EMAIL PROTECTED] * - * Version: $Revision: 1.9 $ * + * Version: $Revision: 1.10 $ * ***/ #ifndef JK_GLOBAL_H @@ -89,7 +89,7 @@ #define JK_VERISRELEASE 1 /** END OF AREA TO MODIFY BEFORE RELEASING */ -#define PACKAGE mod_jk/ +#define PACKAGE mod_jk2/ /* Build JK_EXPOSED_VERSION and JK_VERSION */ #define JK_EXPOSED_VERSION_INT PACKAGE JK_VERSTRING -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
costin 02/04/25 11:39:44
Modified:jk/native2/include jk_global.h
Log:
Make JK_OK consistent with APR_SUCCESS. Use similar error code.
I've also changed most of jk to use JK_OK/JK_ERR consistently. For a next
release it should use jkThrow() maybe, but for now the JK_TRUE was too
confusing.
Revision ChangesPath
1.8 +35 -5 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_global.h 18 Apr 2002 22:55:36 - 1.7
+++ jk_global.h 25 Apr 2002 18:39:44 - 1.8
@@ -59,7 +59,7 @@
* Description: Global definitions and include files that should exist *
* anywhere *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.7 $ *
+ * Version: $Revision: 1.8 $ *
***/
#ifndef JK_GLOBAL_H
@@ -142,6 +142,39 @@
extern C {
#endif /* __cplusplus */
+/* We'll use APR whenever it's possible. However for a transition period and
+ for essential components we can build a minimal mod_jk without APR.
+*/
+
+#ifdef HAS_APR
+
+#include apr.h
+#include apr_errno.h
+
+#else
+
+/* No APR - define for forward/backward compatibility
+ */
+
+/* cutpaste from apr_errno.h */
+typedef int apr_status_t;
+#define APR_SUCCESS (0)
+#define APR_OS_START_USEERR 21000
+
+typedef unsigned char apr_byte_t;
+typedef short apr_int16_t;
+typedef unsigned short apr_uint16_t;
+typedef int apr_int32_t;
+typedef unsigned intapr_uint32_t;
+
+#endif
+
+#define JK_OK APR_SUCCESS
+#define JK_ERR APR_OS_START_USEERR
+/* Individual jk errors */
+
+#define JK_
+
/* Some compileers support 'inline'. How to guess ?
#define INLINE inline
*/
@@ -156,9 +189,6 @@
#define JK_WORKER_FILE_DEF (workers.properties)
#define JK_LOG_LEVEL_DEF(emerg)
-#define JK_OK (0)
-#define JK_ERR (1)
-
#define JK_TRUE (1)
#define JK_FALSE (0)
@@ -215,7 +245,7 @@
#define PATH_SEPARATOR_STR (:)
#define FILE_SEPARATOR_STR (/)
#define PATH_ENV_VARIABLE (LD_LIBRARY_PATH)
- #define HAVE_UNIXSOCKETS
+#define HAVE_UNIXSOCKETS
#endif
/*
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
costin 02/04/18 15:55:36 Modified:jk/native2/include jk_global.h Log: Added JK_ERR. Probably a better solution is to just use APR_SUCCESS, etc ( and define them if apr is not used ) Revision ChangesPath 1.7 +2 -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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_global.h 17 Apr 2002 22:46:35 - 1.6 +++ jk_global.h 18 Apr 2002 22:55:36 - 1.7 @@ -59,7 +59,7 @@ * Description: Global definitions and include files that should exist * * anywhere * * Author: Gal Shachor [EMAIL PROTECTED] * - * Version: $Revision: 1.6 $ * + * Version: $Revision: 1.7 $ * ***/ #ifndef JK_GLOBAL_H @@ -157,6 +157,7 @@ #define JK_LOG_LEVEL_DEF(emerg) #define JK_OK (0) +#define JK_ERR (1) #define JK_TRUE (1) #define JK_FALSE (0) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h jk_shm.h
costin 02/04/17 15:46:35 Modified:jk/native2/include jk_global.h jk_shm.h Log: Add a JK_OK constant - JK_TRUE is the reverse of APR_SUCCESS. I'll eventually to a regexp replacement - things are working, but in future we may run into problems with this. Revision ChangesPath 1.6 +3 -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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jk_global.h 12 Apr 2002 21:49:03 - 1.5 +++ jk_global.h 17 Apr 2002 22:46:35 - 1.6 @@ -59,7 +59,7 @@ * Description: Global definitions and include files that should exist * * anywhere * * Author: Gal Shachor [EMAIL PROTECTED] * - * Version: $Revision: 1.5 $ * + * Version: $Revision: 1.6 $ * ***/ #ifndef JK_GLOBAL_H @@ -156,6 +156,8 @@ #define JK_WORKER_FILE_DEF (workers.properties) #define JK_LOG_LEVEL_DEF(emerg) +#define JK_OK (0) + #define JK_TRUE (1) #define JK_FALSE (0) 1.2 +4 -0 jakarta-tomcat-connectors/jk/native2/include/jk_shm.h Index: jk_shm.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_shm.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jk_shm.h 10 Apr 2002 23:44:56 - 1.1 +++ jk_shm.h 17 Apr 2002 22:46:35 - 1.2 @@ -117,6 +117,10 @@ */ int (*init)(struct jk_env *env, struct jk_shm *shm); +/** Detach from the shared memory segment + */ +int (*destroy)(struct jk_env *env, struct jk_shm *shm); + /** Get a shm slot. Each slot has different rules for synchronization, based on type. */ struct jk_shm_slot *(*getSlot)(struct jk_env *env, struct jk_shm *shm, char *name, int size); -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
costin 02/01/11 20:43:04
Modified:jk/native2/include jk_global.h
Log:
In global we have a lot of platform specific stuff, added some more.
There is absolutely no reason to ask the user to specify the file separator
and all those things when we already know them.
( workerEnv.init will add them automatically to the init properties. )
Revision ChangesPath
1.3 +19 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_global.h 4 Dec 2001 18:33:50 - 1.2
+++ jk_global.h 12 Jan 2002 04:43:04 - 1.3
@@ -59,7 +59,7 @@
* Description: Global definitions and include files that should exist *
* anywhere *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.2 $ *
+ * Version: $Revision: 1.3 $ *
***/
#ifndef JK_GLOBAL_H
@@ -165,6 +165,20 @@
#define JK_SESSION_IDENTIFIER JSESSIONID
#define JK_PATH_SESSION_IDENTIFIER ;jsessionid
+#if defined(WIN32)
+#define SO_EXTENSION dll
+#else
+ #if defined(NETWARE)
+ #define SO_EXTENSION nlm
+ #else
+ #define SO_EXTENSION so
+ #endif
+#endif
+
+#ifndef ARCH
+#define ARCH i386
+#endif
+
#if defined(WIN32) || defined(NETWARE)
#define JK_METHOD __stdcall
#define C_LEVEL_TRY_START __try {
@@ -172,7 +186,9 @@
#define C_LEVEL_FINALLY_START __finally {
#define C_LEVEL_FINALLY_END }
#define PATH_SEPERATOR (';')
+#define PATH_SEPARATOR_STR (;)
#define FILE_SEPERATOR ('\\')
+#define FILE_SEPARATOR_STR (\\)
#define PATH_ENV_VARIABLE (PATH)
/* incompatible names... */
@@ -187,6 +203,8 @@
#define C_LEVEL_FINALLY_END
#define PATH_SEPERATOR (':')
#define FILE_SEPERATOR ('/')
+#define PATH_SEPARATOR_STR (:)
+#define FILE_SEPARATOR_STR (/)
#define PATH_ENV_VARIABLE (LD_LIBRARY_PATH)
#endif
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h jk_uriMap.h
costin 01/12/04 10:33:50 Modified:jk/native2/include jk_global.h jk_uriMap.h Log: Few comments and a 'local debug' field in uriMap. The version info is now in jk_global.h Revision ChangesPath 1.2 +31 -3 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jk_global.h 2001/12/01 22:30:57 1.1 +++ jk_global.h 2001/12/04 18:33:50 1.2 @@ -59,14 +59,12 @@ * Description: Global definitions and include files that should exist * * anywhere * * Author: Gal Shachor [EMAIL PROTECTED] * - * Version: $Revision: 1.1 $ * + * Version: $Revision: 1.2 $ * ***/ #ifndef JK_GLOBAL_H #define JK_GLOBAL_H -#include jk_version.h - #include stdio.h #include stdlib.h #include string.h @@ -77,6 +75,36 @@ #include sys/types.h #include sys/stat.h + +/** START OF AREA TO MODIFY BEFORE RELEASING */ +#define JK_VERMAJOR 1 +#define JK_VERMINOR 2 +#define JK_VERFIX 0 +#define JK_VERSTRING1.2.0 + +/* Beta number */ +#define JK_VERBETA 1 +#define JK_BETASTRING 1 +/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ +#define JK_VERISRELEASE 1 +/** END OF AREA TO MODIFY BEFORE RELEASING */ + +#define PACKAGE mod_jk/ +/* Build JK_EXPOSED_VERSION and JK_VERSION */ +#define JK_EXPOSED_VERSION_INT PACKAGE JK_VERSTRING + +#if ( JK_VERISRELEASE == 1 ) +#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT +#undef JK_VERBETA +#define JK_VERBETA 255 +#else +#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT -beta- JK_BETASTRING +#endif + +#define JK_MAKEVERSION(major, minor, fix, beta) (((major) 24) + ((minor) 16) + ((fix) 8) + (beta)) + +#define JK_VERSION JK_MAKEVERSION(JK_VERMAJOR, JK_VERMINOR, JK_VERFIX, JK_VERBETA) + #ifdef WIN32 #include windows.h 1.2 +6 -0 jakarta-tomcat-connectors/jk/native2/include/jk_uriMap.h Index: jk_uriMap.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_uriMap.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jk_uriMap.h 2001/12/01 22:06:29 1.1 +++ jk_uriMap.h 2001/12/04 18:33:50 1.2 @@ -96,15 +96,21 @@ unsigned int size; unsigned int capacity; struct jk_workerEnv *workerEnv; +int debug; /* -- Methods -- */ +/** Initialize the map. This should be called after all workers +were added. It'll check if mappings have valid workers. +*/ int (*init)( jk_uriMap_t *_this, struct jk_workerEnv *workerEnv, jk_map_t *init_data ); void (*destroy)( jk_uriMap_t *_this ); +/** Add a servlet mapping. Can be done before init() + */ jk_uriEnv_t *(*addMapping)( jk_uriMap_t *_this, const char *vhost, const char *uri, -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
