cvs commit: jakarta-tomcat-connectors/jni/native/include tcn.h
jfclere 2005/08/27 09:14:50 Modified:jni/native/include tcn.h Log: Add support for sableVM. Revision ChangesPath 1.31 +6 -1 jakarta-tomcat-connectors/jni/native/include/tcn.h Index: tcn.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/include/tcn.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- tcn.h 12 Jul 2005 14:56:10 - 1.30 +++ tcn.h 27 Aug 2005 16:14:50 - 1.31 @@ -100,8 +100,13 @@ #define TCN_IMPARGS JNIEnv *e, jobject o, void *sock #define TCN_IMPCALL(X) e, o, X->opaque +#ifdef HAVE_SABLEVM +#define TCN_IMPLEMENT_CALL(RT, CL, FN) \ +JNIEXPORT RT JNICALL Java_org_apache_tomcat_jni_##CL##_##FN##__J +#else #define TCN_IMPLEMENT_CALL(RT, CL, FN) \ JNIEXPORT RT JNICALL Java_org_apache_tomcat_jni_##CL##_##FN +#endif #define TCN_IMPLEMENT_METHOD(RT, FN)\ static RT method_##FN - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/build tcnative.m4
jfclere 2005/08/22 13:30:18 Modified:jni/native configure.in jni/native/build tcnative.m4 Log: Allow to use sableVM. Revision ChangesPath 1.10 +11 -4 jakarta-tomcat-connectors/jni/native/configure.in Index: configure.in === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure.in 2 Aug 2005 11:33:11 - 1.9 +++ configure.in 22 Aug 2005 20:30:18 - 1.10 @@ -85,16 +85,23 @@ AC_PROG_INSTALL dnl -dnl Find the APR-ICONV directory. +dnl Find the JVM related information dnl TCN_FIND_JDK -TCN_FIND_JDK_OS +TCN_SABLEVM +APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include]) + +dnl sableVM does not have/need $JAVA_OS/jni_md.h +if test "$SABLEVM" = "NONE" +then + TCN_FIND_JDK_OS + APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include/$JAVA_OS]) +fi + AC_SUBST(JAVA_HOME) AC_SUBST(JAVA_PLATFORM) AC_SUBST(JAVA_OS) -APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include]) -APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include/$JAVA_OS]) dnl dnl Detect openssl toolkit installation 1.10 +16 -0 jakarta-tomcat-connectors/jni/native/build/tcnative.m4 Index: tcnative.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/build/tcnative.m4,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tcnative.m4 12 Jun 2005 06:10:13 - 1.9 +++ tcnative.m4 22 Aug 2005 20:30:18 - 1.10 @@ -195,6 +195,22 @@ ]) ]) +dnl check for sableVM +dnl (copied from daemon/src/native/unix/support/apjava.m4) +AC_DEFUN( + [TCN_SABLEVM], + [ + if test x"$JAVA_HOME" != x + then +AC_PATH_PROG(SABLEVM,sablevm,NONE,$JAVA_HOME/bin) +if test "$SABLEVM" != "NONE" +then + AC_MSG_RESULT([Using sableVM: $SABLEVM]) + CFLAGS="$CFLAGS -DHAVE_SABLEVM" +fi + fi + ]) + dnl TCN_HELP_STRING(LHS, RHS) dnl Autoconf 2.50 can not handle substr correctly. It does have dnl AC_HELP_STRING, so let's try to call it if we can. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors KEYS
jfclere 2005/07/27 03:13:26 Modified:.KEYS Log: Add the KEY I have used to sign some binaries of 1.2.14. Revision ChangesPath 1.15 +32 -0 jakarta-tomcat-connectors/KEYS Index: KEYS === RCS file: /home/cvs/jakarta-tomcat-connectors/KEYS,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- KEYS 26 Mar 2004 22:07:06 - 1.14 +++ KEYS 27 Jul 2005 10:13:26 - 1.15 @@ -291,3 +291,35 @@ LlyuImI= =FGUc -END PGP PUBLIC KEY BLOCK- + +Type Bits/KeyID Date User ID +pub 1024D/36E67A94 2004-02-15 Jean-frederic Clere <[EMAIL PROTECTED]> + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.2.4 (GNU/Linux) + +mQGiBEAvwq4RBACwe89USUq3kvB62DjSiMf4vqMFwkqXTwpAE4OY9Bnd2/X+IdW7 +sZP+7rEFWQrmuDufwunGgqFuFII0QZNePSQvp9sC7fynkJBXhq9h+8vhbjybrgQg +1Ol5vyoCK9YJQ4rC4w+3dTSO3k8QHX7Pq5bLrFmAIA3mwH/2Umhr7PD6GwCgqXWD +ODUYmJetCqRbyeu/etM6eeUD/0rEPOOBb5xC2Z23K8p8cIXyySMxZMtnCwnzSu55 +V69cwsUAe0lgKFY1m3dd28YRLZgJXndq+XItO3D6/ewlwoNJSJ4RRIy6hCJuLqAS +jHuKtqr1bEAtD22FNQNx+l48TsuLaLq5qK09QPztNkUhie99tZ8uaLaQRYxkGgm7 +UjR5BACM1+0ViwywliydIjTkyis3L468Xi1ps/9VjnouwM/TvcwXVxiGFgN1NFD5 +8xOZsTWYt+RfkanJksUF20IYCkOt3OeHPEZVWLpk2AZgygKBBS9boWEpdqAOM1QD +AUpuswhbABRnUyKDf1TpLkCOSmmItp4YvVMianTwQ9u/nuYpyrQnSmVhbi1mcmVk +ZXJpYyBDbGVyZSA8amZjbGVyZUBzaW5peC5uZXQ+iFsEExECABsFAkAvwq4GCwkI +BwMCAxUCAwMWAgECHgECF4AACgkQ+MMM5jbmepRqxQCfdaqkM9TpTmbigRGkvYVa +vh3/8jQAoKZro8AOMFnoDFtdJxfkhIPwFptbiJwEEwECAAYFAkAxzQYACgkQN+P0 +X+5l4yGmKwP/c0+aSjy62sJRK+Y6W3P3HP1HGePLibTVHLX3I5Dt/lYBVjHVgADF +2C8cz5oIIENZfyCMaerUY/yllC7vw0X6g28XPfLaMil58kBvxZTkKreqF7qm3NvA +HsJU5UJ0EchnRo2YnUVq2oqWbdYpWuMXngYTcDXW9PAAud0Pz0BXRqa5AQ0EQC/C +sxAEAIvO8n3BsjA3WVsM1ztuLXzZp/J1pEozTlz3BgB2Pr1ixf8IbnzlmFl2yvGF +dJdkpZfmdMjC7TxOrG6+5MWESnrDcEZBQjS92nTvcG3auKQSsS4RVojLzZMwfznB +2u+pgLVEs3sXu6YGyz33dib6B7GouxZbn6jcYSltRObFwS1bAAMFA/0c1G8MhNIt +PUzuXxQNmLY2hZuRkImnEIvMkGqcYVu2ozmTMuuqqlsT6tccQOFiVjCYJ73LWTSr +9hch/D3eRoZK/rTO+HdR25SM1CcgoYdvCpuAXenxvzVt9MT4mULYyP/GukAjVACW +3G2gr883fKM9fqILDfLnOzUMKHYorkWJPIhGBBgRAgAGBQJAL8KzAAoJEPjDDOY2 +5nqUAjkAnj5RPx86y2gLNSJamLL8yM2hMWUqAJ4gs+wXl8LSYzHzca71SLZzqNKw +oA== +=Vfcm +-END PGP PUBLIC KEY BLOCK- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk HOWTO-RELEASE
jfclere 2005/07/26 11:18:24 Modified:jk HOWTO-RELEASE Log: Add something about http://jakarta.apache.org/site/downloads/downloads_tomcat-connectors.cgi Revision ChangesPath 1.14 +19 -0 jakarta-tomcat-connectors/jk/HOWTO-RELEASE Index: HOWTO-RELEASE === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/HOWTO-RELEASE,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- HOWTO-RELEASE 6 Jul 2005 15:04:50 - 1.13 +++ HOWTO-RELEASE 26 Jul 2005 18:18:24 - 1.14 @@ -221,6 +221,25 @@ Copy old source distributions and binaries as needed, then remove the old source and binary distributions. +Arrange the downloads_tomcat-connectors.cgi +--- + +Check jakarta-site out: +svn co https://svn.apache.org/repos/asf/jakarta/site site-jakarta + + +Arrange the file: xdocs/downloads/downloads.xml + +Use ant to regenerate the corresponding html file: +docs/site/downloads/downloads_tomcat-connectors.html + +Commit it after checking carefully the changes. + +Connect to people.apache.org and update the jakarta.apache.org site image, +the site jakarta.apache.org should reflect the change after a while. +cd /x2/www/jakarta.apache.org/site/downloads +svn update downloads_tomcat-connectors.html + Announcements - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs index.xml
jfclere 2005/07/26 09:25:39 Modified:jk/xdocs index.xml Log: maark 1.2.14(.1) as stable. Revision ChangesPath 1.41 +2 -2 jakarta-tomcat-connectors/jk/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- index.xml 21 Jul 2005 21:11:40 - 1.40 +++ index.xml 26 Jul 2005 16:25:39 - 1.41 @@ -29,8 +29,8 @@ 13 July 2005 - JK-1.2.14 released -The Apache Jakarta Tomcat team is proud to announce the immediate availability -of Jakarta Tomcat Connectors 1.2.14 tarbals for testing. +The Apache Tomcat team is proud to announce the immediate availability +of Jakarta Tomcat Connectors 1.2.14 Stable. Download the http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-1.2.14.1-src.tar.gz";>JK 1.2.14 release sources | http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-1.2.14.1-src.tar.gz.asc";>PGP signature - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/news 20050101.xml
jfclere 2005/07/26 09:22:29 Modified:jk/xdocs/news 20050101.xml Log: mark it stable. Revision ChangesPath 1.6 +3 -5 jakarta-tomcat-connectors/jk/xdocs/news/20050101.xml Index: 20050101.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/news/20050101.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- 20050101.xml 13 Jul 2005 15:57:43 - 1.5 +++ 20050101.xml 26 Jul 2005 16:22:29 - 1.6 @@ -23,14 +23,11 @@ --> 13 July - JK-1.2.14 released -The Apache Jakarta Tomcat team is proud to announce the immediate availability -of Jakarta Tomcat Connectors 1.2.14. This is development release and contains +The Apache Tomcat team is proud to announce the immediate availability +of Jakarta Tomcat Connectors 1.2.14. This is Stable release and it contains few bug fixes found in 1.2.13 version. -We expect it to be ratified as a Stable release soon. - - Please see the ChangeLog for a full list of changes. If you find any bugs while using this release, please fill in the @@ -38,6 +35,7 @@ Bug Report. When entering bug select Native:JK Component. + 7 May - JK-1.2.13 released The Apache Jakarta Tomcat team is proud to announce the immediate availability - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_version.h
jfclere 2005/07/26 09:04:10 Modified:jk/native/common jk_version.h Log: Bump the version to 1.2.15-dev Revision ChangesPath 1.45 +4 -4 jakarta-tomcat-connectors/jk/native/common/jk_version.h Index: jk_version.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_version.h,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- jk_version.h 6 Jul 2005 13:44:25 - 1.44 +++ jk_version.h 26 Jul 2005 16:04:10 - 1.45 @@ -25,14 +25,14 @@ /** START OF AREA TO MODIFY BEFORE RELEASING */ #define JK_VERMAJOR 1 #define JK_VERMINOR 2 -#define JK_VERFIX 14 -#define JK_VERSTRING"1.2.14" +#define JK_VERFIX 15 +#define JK_VERSTRING"1.2.15" /* Beta number */ #define JK_VERBETA 0 #define JK_BETASTRING "0" /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 1 +#define JK_VERISRELEASE 0 #define JK_VERRC0 #define JK_RCSTRING "0" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java
jfclere 2005/07/14 15:35:21
Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
Log:
throw an exception if listen or bind fails.
Revision ChangesPath
1.64 +6 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Index: AprEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- AprEndpoint.java 14 Jul 2005 17:45:25 - 1.63
+++ AprEndpoint.java 14 Jul 2005 22:35:21 - 1.64
@@ -511,9 +511,13 @@
serverSock = Socket.create(Socket.APR_INET, Socket.SOCK_STREAM,
Socket.APR_PROTO_TCP, rootPool);
// Bind the server socket
-Socket.bind(serverSock, inetAddress);
+int ret = Socket.bind(serverSock, inetAddress);
+if (ret != 0)
+ throw(new Exception("bind failed: " + ret));
// Start listening on the server socket
-Socket.listen(serverSock, backlog);
+ret = Socket.listen(serverSock, backlog);
+if (ret != 0)
+ throw(new Exception("listen failed: " + ret));
// Sendfile usage on systems which don't support it cause major
problems
if (useSendfile && !Library.APR_HAS_SENDFILE) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/news 20050101.xml
jfclere 2005/07/13 08:57:43 Modified:jk/xdocs/news 20050101.xml Log: Add information about the release. Revision ChangesPath 1.5 +17 -4 jakarta-tomcat-connectors/jk/xdocs/news/20050101.xml Index: 20050101.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/news/20050101.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- 20050101.xml 16 May 2005 06:40:31 - 1.4 +++ 20050101.xml 13 Jul 2005 15:57:43 - 1.5 @@ -21,6 +21,23 @@ --> + +13 July - JK-1.2.14 released +The Apache Jakarta Tomcat team is proud to announce the immediate availability +of Jakarta Tomcat Connectors 1.2.14. This is development release and contains +few bug fixes found in 1.2.13 version. + + +We expect it to be ratified as a Stable release soon. + + + Please see the ChangeLog for a full list of changes. + +If you find any bugs while using this release, please fill in the +http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla +Bug Report. When entering bug select Native:JK Component. + + 7 May - JK-1.2.13 released The Apache Jakarta Tomcat team is proud to announce the immediate availability @@ -28,10 +45,6 @@ few bug fixes found in 1.2.12 version. -We expect it to be ratified as a Stable release and to be re-tagged to 1.2.14 version -within next two weeks. - - Please see the ChangeLog for a full list of changes. If you find any bugs while using this release, please fill in the - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs index.xml
jfclere 2005/07/13 08:42:44 Modified:jk/xdocs index.xml Log: Add a some line about the release. Revision ChangesPath 1.39 +11 -0 jakarta-tomcat-connectors/jk/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- index.xml 13 Jul 2005 15:29:54 - 1.38 +++ index.xml 13 Jul 2005 15:42:44 - 1.39 @@ -28,6 +28,17 @@ +13 July 2005 - JK-1.2.14 released +The Apache Jakarta Tomcat team is proud to announce the immediate availability +of Jakarta Tomcat Connectors 1.2.14 tarbals for testing. + +Download the http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-1.2.14.1-src.tar.gz";>JK 1.2.14 release sources + | http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-1.2.14.1-src.tar.gz.asc";>PGP signature + +Download the http://www.apache.org/dist/jakarta/tomcat-connectors/jk/binaries/";>binaries for selected platforms. + + + 16 May 2005 - JK-1.2.13 released The Apache Jakarta Tomcat team is proud to announce the immediate availability of Jakarta Tomcat Connectors 1.2.13 tarbals for testing. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs index.xml
jfclere 2005/07/13 08:29:54 Modified:jk/xdocs index.xml Log: typos. Revision ChangesPath 1.38 +3 -3 jakarta-tomcat-connectors/jk/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- index.xml 5 Jul 2005 09:34:31 - 1.37 +++ index.xml 13 Jul 2005 15:29:54 - 1.38 @@ -30,9 +30,9 @@ 16 May 2005 - JK-1.2.13 released The Apache Jakarta Tomcat team is proud to announce the immediate availability -of Jakarta Tomcat Connectors 1.2.13 tarrbals for testing. +of Jakarta Tomcat Connectors 1.2.13 tarbals for testing. -Downlad the http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.13/jakarta-tomcat-connectors-1.2.13-src.tar.gz";>JK 1.2.13 release sources +Download the http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.13/jakarta-tomcat-connectors-1.2.13-src.tar.gz";>JK 1.2.13 release sources | http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.13/jakarta-tomcat-connectors-1.2.13-src.tar.gz.asc";>PGP signature Download the http://www.apache.org/dist/jakarta/tomcat-connectors/jk/binaries/";>binaries for selected platforms. @@ -42,7 +42,7 @@ The Apache Jakarta Tomcat team is proud to announce the immediate availability of Jakarta Tomcat Connectors 1.2.12. -Downlad the http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.12/jakarta-tomcat-connectors-1.2.12-src.tar.gz";>JK 1.2.12 release sources +Download the http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.12/jakarta-tomcat-connectors-1.2.12-src.tar.gz";>JK 1.2.12 release sources | http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.12/jakarta-tomcat-connectors-1.2.12-src.tar.gz.asc";>PGP signature Download the http://www.apache.org/dist/jakarta/tomcat-connectors/jk/binaries/";>binaries for selected platforms. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/howto index.xml
jfclere 2005/07/11 09:35:13 Modified:jk/xdocs/howto index.xml Log: Comment out the todo's... Until the next release. Revision ChangesPath 1.4 +2 -0 jakarta-tomcat-connectors/jk/xdocs/howto/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/index.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.xml 4 Jul 2005 08:01:00 - 1.3 +++ index.xml 11 Jul 2005 16:35:13 - 1.4 @@ -24,6 +24,7 @@ + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/tools jkrelease.sh
jfclere 2005/07/11 05:38:19
Modified:jk/tools Tag: JK_1_2_14 jkrelease.sh
Log:
The install files have been included in the howto so BUILDING was containing
garbages.
Revision ChangesPath
No revision
No revision
1.10.2.1 +7 -3 jakarta-tomcat-connectors/jk/tools/jkrelease.sh
Index: jkrelease.sh
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/tools/jkrelease.sh,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- jkrelease.sh 5 Jul 2005 10:43:07 - 1.10
+++ jkrelease.sh 11 Jul 2005 12:38:18 - 1.10.2.1
@@ -94,9 +94,13 @@
# Export text docs
cd ../native
-${TOOL} ../build/docs/install/printer/apache1.html >BUILDING
-${TOOL} ../build/docs/install/printer/apache2.html >>BUILDING
-${TOOL} ../build/docs/install/printer/iis.html >>BUILDING
+echo "See http://jakarta.apache.org/tomcat/connectors-doc/howto/apache.html
for Apache" >BUILDING
+echo "See http://jakarta.apache.org/tomcat/connectors-doc/howto/iis.html for
iis" >>BUILDING
+echo "http://jakarta.apache.org/tomcat/connectors-doc/howto/domino.html for
Domino" >>BUILDING
+echo "http://jakarta.apache.org/tomcat/connectors-doc/howto/nes.html for
Netscape/iPlanet/SunOne" >>BUILDING
+# ${TOOL} ../build/docs/install/printer/apache1.html >BUILDING
+# ${TOOL} ../build/docs/install/printer/apache2.html >>BUILDING
+# ${TOOL} ../build/docs/install/printer/iis.html >>BUILDING
${TOOL} ../build/docs/printer/changelog.html >CHANGES
${TOOL} ../build/docs/news/printer/20050101.html >NEWS
${TOOL} ../build/docs/news/printer/20041100.html >>NEWS
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs apr.xml
jfclere 2005/07/10 10:20:22 Modified:webapps/docs apr.xml Log: Start documenting the minimal SSL parameters to allow testing. Revision ChangesPath 1.5 +26 -2 jakarta-tomcat-catalina/webapps/docs/apr.xml Index: apr.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/apr.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apr.xml 4 Jul 2005 18:39:09 - 1.4 +++ apr.xml 10 Jul 2005 17:20:22 - 1.5 @@ -159,9 +159,33 @@ - + + + + Name of the SSLEngine to use. off: Do not use SSL, on: Use SSL but no specific ENGINE. + The default value is off. + + + + + Name of the file that contains the server certificate. The format is PEM-encoded. + + + + + Name of the file that contains the server private key. The format is PEM-encoded. + The default value is the value of "SSLCertificateFile" and in this case both certificate + and private key have to be in this file (NOT RECOMMENDED). + + + + + Pass phrase for the encrypted private key. If "SSLPassword" is not provided, the callback fonction + should prompt for the pass phrase. + + + - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common portable.h
jfclere 2005/07/06 08:58:53 Modified:jk/native/common Tag: JK_1_2_14 portable.h Log: arrange JK_1_2_14. Revision ChangesPath No revision No revision 1.4.2.1 +0 -110jakarta-tomcat-connectors/jk/native/common/portable.h Index: portable.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/portable.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- portable.h6 Jul 2005 13:52:06 - 1.4 +++ portable.h6 Jul 2005 15:58:53 - 1.4.2.1 @@ -1,111 +1 @@ /* On most platform this file is overwritten when doing configure */ -/* common/portable.h. Generated by configure. */ -/* common/portable.h.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Have flock() */ -#define HAVE_FLOCK 1 - -/* Use int for JK_UINT8 */ -/* #undef HAVE_INT64 */ - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Use unsigned long for JK_UINT4 */ -/* #undef HAVE_LONG */ - -/* Use long for JK_UINT8 */ -/* #undef HAVE_LONG64 */ - -/* Use longlong for JK_UINT8 */ -/* #undef HAVE_LONGLONG64 */ - -/* Use long long for JK_UINT8 */ -#define HAVE_LONG_LONG64 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Have snprintf() */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Use uint32_t for JK_UINT4 */ -#define HAVE_UINT32_T - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Use u_int32_t for JK_UINT4 */ -/* #undef HAVE_U_INT32_T */ - -/* Have vsnprintf() */ -#define HAVE_VSNPRINTF 1 - -/* Name of package */ -#define PACKAGE "mod_jk" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* The size of a `uint32_t', as computed by sizeof. */ -#define SIZEOF_UINT32_T 4 - -/* The size of a `unsigned int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_INT 4 - -/* The size of a `unsigned long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG 4 - -/* The size of a `unsigned longlong', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONGLONG 0 - -/* The size of a `unsigned long long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG_LONG 8 - -/* The size of a `u_int32_t', as computed by sizeof. */ -#define SIZEOF_U_INT32_T 4 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to use SO_RCVTIMEO with setsockopt() */ -#define USE_SO_RCVTIMEO 1 - -/* Define to use SO_SNDTIMEO with setsockopt() */ -#define USE_SO_SNDTIMEO 1 - -/* Version number of package */ -#define VERSION "1.2.14" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common portable.h.sample portable.h
jfclere 2005/07/06 08:39:23 Modified:jk/native/common portable.h Added: jk/native/common portable.h.sample Log: add a sample because portable.h breaks Netware and windoze. Revision ChangesPath 1.5 +1 -110jakarta-tomcat-connectors/jk/native/common/portable.h Index: portable.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/portable.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- portable.h6 Jul 2005 13:52:06 - 1.4 +++ portable.h6 Jul 2005 15:39:23 - 1.5 @@ -1,111 +1,2 @@ /* On most platform this file is overwritten when doing configure */ -/* common/portable.h. Generated by configure. */ -/* common/portable.h.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Have flock() */ -#define HAVE_FLOCK 1 - -/* Use int for JK_UINT8 */ -/* #undef HAVE_INT64 */ - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Use unsigned long for JK_UINT4 */ -/* #undef HAVE_LONG */ - -/* Use long for JK_UINT8 */ -/* #undef HAVE_LONG64 */ - -/* Use longlong for JK_UINT8 */ -/* #undef HAVE_LONGLONG64 */ - -/* Use long long for JK_UINT8 */ -#define HAVE_LONG_LONG64 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Have snprintf() */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Use uint32_t for JK_UINT4 */ -#define HAVE_UINT32_T - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Use u_int32_t for JK_UINT4 */ -/* #undef HAVE_U_INT32_T */ - -/* Have vsnprintf() */ -#define HAVE_VSNPRINTF 1 - -/* Name of package */ -#define PACKAGE "mod_jk" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* The size of a `uint32_t', as computed by sizeof. */ -#define SIZEOF_UINT32_T 4 - -/* The size of a `unsigned int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_INT 4 - -/* The size of a `unsigned long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG 4 - -/* The size of a `unsigned longlong', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONGLONG 0 - -/* The size of a `unsigned long long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG_LONG 8 - -/* The size of a `u_int32_t', as computed by sizeof. */ -#define SIZEOF_U_INT32_T 4 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to use SO_RCVTIMEO with setsockopt() */ -#define USE_SO_RCVTIMEO 1 - -/* Define to use SO_SNDTIMEO with setsockopt() */ -#define USE_SO_SNDTIMEO 1 - -/* Version number of package */ -#define VERSION "1.2.14" +/* DON'T COMMIT THE FILE IT BREAKS windoze and Netware, commit the sample file */ 1.1 jakarta-tomcat-connectors/jk/native/common/portable.h.sample Index: portable.h.sample === /* On most platform this file is overwritten when doing configure */ /* common/portable.h. Generated by configure. */ /* common/portable.h.in. Generated from configure.in by autoheader. */ /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 /* Have flock() */ #define HAVE_FLOCK 1 /* Use int for JK_UINT8 */ /* #undef HAVE_INT64 */ /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 /* Use unsigned long for JK_UINT4 */ /* #undef HAVE_LONG */ /* Use long for JK_UINT8 */ /* #undef HAVE_LONG64 */ /* Use longlong for JK_UINT8 */ /* #undef HAVE_LONGLONG64 */ /* Use long long for JK_UINT8 */ #define HAVE_LONG_LONG64 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_
cvs commit: jakarta-tomcat-connectors/jk HOWTO-RELEASE
jfclere 2005/07/06 08:04:50
Modified:jk HOWTO-RELEASE
Log:
tagging only jk is not enough (common will be missing).
Revision ChangesPath
1.13 +3 -3 jakarta-tomcat-connectors/jk/HOWTO-RELEASE
Index: HOWTO-RELEASE
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/HOWTO-RELEASE,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HOWTO-RELEASE 4 Jul 2005 09:26:17 - 1.12
+++ HOWTO-RELEASE 6 Jul 2005 15:04:50 - 1.13
@@ -64,11 +64,11 @@
After updating revision numbers, commit your changes to CVS.
-Tag and branch jk in CVS
+Tag and branch jakarta-tomcat-connectors in CVS
-Change directory (cd) to jakarta-tomcat-connectors/jk
-Use the pattern below for branching and tagging the jk directory.
+Change directory (cd) to jakarta-tomcat-connectors
+Use the pattern below for branching and tagging the
jakarta-tomcat-connectors directory.
cvs tag -b JK_{MAJOR_REVISION}_{MINOR_REVISION}_{RELEASE}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common portable.h
jfclere 2005/07/06 06:52:06 Modified:jk/native/common portable.h Log: just for the plaforms that don't have configure... Revision ChangesPath 1.4 +110 -0jakarta-tomcat-connectors/jk/native/common/portable.h Index: portable.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/portable.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- portable.h2 Dec 2004 06:50:01 - 1.3 +++ portable.h6 Jul 2005 13:52:06 - 1.4 @@ -1 +1,111 @@ /* On most platform this file is overwritten when doing configure */ +/* common/portable.h. Generated by configure. */ +/* common/portable.h.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Have flock() */ +#define HAVE_FLOCK 1 + +/* Use int for JK_UINT8 */ +/* #undef HAVE_INT64 */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Use unsigned long for JK_UINT4 */ +/* #undef HAVE_LONG */ + +/* Use long for JK_UINT8 */ +/* #undef HAVE_LONG64 */ + +/* Use longlong for JK_UINT8 */ +/* #undef HAVE_LONGLONG64 */ + +/* Use long long for JK_UINT8 */ +#define HAVE_LONG_LONG64 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Have snprintf() */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Use uint32_t for JK_UINT4 */ +#define HAVE_UINT32_T + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Use u_int32_t for JK_UINT4 */ +/* #undef HAVE_U_INT32_T */ + +/* Have vsnprintf() */ +#define HAVE_VSNPRINTF 1 + +/* Name of package */ +#define PACKAGE "mod_jk" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* The size of a `uint32_t', as computed by sizeof. */ +#define SIZEOF_UINT32_T 4 + +/* The size of a `unsigned int', as computed by sizeof. */ +#define SIZEOF_UNSIGNED_INT 4 + +/* The size of a `unsigned long', as computed by sizeof. */ +#define SIZEOF_UNSIGNED_LONG 4 + +/* The size of a `unsigned longlong', as computed by sizeof. */ +#define SIZEOF_UNSIGNED_LONGLONG 0 + +/* The size of a `unsigned long long', as computed by sizeof. */ +#define SIZEOF_UNSIGNED_LONG_LONG 8 + +/* The size of a `u_int32_t', as computed by sizeof. */ +#define SIZEOF_U_INT32_T 4 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to use SO_RCVTIMEO with setsockopt() */ +#define USE_SO_RCVTIMEO 1 + +/* Define to use SO_SNDTIMEO with setsockopt() */ +#define USE_SO_SNDTIMEO 1 + +/* Version number of package */ +#define VERSION "1.2.14" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_version.h
jfclere 2005/07/06 06:44:25 Modified:jk/native/common jk_version.h Log: ready for release. Revision ChangesPath 1.44 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_version.h Index: jk_version.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_version.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- jk_version.h 16 May 2005 06:43:56 - 1.43 +++ jk_version.h 6 Jul 2005 13:44:25 - 1.44 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation + * Copyright 1999-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ #define JK_VERBETA 0 #define JK_BETASTRING "0" /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 0 +#define JK_VERISRELEASE 1 #define JK_VERRC0 #define JK_RCSTRING "0" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
jfclere 2005/07/06 06:36:55
Modified:jk/native configure.in
Log:
Update version.
Revision ChangesPath
1.49 +2 -2 jakarta-tomcat-connectors/jk/native/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- configure.in 6 Jul 2005 06:58:49 - 1.48
+++ configure.in 6 Jul 2005 13:36:55 - 1.49
@@ -11,7 +11,7 @@
dnl package and version. (synchronization with common/jk_version.h ?)
PACKAGE=mod_jk
-VERSION=1.2.9
+VERSION=1.2.14
AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_md5.h
jfclere 2005/07/05 23:58:50
Modified:jk/native configure.in
jk/native/common jk_md5.h
Log:
use the same logic for jk_u64_ and JK_UINT4.
Revision ChangesPath
1.48 +12 -2 jakarta-tomcat-connectors/jk/native/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- configure.in 14 Jun 2005 15:44:22 - 1.47
+++ configure.in 6 Jul 2005 06:58:49 - 1.48
@@ -53,6 +53,15 @@
AC_CHECK_SIZEOF(uint32_t)
AC_CHECK_SIZEOF(u_int32_t)
AC_CHECK_SIZEOF(unsigned long)
+if test "$ac_cv_sizeof_uint32_t" = "4"; then
+AC_DEFINE(HAVE_UINT32_T, [], [Use uint32_t for JK_UINT4])
+elif test "$ac_cv_sizeof_u_int32_t" = "4"; then
+AC_DEFINE(HAVE_U_INT32_T, [], [Use u_int32_t for JK_UINT4])
+elif test "$ac_cv_sizeof_unsigned_long" = "4"; then
+AC_DEFINE(HAVE_LONG, [], [Use unsigned long for JK_UINT4])
+else
+AC_ERROR([could not detect a 32-bit integer type])
+fi
AC_CHECK_SIZEOF(unsigned int)
AC_CHECK_SIZEOF(unsigned long long)
@@ -65,7 +74,7 @@
AC_DEFINE(HAVE_LONG_LONG64, [], [Use long long for JK_UINT8])
elif test "$ac_cv_sizeof_unsigned_longlong" = "8"; then
AC_DEFINE(HAVE_LONGLONG64, [], [Use longlong for JK_UINT8])
-else
+else
AC_ERROR([could not detect a 64-bit integer type])
fi
@@ -171,6 +180,7 @@
for INC in ${INCTEMP}; do
APRINCLUDEDIR="${APRINCLUDEDIR} -I${INC}"
done
+AC_MSG_RESULT([APRINCLUDEDIR is $APRINCLUDEDIR])
APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q
EXTRA_CFLAGS` -DHAVE_APR ${APRINCLUDEDIR}"
APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
APACHE_CONFIG_VARS="`${APXS} -q
exp_installbuilddir`/config_vars.mk"
1.10 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_md5.h
Index: jk_md5.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_md5.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_md5.h 5 Jul 2005 16:22:21 - 1.9
+++ jk_md5.h 6 Jul 2005 06:58:49 - 1.10
@@ -61,12 +61,12 @@
typedef DWORD JK_UINT4;
#elif defined(NETWARE) && !defined(__NOVELL_LIBC__)
typedef unsigned int JK_UINT4;
-#elif SIZEOF_UINT32_T
+#elif defined(HAVE_UINT32_T)
typedef uint32_t JK_UINT4;
-#elif SIZEOF_U_INT32_T
+#elif defined(HAVE_U_INT32_T)
typedef u_int32_t JK_UINT4;
#else
-typedef unsigned long JK_UINT4; /* ansi */
+typedef unsigned long JK_UINT4; /* ansi HAVE_LONG */
#endif
/* MD5 context. */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_md5.h
jfclere 2005/07/05 09:22:21 Modified:jk/native/common jk_md5.h Log: wrong SIZEOF_ is 0 when not defined and the "right" value otherwise. Revision ChangesPath 1.9 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_md5.h Index: jk_md5.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_md5.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jk_md5.h 14 Jun 2005 15:44:22 - 1.8 +++ jk_md5.h 5 Jul 2005 16:22:21 - 1.9 @@ -61,9 +61,9 @@ typedef DWORD JK_UINT4; #elif defined(NETWARE) && !defined(__NOVELL_LIBC__) typedef unsigned int JK_UINT4; -#elif defined(SIZEOF_UINT32_T) +#elif SIZEOF_UINT32_T typedef uint32_t JK_UINT4; -#elif defined(SIZEOF_U_INT32_T) +#elif SIZEOF_U_INT32_T typedef u_int32_t JK_UINT4; #else typedef unsigned long JK_UINT4; /* ansi */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs changelog.xml
jfclere 2005/07/05 07:52:45 Modified:jk/xdocs changelog.xml Log: Arrange the wording and remote 1.2.14. Revision ChangesPath 1.36 +13 -14jakarta-tomcat-connectors/jk/xdocs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/changelog.xml,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- changelog.xml 4 Jul 2005 07:34:04 - 1.35 +++ changelog.xml 5 Jul 2005 14:52:45 - 1.36 @@ -21,20 +21,19 @@ new documentation project for JK was started. - + - 34397: Emergy was handled as Error. (jfclere) + 34397: Emergency was handled as Error. (jfclere) + + + 34474: // in URL were not handled correctly with Apache-1.3. (jfclere) + + + Use 64 bits int for transferred/read bytes. - - - - - - - Added JkOptions +FlushPackets used to optimize memory usage when sending large data. (mturk) @@ -62,7 +61,7 @@ - + @@ -79,7 +78,7 @@ - + @@ -138,7 +137,7 @@ - + @@ -204,7 +203,7 @@ - + @@ -263,7 +262,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/tools jkrelease.sh
jfclere 2005/07/05 03:43:07
Modified:jk/tools jkrelease.sh
Log:
remove traces.
Revision ChangesPath
1.10 +0 -2 jakarta-tomcat-connectors/jk/tools/jkrelease.sh
Index: jkrelease.sh
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/tools/jkrelease.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jkrelease.sh 1 Jul 2005 12:41:25 - 1.9
+++ jkrelease.sh 5 Jul 2005 10:43:07 - 1.10
@@ -53,7 +53,6 @@
failed=true
for tool in `echo "w3m elinks links"`
do
- echo "tool: ${tool}"
found=false
for dir in `echo ${PATH} | sed 's!^:!.:!;s!:$!:.!;s!::!:.:!g;s!:! !g'`
do
@@ -80,7 +79,6 @@
esac
rm -f BUILDING
(cd ../native; ${TOOL} ../build/docs/install/printer/apache1.html
2>/dev/null ) > BUILDING
-ls -lt BUILDING
if [ -f BUILDING -a -s BUILDING ]
then
failed=false
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/howto doccontrib.xml
jfclere 2005/07/05 03:28:14 Modified:jk/xdocs/howto doccontrib.xml Log: And ant (more easy to use than cp). Revision ChangesPath 1.6 +4 -1 jakarta-tomcat-connectors/jk/xdocs/howto/doccontrib.xml Index: doccontrib.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/doccontrib.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- doccontrib.xml5 Jul 2005 09:55:41 - 1.5 +++ doccontrib.xml5 Jul 2005 10:28:13 - 1.6 @@ -304,6 +304,9 @@ Connect to people.apache.org. umask 002 Copy the changed files to /www/jakarta.apache.org/tomcat/connectors-doc/. +or use ant from a checkout jakarta-tomcat-connectors/jk/xdocs repository: +ant -Dbuild.dir=/www/jakarta.apache.org/tomcat -Ddist.name=connectors-doc + The changes need around 4 hours to be synced to jakarta.apache.org. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/howto doccontrib.xml
jfclere 2005/07/05 02:55:41 Modified:jk/xdocs/howto doccontrib.xml Log: Add a note how to publish in jakarta.apache.org Revision ChangesPath 1.5 +15 -2 jakarta-tomcat-connectors/jk/xdocs/howto/doccontrib.xml Index: doccontrib.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/doccontrib.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- doccontrib.xml4 Jul 2005 08:13:56 - 1.4 +++ doccontrib.xml5 Jul 2005 09:55:41 - 1.5 @@ -6,7 +6,7 @@ &project; - Copyright 1999-2004 The Apache Software Foundation + Copyright 1999-2005 The Apache Software Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -295,6 +295,19 @@ you are creating new files for submission. + + + +Only Committers are able to update the web site (http://jakarta.apache.org/tomcat/connectors-doc/). +To do it: + +Connect to people.apache.org. +umask 002 +Copy the changed files to /www/jakarta.apache.org/tomcat/connectors-doc/. +The changes need around 4 hours to be synced to jakarta.apache.org. + + + A little help to get you started if you need it - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs index.xml proxy.xml
jfclere 2005/07/05 02:34:31 Modified:jk/xdocs index.xml proxy.xml Log: Arrange proxy and add a link to it in the index page. Revision ChangesPath 1.37 +5 -0 jakarta-tomcat-connectors/jk/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- index.xml 16 May 2005 06:40:31 - 1.36 +++ index.xml 5 Jul 2005 09:34:31 - 1.37 @@ -211,6 +211,11 @@ +Using ajp-proxy in httpd-2.1 + +mod-proxy in httpd-2.1 offers an AJP connection as well as load balancing. + + http://jakarta.apache.org/tomcat/connectors-doc-archive/jk2/index.html";> Old JK/JK2 documentation archive. Here you can find old JK and JK2 documentation. 1.4 +18 -3 jakarta-tomcat-connectors/jk/xdocs/proxy.xml Index: proxy.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/proxy.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- proxy.xml 5 Jul 2005 09:20:07 - 1.3 +++ proxy.xml 5 Jul 2005 09:34:31 - 1.4 @@ -7,7 +7,7 @@ &project; - Copyright 1999-2004 The Apache Software Foundation + Copyright 1999-2005 The Apache Software Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -51,11 +51,26 @@ + + +It is possible to use the load balancer of the mod_proxy_balancer module. + +<Proxy balancer://myCluster> + BalancerMember ajp://localhost:8009 + BalancerMember ajp://example.org:8009 +</Proxy> +<Location /examples/> +ProxyPass balancer://myCluster/examples/ +</Location> + + + + AJP proxy is integrated in httpd-2.1 and the developement and discussions take place http://httpd.apache.org/lists.html";>there. -More documentation can be found there +The documentation can be found there http://httpd.apache.org/docs-2.1/mod/mod_proxy_ajp.html";>mod_proxy_ajp and http://httpd.apache.org/docs-2.1/mod/mod_proxy_balancer.html";>mod_proxy_balancer. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs proxy.xml
jfclere 2005/07/05 02:20:07 Modified:jk/xdocs proxy.xml Log: Arrange it so that it works with style.xsl. Revision ChangesPath 1.3 +12 -2 jakarta-tomcat-connectors/jk/xdocs/proxy.xml Index: proxy.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/proxy.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- proxy.xml 5 Oct 2004 09:57:06 - 1.2 +++ proxy.xml 5 Jul 2005 09:20:07 - 1.3 @@ -1,5 +1,11 @@ - + +]> + + + &project; + Copyright 1999-2004 The Apache Software Foundation @@ -20,6 +26,8 @@ $Date$ + + It easy to use the standard Http proxy of Apache when single Tomcat is connected to Apache. @@ -54,4 +62,6 @@ + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native CHANGES.txt
jfclere 2005/07/05 01:56:58 Modified:jk/native CHANGES.txt Log: Add a note to prevent other written in this file. Revision ChangesPath 1.27 +3 -1 jakarta-tomcat-connectors/jk/native/CHANGES.txt Index: CHANGES.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/CHANGES.txt,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- CHANGES.txt 9 Apr 2005 15:44:58 - 1.26 +++ CHANGES.txt 5 Jul 2005 08:56:58 - 1.27 @@ -1,5 +1,7 @@ JAKARTA TOMCAT CONNECTORS (JK) CHANGELOG: -*-text-*- Last modified at [$Date$] +PLEASE DON'T WRITE IN THIS FILE BUT IN ../xdocs/changelog.xml AND USE ../tools/jkrelease.sh +TO BUILD THE TEXT VERSION. Changes in JK 1.2.11 * BUG 34358: Fix the load balance worker load balance method. It was not being - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs faq.xml
jfclere 2005/07/05 00:12:51 Modified:jk/xdocs faq.xml Log: Eyebrowse has been turned off. Thanks Mark Thomas (markt). Revision ChangesPath 1.14 +2 -2 jakarta-tomcat-connectors/jk/xdocs/faq.xml Index: faq.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/faq.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- faq.xml 4 Jul 2005 07:41:07 - 1.13 +++ faq.xml 5 Jul 2005 07:12:51 - 1.14 @@ -39,7 +39,7 @@ Jakarta Tomcat Connectors Project For additional help, the best resource is the Tomcat Users Discussion list. You should start by searching -http://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]"> +http://mail-archives.apache.org/mod_mbox/jakarta-tomcat-user/";> the mail list archive before you post questions to the list. If you are unable to locate the answer to your question in the archive, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs project.xml
jfclere 2005/07/04 09:10:08 Modified:jk/xdocs project.xml Log: Add tools. Revision ChangesPath 1.5 +1 -0 jakarta-tomcat-connectors/jk/xdocs/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 4 Jul 2005 10:21:33 - 1.4 +++ project.xml 4 Jul 2005 16:10:08 - 1.5 @@ -22,6 +22,7 @@ + http://jakarta.apache.org/tomcat/connectors-doc-archive/jk2/index.html"/> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 mod_jk.c
jfclere 2005/07/04 08:55:48
Modified:jk/native/apache-1.3 mod_jk.c
Log:
Fix PR 34474. Note that if the // are in the cookie path the cookie won't
work. (but that is the same in 2.x and when using ajp-proxy.
Revision ChangesPath
1.86 +9 -7 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- mod_jk.c 18 May 2005 18:19:31 - 1.85
+++ mod_jk.c 4 Jul 2005 15:55:48 - 1.86
@@ -2111,7 +2111,11 @@
if (conf) {
jk_logger_t *l = conf->log ? conf->log : main_log;
-const char *worker = map_uri_to_worker(conf->uw_map, r->uri, l);
+char *clean_uri = ap_pstrdup(r->pool, r->uri);
+const char *worker;
+
+ap_no2slash(clean_uri);
+worker = map_uri_to_worker(conf->uw_map, clean_uri, l);
/* Don't know the worker, ForwardDirectories is set, there is a
* previous request for which the handler is JK_HANDLER (as set
by
@@ -2119,8 +2123,8 @@
* --> forward to Tomcat, via default worker */
if (!worker && (conf->options & JK_OPT_FWDDIRS) &&
r->prev && r->prev->handler &&
-!strcmp(r->prev->handler, JK_HANDLER) && r->uri &&
-strlen(r->uri) && r->uri[strlen(r->uri) - 1] == '/') {
+!strcmp(r->prev->handler, JK_HANDLER) && clean_uri &&
+strlen(clean_uri) && clean_uri[strlen(clean_uri) - 1] ==
'/') {
if (worker_env.num_of_workers) {
/* Nothing here to do but assign the first worker since
we
@@ -2128,7 +2132,7 @@
worker = worker_env.worker_list[0];
jk_log(l, JK_LOG_DEBUG, "Manual configuration for %s %s",
- r->uri, worker_env.worker_list[0]);
+ clean_uri, worker_env.worker_list[0]);
}
}
@@ -2137,8 +2141,6 @@
ap_table_setn(r->notes, JK_WORKER_ID, worker);
}
else if (conf->alias_dir != NULL) {
-char *clean_uri = ap_pstrdup(r->pool, r->uri);
-ap_no2slash(clean_uri);
/* Automatically map uri to a context static file */
jk_log(l, JK_LOG_DEBUG,
"mod_jk::jk_translate, check alias_dir: %s",
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/common tools.xml
jfclere 2005/07/04 07:14:54 Modified:jk/xdocs/common tools.xml Log: Arrange it according to the today xsl file. Revision ChangesPath 1.3 +12 -4 jakarta-tomcat-connectors/jk/xdocs/common/tools.xml Index: tools.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/common/tools.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tools.xml 4 Mar 2004 04:46:34 - 1.2 +++ tools.xml 4 Jul 2005 14:14:53 - 1.3 @@ -1,7 +1,12 @@ - - + + +]> + + + &project; - Copyright 1999-2004 The Apache Software Foundation + Copyright 1999-2005 The Apache Software Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +25,7 @@ Glenn Nielsen $Date$ + Documentation for additional mod_jk related tools. @@ -83,4 +89,6 @@ + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs build.xml
jfclere 2005/07/04 03:32:56 Modified:jk/xdocs build.xml Log: remove install directory. Revision ChangesPath 1.4 +0 -20 jakarta-tomcat-connectors/jk/xdocs/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 19 Nov 2004 10:08:20 - 1.3 +++ build.xml 4 Jul 2005 10:32:56 - 1.4 @@ -144,26 +144,6 @@ - - - <param name="relative-path" expression=".."/> - - - - <param name="relative-path" expression="../.."/> - <param name="project-menu" expression="nomenu"/> - - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs project.xml
jfclere 2005/07/04 03:21:33 Modified:jk/xdocs project.xml Log: remove install as it is now in howto. Revision ChangesPath 1.4 +1 -6 jakarta-tomcat-connectors/jk/xdocs/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 29 Nov 2004 10:51:03 - 1.3 +++ project.xml 4 Jul 2005 10:21:33 - 1.4 @@ -17,14 +17,9 @@ - - - - - - + http://jakarta.apache.org/tomcat/connectors-doc-archive/jk2/index.html"/> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/install apache1.xml apache2.xml iis.xml project.xml
jfclere 2005/07/04 03:18:29 Removed: jk/xdocs/install apache1.xml apache2.xml iis.xml project.xml Log: Those files have been included in howto's we should n't duplicate the information. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk HOWTO-RELEASE
jfclere 2005/07/04 02:26:17
Modified:jk HOWTO-RELEASE
Log:
Add a note about tools/jkrelease.sh
Revision ChangesPath
1.12 +3 -0 jakarta-tomcat-connectors/jk/HOWTO-RELEASE
Index: HOWTO-RELEASE
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/HOWTO-RELEASE,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HOWTO-RELEASE 4 Jul 2005 07:31:16 - 1.11
+++ HOWTO-RELEASE 4 Jul 2005 09:26:17 - 1.12
@@ -85,6 +85,9 @@
Create the new source distribution
--
+(A tool named jkrelease.sh in jakarta-tomcat-connectors/jk/tools does the
+following steps).
+
Create the directory
jakarta-tomcat-connectors-jk-{MAJOR_REVISION}-{MINOR_REVISION}-{RELEASE}-src
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/howto project.xml
jfclere 2005/07/04 01:41:23 Modified:jk/xdocs/howto project.xml Log: typo. Revision ChangesPath 1.4 +1 -1 jakarta-tomcat-connectors/jk/xdocs/howto/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 24 Mar 2005 06:42:34 - 1.3 +++ project.xml 4 Jul 2005 08:41:23 - 1.4 @@ -24,7 +24,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/common ajpv13a.xml
jfclere 2005/07/04 01:22:25 Modified:jk/xdocs/common ajpv13a.xml Log: typo and year: PR 13911 Revision ChangesPath 1.3 +3 -3 jakarta-tomcat-connectors/jk/xdocs/common/ajpv13a.xml Index: ajpv13a.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/common/ajpv13a.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ajpv13a.xml 18 Nov 2004 18:33:15 - 1.2 +++ ajpv13a.xml 4 Jul 2005 08:22:24 - 1.3 @@ -6,7 +6,7 @@ &project; - Copyright 1999-2004 The Apache Software Foundation + Copyright 1999-2005 The Apache Software Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -74,7 +74,7 @@ Increasing performance (speed, specifically). Adding support for SSL, so that isSecure() and - geScheme() will function correctly within the servlet + getScheme() will function correctly within the servlet container. The client certificates and cipher suite will be available to servlets as request attributes. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/howto domino.xml
jfclere 2005/07/04 01:18:33 Modified:jk/xdocs/howto domino.xml Log: Arrange link and remove jk2 note. Revision ChangesPath 1.2 +2 -5 jakarta-tomcat-connectors/jk/xdocs/howto/domino.xml Index: domino.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/domino.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- domino.xml18 Nov 2004 18:30:36 - 1.1 +++ domino.xml4 Jul 2005 08:18:33 - 1.2 @@ -28,16 +28,13 @@ -Important Note: The JK based connector described here has been superceded by a JK2 based connector -that works with all current Tomcat versions. Use of this connector has been deprecated. Go -here to find out how to install the new connector. This document explains how to set up Domino to cooperate with Tomcat. -It is recommended that you also read the Workers HowTo document +It is recommended that you also read the Workers HowTo document to learn how to setup the working entities between your WebServer and Tomcat Engines. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/howto doccontrib.xml
jfclere 2005/07/04 01:13:56 Modified:jk/xdocs/howto doccontrib.xml Log: PR 32968. Revision ChangesPath 1.4 +32 -27jakarta-tomcat-connectors/jk/xdocs/howto/doccontrib.xml Index: doccontrib.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/doccontrib.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- doccontrib.xml3 Jan 2005 23:20:05 - 1.3 +++ doccontrib.xml4 Jul 2005 08:13:56 - 1.4 @@ -33,7 +33,7 @@ the documentation of Tomcat, more specifically the documentation for the connectors. This is written from a windows user perspective as I believe they will most benefit from it. For people using Unix it should be easy for them to -apply these steps. Just substitute Unix sytax where needed. +apply these steps. Just substitute Unix syntax where needed. The documentation is produced using xml with xsl style sheets. This @@ -62,7 +62,7 @@ -Install http://jakarta.apache.org/ant";>Ant. The only advice I +Install http://ant.apache.org/";>Ant. The only advice I have is to choose a simple installation path. Now set an environment variable for ANT_HOME, and then add the location of the Ant/bin directory to your PATH variable. Consult your Operating system documentation for information on how @@ -72,15 +72,16 @@ Ant is used to build the documentation, among other things, and it must be able to see a file called build.xml. This file is located in the -CVS_HOME\jakarta-tomcat-connectors\jk directory. In the -build.xml file there is a target named docs that will be used to build +CVS_HOME\jakarta-tomcat-connectors\jk\xdocs directory. In the +build.xml file there is a target named all that will be used to build the docs. -Get the sources for http://cvs.apache.org/viewcvs/jakarta-tomcat- -connectors/">jakarta-tomcat-connectors from the CVS repository. If you'll +Get the sources for +http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/";>jakarta-tomcat-connectors +from the CVS repository. If you'll be editing from a windows platform you will need a windows cvs client. There are several available. I like http://www.cygwin.com/";>cygwin. During the install open the developer group and click on cvs. Unix users @@ -90,7 +91,7 @@ You are ready to download the sources now. Change directory to the location where you want your repository to be, and run the following commands to download the sources for the first time. For simplicity we will call this -your CVS_HOME. Mine is located in C:\build. +your CVS_HOME. Mine is located in C:\build. Login to the repository and then give the cvs password anoncvs. @@ -118,7 +119,7 @@ You should now be watching all the downloads come in. Now that you have the sources on your machine the hard part if over. From now on, to update your sources all you have to do is cd into any directory in your repository and run -cvs update +the cvs update command. To update your xdocs directory simply cd into the xdocs directory and: @@ -130,12 +131,14 @@ Open a command prompt window and cd to the directory where you downloaded -the source. Now cd into the jk directory so Ant can see the -build.xml file and, from a command prompt, run the following: +the source. Now cd into the jk directory and then into the xdocs directory so +that Ant can see the +build.xml file. Then from a command prompt, run the following: C:\build\jakarta-tomcat-connectors>cd jk -C:\build\jakarta-tomcat-connectors\jk>ant docs +C:\build\jakarta-tomcat-connectors\jk>cd xdocs +C:\build\jakarta-tomcat-connectors\jk\xdocs>ant all . @@ -158,33 +161,34 @@ BUILD SUCCESSFUL Total time: 10 seconds -C:\build\jakarta-tomcat-connectors\jk +C:\build\jakarta-tomcat-connectors\jk> All the xml files present in the xdocs directory structure were transformed -to html and copied to the CVS_HOME\jk\docs directory. Open one of the +to html and copied to the CVS_HOME\jakarta-tomcat-connectors\jk\build\docs +directory. Open one of the html files in your browser and see how it looks. I find it easier to use two windows while doing my updates. One I call my -build window. I keep this one in the CVS_HOME\jk directory and I -only run two commands in this window: +build window. I keep this one in the CVS_HOME\jakarta-tomcat-connectors\jk\xdocs +directory and I only run two commands in this window: First I run ant clean Then I run -ant docs +ant all
cvs commit: jakarta-tomcat-connectors/jk/xdocs/howto apache.xml
jfclere 2005/07/04 01:08:30
Modified:jk/xdocs/howto apache.xml
Log:
Arrange the links.
Revision ChangesPath
1.9 +4 -4 jakarta-tomcat-connectors/jk/xdocs/howto/apache.xml
Index: apache.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/apache.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apache.xml12 May 2005 20:26:59 - 1.8
+++ apache.xml4 Jul 2005 08:08:30 - 1.9
@@ -63,7 +63,7 @@
In all the examples in this document ${tomcat_home} will be
/var/tomcat3.
-A worker is defined to be a tomcat
process that accepts work from the Apache server.
+A worker is defined to be a tomcat process that
accepts work from the Apache server.
@@ -166,7 +166,7 @@
It is recommended to use the binary version if one is available.
If the binary is not available, follow the instructions for building mod_jk
from source.
The mod_jk source can be downloaded from a mirror
-http://jakarta.apache.org/site/sourceindex.cgi/";>
+http://jakarta.apache.org/site/sourceindex.cgi";>
here
@@ -186,7 +186,7 @@
For example JK 1.2.5 can be downloaded from a mirror
-http://jakarta.apache.org/site/binindex.cgi/";>
+http://jakarta.apache.org/site/binindex.cgi";>
here and contains binary version for a variety of
operating systems for both Apache 1.3 and Apache 2.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/howto iis.xml index.xml nes.xml quick.xml
jfclere 2005/07/04 01:01:02 Modified:jk/xdocs/howto iis.xml index.xml nes.xml quick.xml Log: PR 32968 (arrange the links). Revision ChangesPath 1.3 +2 -2 jakarta-tomcat-connectors/jk/xdocs/howto/iis.xml Index: iis.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/iis.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- iis.xml 20 Dec 2004 09:34:37 - 1.2 +++ iis.xml 4 Jul 2005 08:01:00 - 1.3 @@ -420,7 +420,7 @@ -More informations on using and configuring workers in the Workers HowTO +More informations on using and configuring workers in the Workers HowTO 1.3 +2 -3 jakarta-tomcat-connectors/jk/xdocs/howto/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/index.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.xml 23 Feb 2005 08:10:20 - 1.2 +++ index.xml 4 Jul 2005 08:01:00 - 1.3 @@ -16,12 +16,11 @@ This is the top-level entry point of the HowTo documentation bundle for the -Apache Jakarta Tomcat Connectors +Apache Jakarta Tomcat Connectors. Select one of the links from the navigation menu (to the left) to drill -down to the more detailed documenation that is available. Each available -manual is described in more detail below. +down to the more detailed documentation that is available. 1.3 +3 -3 jakarta-tomcat-connectors/jk/xdocs/howto/nes.xml Index: nes.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/nes.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nes.xml 24 Mar 2005 06:42:34 - 1.2 +++ nes.xml 4 Jul 2005 08:01:01 - 1.3 @@ -41,7 +41,7 @@ -It is recommanded that you also read the Workers HowTo document +It is recommanded that you also read the Workers HowTo document to learn how to setup the working entities between your WebServer and Tomcat Engines. @@ -402,7 +402,7 @@ -More informations on using and configuring workers in the Workers HowTO +More informations on using and configuring workers in the Workers HowTO 1.3 +4 -4 jakarta-tomcat-connectors/jk/xdocs/howto/quick.xml Index: quick.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/quick.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- quick.xml 13 Apr 2005 12:17:07 - 1.2 +++ quick.xml 4 Jul 2005 08:01:01 - 1.3 @@ -49,7 +49,7 @@ Here is a minimum workers.properties, using just ajp13 to connect your Apache webserver -to the Tomcat engine, complete documentation is available in Workers HowTo. +to the Tomcat engine, complete documentation is available in Workers HowTo. @@ -73,7 +73,7 @@ Here is a minimun informations about Apache configuration, a - complete documentation is available in Apache HowTo. + complete documentation is available in Apache HowTo. You should first have mod_jk.so (unix) or mod_jk.dll (Windows) installed @@ -175,7 +175,7 @@ - (Re)start the Web server and browse to the http://localhost/examples/ + (Re)start the Web server and browse to the http://localhost/examples/";>http://localhost/examples/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs style.xsl
jfclere 2005/07/04 00:44:51 Modified:jk/xdocs style.xsl Log: Now we are in 2005, don't we? Revision ChangesPath 1.12 +2 -2 jakarta-tomcat-connectors/jk/xdocs/style.xsl Index: style.xsl === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/style.xsl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- style.xsl 3 Jan 2005 23:20:05 - 1.11 +++ style.xsl 4 Jul 2005 07:44:51 - 1.12 @@ -160,7 +160,7 @@ PAGE FOOTER -Copyright © 1999-2004, Apache Software Foundation +Copyright © 1999-2005, Apache Software Foundation - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs faq.xml
jfclere 2005/07/04 00:41:07 Modified:jk/xdocs faq.xml Log: Arrange links and a typo. PR 13911. Revision ChangesPath 1.13 +5 -5 jakarta-tomcat-connectors/jk/xdocs/faq.xml Index: faq.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/faq.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- faq.xml 30 Nov 2004 07:35:37 - 1.12 +++ faq.xml 4 Jul 2005 07:41:07 - 1.13 @@ -39,7 +39,7 @@ Jakarta Tomcat Connectors Project For additional help, the best resource is the Tomcat Users Discussion list. You should start by searching -http://mikal.org/interests/java/tomcat/index.html";> +http://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]"> the mail list archive before you post questions to the list. If you are unable to locate the answer to your question in the archive, @@ -69,7 +69,7 @@ JK is a project covering web-servers to Tomcat connectors, -whereas mod_jk is the Apache module developped in JK. +whereas mod_jk is the Apache module developed in JK. @@ -128,7 +128,7 @@ -Ajp13 is a newer protocol, it's faster, and it works better with SSL. +Ajp13 is a newer protocol, it's faster, and it works better with SSL. You almost certainly want to use it now that ajp12 is deprecated. @@ -180,7 +180,7 @@ -Many versions of Apache use of modified API, known at Extended API, developped for use with the +Many versions of Apache use of modified API, known at Extended API, developed for use with the http://www.modssl.org";>mod_ssl module. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs changelog.xml
jfclere 2005/07/04 00:34:04 Modified:jk/xdocs changelog.xml Log: Spelling PR 13911. Revision ChangesPath 1.35 +1 -1 jakarta-tomcat-connectors/jk/xdocs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/changelog.xml,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- changelog.xml 1 Jul 2005 16:22:53 - 1.34 +++ changelog.xml 4 Jul 2005 07:34:04 - 1.35 @@ -18,7 +18,7 @@ This is the Changelog for Jakarta Tomcat Connectors. This changelog does not contain all updates and fixes to the Tomcat connectors (yet). It should contain fixes made only after November 10th 2004, when the - new documentation project for JK has been started. + new documentation project for JK was started. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk HOWTO-RELEASE
jfclere 2005/07/04 00:31:16 Modified:jk HOWTO-RELEASE Log: fix PR 13911. Revision ChangesPath 1.11 +5 -5 jakarta-tomcat-connectors/jk/HOWTO-RELEASE Index: HOWTO-RELEASE === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/HOWTO-RELEASE,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- HOWTO-RELEASE 24 Mar 2004 15:33:36 - 1.10 +++ HOWTO-RELEASE 4 Jul 2005 07:31:16 - 1.11 @@ -14,9 +14,9 @@ and replace it with the new version. These are the docs I found which had to be updated: -xdocs/jk/aphowto.xml -xdocs/jk/quickhowto.xml -xdocs/jk/workershowto.xml +xdocs/howto/apache.xml +xdocs/howto/quick.xml +xdocs/howto/workers.xml Update the version in jk/native/configure.in. @@ -79,8 +79,8 @@ Build the mod_jk 1.2 documentation -- -cd jakarta-tomcat-connectors/jk -ant docs +cd jakarta-tomcat-connectors/jk/xdocs +ant Create the new source distribution -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk BUILD.txt
jfclere 2005/07/04 00:14:25 Modified:jk BUILD.txt Log: typo PR 34939. Revision ChangesPath 1.4 +1 -1 jakarta-tomcat-connectors/jk/BUILD.txt Index: BUILD.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/BUILD.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BUILD.txt 28 Apr 2005 10:19:35 - 1.3 +++ BUILD.txt 4 Jul 2005 07:14:25 - 1.4 @@ -8,6 +8,6 @@ For the impatient Apache admins: $> cd native -$> ../configure --with-apxs=/usr/sbin/apxs (or where ever the apxs/apxs2 is) +$> ./configure --with-apxs=/usr/sbin/apxs (or where ever the apxs/apxs2 is) $> make $> su -c 'make install' - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/config apache.xml
jfclere 2005/07/04 00:11:43 Modified:jk/xdocs/config apache.xml Log: Fix 34687. Revision ChangesPath 1.14 +2 -2 jakarta-tomcat-connectors/jk/xdocs/config/apache.xml Index: apache.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/config/apache.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- apache.xml18 May 2005 18:04:53 - 1.13 +++ apache.xml4 Jul 2005 07:11:43 - 1.14 @@ -88,7 +88,7 @@ Shared memory file name. Used only on unix platforms. -Size of the shared memory file name. Default is 1MB. +Size of the shared memory file name. Default is 64 k. @@ -377,7 +377,7 @@ JkUnmount directive acts as an opposite to JkMount and blocks access to a particular URL. The purpose is to be able to filter out the particular content types from mounted context. The following example mounts /servlet/* -context, but all .jpg files that belongs to that context are not served. +context, but all .gif files that belongs to that context are not served. # send all requests ending with /servlet to worker1 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs changelog.xml
jfclere 2005/07/01 09:22:53 Modified:jk/xdocs changelog.xml Log: Add the information for the next release. Revision ChangesPath 1.34 +10 -0 jakarta-tomcat-connectors/jk/xdocs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/changelog.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- changelog.xml 18 May 2005 18:04:53 - 1.33 +++ changelog.xml 1 Jul 2005 16:22:53 - 1.34 @@ -21,6 +21,16 @@ new documentation project for JK has been started. + + + + + + 34397: Emergy was handled as Error. (jfclere) + + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
jfclere 2005/07/01 08:41:09
Modified:jk/native/common jk_util.c
Log:
Fix PR 34397.
Revision ChangesPath
1.71 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- jk_util.c 9 Jun 2005 08:14:51 - 1.70
+++ jk_util.c 1 Jul 2005 15:41:08 - 1.71
@@ -219,7 +219,7 @@
}
if (0 == strcasecmp(level, JK_LOG_EMERG_VERB)) {
-return JK_LOG_ERROR_LEVEL;
+return JK_LOG_EMERG_LEVEL;
}
return JK_LOG_INFO_LEVEL;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/tools jkrelease.sh
jfclere 2005/07/01 05:41:25
Modified:jk/tools jkrelease.sh
Log:
Also checks for Elinks.
Revision ChangesPath
1.9 +5 -1 jakarta-tomcat-connectors/jk/tools/jkrelease.sh
Index: jkrelease.sh
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/tools/jkrelease.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jkrelease.sh 1 Jul 2005 10:07:27 - 1.8
+++ jkrelease.sh 1 Jul 2005 12:41:25 - 1.9
@@ -49,8 +49,9 @@
# Check for links or w3m
W3MOPTS="-dump -cols 80 -t 4 -S -O iso-8859-1 -T text/html"
LNKOPTS="-dump"
+ELNKOPTS="--dump --no-numbering --no-home"
failed=true
-for tool in `echo "w3m links"`
+for tool in `echo "w3m elinks links"`
do
echo "tool: ${tool}"
found=false
@@ -73,6 +74,9 @@
links)
TOOL="links $LNKOPTS"
;;
+ elinks)
+TOOL="elinks $ELNKOPTS"
+;;
esac
rm -f BUILDING
(cd ../native; ${TOOL} ../build/docs/install/printer/apache1.html
2>/dev/null ) > BUILDING
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/tools jkrelease.sh
jfclere 2005/07/01 03:07:27
Modified:jk/tools jkrelease.sh
Log:
allow to use links or w3m.
Revision ChangesPath
1.8 +51 -7 jakarta-tomcat-connectors/jk/tools/jkrelease.sh
Index: jkrelease.sh
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/tools/jkrelease.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jkrelease.sh 30 Jun 2005 12:53:27 - 1.7
+++ jkrelease.sh 1 Jul 2005 10:07:27 - 1.8
@@ -45,15 +45,59 @@
# Build documentation.
cd ${JKDIST}/jk/xdocs
ant
+
+# Check for links or w3m
+W3MOPTS="-dump -cols 80 -t 4 -S -O iso-8859-1 -T text/html"
+LNKOPTS="-dump"
+failed=true
+for tool in `echo "w3m links"`
+do
+ echo "tool: ${tool}"
+ found=false
+ for dir in `echo ${PATH} | sed 's!^:!.:!;s!:$!:.!;s!::!:.:!g;s!:! !g'`
+ do
+if [ -x ${dir}/${tool} ]
+then
+ found=true
+ break
+fi
+ done
+
+ # Try to run it
+ if ${found}
+ then
+case ${tool} in
+ w3m)
+TOOL="w3m $W3MOPTS"
+;;
+ links)
+TOOL="links $LNKOPTS"
+;;
+esac
+rm -f BUILDING
+(cd ../native; ${TOOL} ../build/docs/install/printer/apache1.html
2>/dev/null ) > BUILDING
+ls -lt BUILDING
+if [ -f BUILDING -a -s BUILDING ]
+then
+ failed=false
+ break
+fi
+ fi
+done
+if ${failed}
+then
+ echo "Can't convert html to text (BUILDING)"
+ exit 1
+fi
+
# Export text docs
cd ../native
-W3MOPTS="-dump -cols 80 -t 4 -S -O iso-8859-1 -T text/html"
-w3m ${W3MOPTS} ../build/docs/install/printer/apache1.html >BUILDING
-w3m ${W3MOPTS} ../build/docs/install/printer/apache2.html >>BUILDING
-w3m ${W3MOPTS} ../build/docs/install/printer/iis.html >>BUILDING
-w3m ${W3MOPTS} ../build/docs/printer/changelog.html >CHANGES
-w3m ${W3MOPTS} ../build/docs/news/printer/20050101.html >NEWS
-w3m ${W3MOPTS} ../build/docs/news/printer/20041100.html >>NEWS
+${TOOL} ../build/docs/install/printer/apache1.html >BUILDING
+${TOOL} ../build/docs/install/printer/apache2.html >>BUILDING
+${TOOL} ../build/docs/install/printer/iis.html >>BUILDING
+${TOOL} ../build/docs/printer/changelog.html >CHANGES
+${TOOL} ../build/docs/news/printer/20050101.html >NEWS
+${TOOL} ../build/docs/news/printer/20041100.html >>NEWS
rm -rf ../build
rm -rf ../xdocs/jk2
./buildconf.sh
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/tools jkrelease.sh
jfclere 2005/06/30 05:53:27
Modified:jk/tools jkrelease.sh
Log:
Arrange small errors.
Revision ChangesPath
1.7 +4 -3 jakarta-tomcat-connectors/jk/tools/jkrelease.sh
Index: jkrelease.sh
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/tools/jkrelease.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jkrelease.sh 29 Jun 2005 16:20:15 - 1.6
+++ jkrelease.sh 30 Jun 2005 12:53:27 - 1.7
@@ -10,15 +10,16 @@
rm -f ${JKDIST}.*
#
# To use a proxy you need a recent version of cvs (I have tried with 1.12.9)
-if [ -z $http_proxy ]
+if [ -z "$http_proxy" ]
then
- export CVSROOT=:pserver:[EMAIL PROTECTED]:/home/cvspublic
+ CVSROOT=:pserver:[EMAIL PROTECTED]:/home/cvspublic
else
PRSTRING=`echo $http_proxy | tr '/' ' ' | tr ':' ' '`
HOST=`echo $PRSTRING | awk ' { print $2 } '`
PORT=`echo $PRSTRING | awk ' { print $3 } '`
- export CVSROOT=":pserver;proxy=$HOST;proxyport=$PORT:[EMAIL
PROTECTED]:/home/cvspublic"
+ CVSROOT=":pserver;proxy=$HOST;proxyport=$PORT:[EMAIL
PROTECTED]:/home/cvspublic"
fi
+export CVSROOT
cvs export -N -r ${JKTAG} -d ${JKDIST} ${JKCVST}/KEYS
cvs export -N -r ${JKTAG} -d ${JKDIST} ${JKCVST}/LICENSE
cvs export -N -r ${JKTAG} -d ${JKDIST} ${JKCVST}/NOTICE
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/tools jkrelease.sh
jfclere 2005/06/29 09:20:15
Modified:jk/tools jkrelease.sh
Log:
Allow to use http_proxy if available.
Revision ChangesPath
1.6 +11 -1 jakarta-tomcat-connectors/jk/tools/jkrelease.sh
Index: jkrelease.sh
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/tools/jkrelease.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jkrelease.sh 28 Apr 2005 10:04:54 - 1.5
+++ jkrelease.sh 29 Jun 2005 16:20:15 - 1.6
@@ -8,7 +8,17 @@
JKDIST=${JKCVST}${JKVER}
rm -rf ${JKDIST}
rm -f ${JKDIST}.*
-export CVSROOT=:pserver:[EMAIL PROTECTED]:/home/cvspublic
+#
+# To use a proxy you need a recent version of cvs (I have tried with 1.12.9)
+if [ -z $http_proxy ]
+then
+ export CVSROOT=:pserver:[EMAIL PROTECTED]:/home/cvspublic
+else
+ PRSTRING=`echo $http_proxy | tr '/' ' ' | tr ':' ' '`
+ HOST=`echo $PRSTRING | awk ' { print $2 } '`
+ PORT=`echo $PRSTRING | awk ' { print $3 } '`
+ export CVSROOT=":pserver;proxy=$HOST;proxyport=$PORT:[EMAIL
PROTECTED]:/home/cvspublic"
+fi
cvs export -N -r ${JKTAG} -d ${JKDIST} ${JKCVST}/KEYS
cvs export -N -r ${JKTAG} -d ${JKDIST} ${JKCVST}/LICENSE
cvs export -N -r ${JKTAG} -d ${JKDIST} ${JKCVST}/NOTICE
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni SSLServer.java
jfclere 2005/06/21 09:20:45
Modified:jni/examples/org/apache/tomcat/jni SSLServer.java
Log:
typo.
Revision ChangesPath
1.12 +1 -2
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java
Index: SSLServer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SSLServer.java21 Jun 2005 13:51:03 - 1.11
+++ SSLServer.java21 Jun 2005 16:20:45 - 1.12
@@ -192,7 +192,6 @@
continue;
else if (buf[0] == '!') {
doClose = true;
-break;
}
Socket.send(clientSock, buf, 0, 1);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni SSLServer.java
jfclere 2005/06/21 06:51:03
Modified:jni/examples/org/apache/tomcat/jni SSLServer.java
Log:
Prevent it from looping when the client closes the communication.
Revision ChangesPath
1.11 +13 -9
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java
Index: SSLServer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SSLServer.java18 Jun 2005 08:03:21 - 1.10
+++ SSLServer.java21 Jun 2005 13:51:03 - 1.11
@@ -183,15 +183,19 @@
while (!doClose) {
/* Do a blocking read byte at a time */
byte [] buf = new byte[1];
-while (Socket.recv(clientSock, buf, 0, 1) == 1) {
-if (buf[0] == '\n')
-break;
-else if (buf[0] == '!') {
-doClose = true;
-break;
-}
-Socket.send(clientSock, buf, 0, 1);
+int ret;
+ret = Socket.recv(clientSock, buf, 0, 1);
+if (ret != 1)
+throw(new Exception("Socket.recv failed"));
+
+if (buf[0] == '\n')
+continue;
+else if (buf[0] == '!') {
+doClose = true;
+break;
}
+Socket.send(clientSock, buf, 0, 1);
+
if (doClose) {
try {
byte [] msg = ("Bye from worker: " + workerId +
"\r\n").getBytes();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native configure.in
jfclere 2005/06/21 03:31:41
Modified:jni/native configure.in
Log:
-Wall is only for gcc.
Revision ChangesPath
1.7 +1 -1 jakarta-tomcat-connectors/jni/native/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure.in 18 Jun 2005 13:04:42 - 1.6
+++ configure.in 21 Jun 2005 10:31:41 - 1.7
@@ -137,7 +137,7 @@
[
case "${enableval}" in
y | Y | YES | yes | TRUE | true )
-CFLAGS="${CFLAGS} -DDEBUG -Wall"
+CFLAGS="${CFLAGS} -DDEBUG"
AC_MSG_RESULT([...Enabling Maintainer mode...])
;;
esac
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni SSLServer.java
jfclere 2005/06/15 08:15:54
Modified:jni/examples/org/apache/tomcat/jni SSLServer.java
Log:
test retcode of recv() to prevent the example for looping.
BTW: When testing with openssl 'Q' closes the socket in openssl ' Q' could
be used to get the closing in SSLServer.
Revision ChangesPath
1.7 +7 -9
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java
Index: SSLServer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SSLServer.java12 Jun 2005 10:31:16 - 1.6
+++ SSLServer.java15 Jun 2005 15:15:54 - 1.7
@@ -183,14 +183,12 @@
while (!doClose) {
/* Do a blocking read byte at a time */
byte [] buf = new byte[1];
-while (SSLSocket.recv(clientSock, buf, 0, 1) == 1) {
-if (buf[0] == '\n')
-break;
-else if (buf[0] == 'Q') {
-doClose = true;
-break;
-}
-}
+int ret;
+ret = SSLSocket.recv(clientSock, buf, 0, 1);
+if (ret != 1)
+throw(new Exception("SSLSocket.recv failed"));
+if (buf[0] == 'Q')
+doClose = true;
if (doClose) {
try {
byte [] msg = ("Bye from worker: " + workerId +
"\r\n").getBytes();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/scripts/build rules.mk
jfclere 2005/06/15 04:10:40 Modified:jk/native/scripts/build rules.mk Log: Use -o $@ overwise make in apache-2.0 will fail with libtool 1.5.2 Revision ChangesPath 1.5 +1 -2 jakarta-tomcat-connectors/jk/native/scripts/build/rules.mk Index: rules.mk === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/scripts/build/rules.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rules.mk 2 Nov 2001 18:42:25 - 1.4 +++ rules.mk 15 Jun 2005 11:10:39 - 1.5 @@ -4,8 +4,7 @@ # Compile commands #VPATH=.:../common COMPILE = $(CC) $(CFLAGS) -LT_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) -c $< -# && touch $@ +LT_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) -c $< -o $@ # Implicit rules for creating outputs from input files - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni SSLSocket.java
jfclere 2005/06/14 13:59:33 Modified:jni/java/org/apache/tomcat/jni SSLSocket.java Log: typo. Revision ChangesPath 1.11 +2 -2 jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/SSLSocket.java Index: SSLSocket.java === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/SSLSocket.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- SSLSocket.java14 Jun 2005 11:55:54 - 1.10 +++ SSLSocket.java14 Jun 2005 20:59:33 - 1.11 @@ -239,5 +239,5 @@ * @param sock The socket to read the data from. * @return Byte array containing session id. */ -public static byte[] getSessionId(long sock); +public static native byte[] getSessionId(long sock); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h jk_md5.h
jfclere 2005/06/14 08:44:22 Modified:jk/native configure.in jk/native/common jk_global.h jk_md5.h Log: detect in configure the int32 and int64 (and add if defined(AS400)). Revision ChangesPath 1.47 +20 -1 jakarta-tomcat-connectors/jk/native/configure.in Index: configure.in === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- configure.in 1 Jun 2005 03:53:58 - 1.46 +++ configure.in 14 Jun 2005 15:44:22 - 1.47 @@ -50,6 +50,25 @@ dnl AC_PATH_PROG(LIBTOOL,libtool,$PATH)dnl AC_SUBST(LIBTOOL) +AC_CHECK_SIZEOF(uint32_t) +AC_CHECK_SIZEOF(u_int32_t) +AC_CHECK_SIZEOF(unsigned long) + +AC_CHECK_SIZEOF(unsigned int) +AC_CHECK_SIZEOF(unsigned long long) +AC_CHECK_SIZEOF(unsigned longlong) +if test "$ac_cv_sizeof_unsigned_int" = "8"; then +AC_DEFINE(HAVE_INT64, [], [Use int for JK_UINT8]) +elif test "$ac_cv_sizeof_unsigned_long" = "8"; then +AC_DEFINE(HAVE_LONG64, [], [Use long for JK_UINT8]) +elif test "$ac_cv_sizeof_unsigned_long_long" = "8"; then +AC_DEFINE(HAVE_LONG_LONG64, [], [Use long long for JK_UINT8]) +elif test "$ac_cv_sizeof_unsigned_longlong" = "8"; then +AC_DEFINE(HAVE_LONGLONG64, [], [Use longlong for JK_UINT8]) +else +AC_ERROR([could not detect a 64-bit integer type]) +fi + dnl check for snprintf and vsnprintf. AC_CHECK_FUNC(snprintf, AC_DEFINE(HAVE_SNPRINTF,1,[Have snprintf()])) AC_CHECK_FUNC(vsnprintf, AC_DEFINE(HAVE_VSNPRINTF,1,[Have vsnprintf()])) 1.51 +8 -2 jakarta-tomcat-connectors/jk/native/common/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- jk_global.h 14 Jun 2005 06:34:13 - 1.50 +++ jk_global.h 14 Jun 2005 15:44:22 - 1.51 @@ -254,8 +254,14 @@ #define vsnprintf _vsnprintf #endif typedef unsigned __int64 jk_u64_t; -#else +#elif defined(HAVE_LONG_LONG64) || defined(AS400) typedef unsigned long long jk_u64_t; +#elif defined(HAVE_LONGLONG64) +typedef unsigned longlong jk_u64_t; +#elif defined(HAVE_LONG64) +typedef unsigned long jk_u64_t; +#else +typedef unsigned int jk_u64_t; /* HAVE_INT64 ! */ #endif /* Use apr snprintf() and vsnprintf() when needed */ 1.8 +5 -1 jakarta-tomcat-connectors/jk/native/common/jk_md5.h Index: jk_md5.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_md5.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jk_md5.h 2 Dec 2004 06:50:01 - 1.7 +++ jk_md5.h 14 Jun 2005 15:44:22 - 1.8 @@ -61,8 +61,12 @@ typedef DWORD JK_UINT4; #elif defined(NETWARE) && !defined(__NOVELL_LIBC__) typedef unsigned int JK_UINT4; -#else +#elif defined(SIZEOF_UINT32_T) typedef uint32_t JK_UINT4; +#elif defined(SIZEOF_U_INT32_T) +typedef u_int32_t JK_UINT4; +#else +typedef unsigned long JK_UINT4; /* ansi */ #endif /* MD5 context. */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c
jfclere 2005/06/14 07:31:24
Modified:jk/native/common jk_status.c
Log:
Useless comparision of unsigned with zero causes a warning.
Revision ChangesPath
1.44 +1 -4 jakarta-tomcat-connectors/jk/native/common/jk_status.c
Index: jk_status.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- jk_status.c 14 Jun 2005 06:34:13 - 1.43
+++ jk_status.c 14 Jun 2005 14:31:24 - 1.44
@@ -172,9 +172,6 @@
const char *o = ord;
unsigned int remain, siz;
-if (size < 0) {
-return strcpy(buf, " - ");
-}
if (size < 973) {
if (sprintf(buf, "%3d ", (int) size) < 0)
return strcpy(buf, "");
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni BIOSSLServer.java
jfclere 2005/06/13 07:00:04
Modified:jni/examples/org/apache/tomcat/jni BIOSSLServer.java
Log:
Arrange it according to the new SSL and SSLSocket methods.
Revision ChangesPath
1.2 +4 -3
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/BIOSSLServer.java
Index: BIOSSLServer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/BIOSSLServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BIOSSLServer.java 10 Jun 2005 17:15:56 - 1.1
+++ BIOSSLServer.java 13 Jun 2005 14:00:04 - 1.2
@@ -107,9 +107,10 @@
":" + raddr.port);
}
// SSLCallBack.setsock(clientSock);
-int retcode = SSLSocket.accept(serverCtx, clientSock,
serverPool);
+long sslSocket = SSLSocket.attach(serverCtx, clientSock,
serverPool);
+int retcode = SSLSocket.handshake(sslSocket);
if (retcode<=0) {
-throw(new Exception("Can't SSL accept: " +
SSLBIO.geterror(serverSSL, retcode)));
+throw(new Exception("Can't SSL accept: " +
SSL.getLastError()));
}
} catch (Exception e) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni SSLSocket.java
jfclere 2005/06/13 06:01:12 Modified:jni/java/org/apache/tomcat/jni SSLSocket.java Log: typo. Revision ChangesPath 1.9 +1 -21 jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/SSLSocket.java Index: SSLSocket.java === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/SSLSocket.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- SSLSocket.java13 Jun 2005 10:48:55 - 1.8 +++ SSLSocket.java13 Jun 2005 13:01:12 - 1.9 @@ -110,26 +110,6 @@ * APR_EINTR is never returned. * * @param sock The socket to send the data over. - * @param buf The buffer which contains the data to be sent. - * @param offset Offset in the byte buffer. - * @param len The number of bytes to write; (-1) for full array. - * @return The number of bytes send. - * - */ -public static native int send(long sock, byte[] buf, int offset, int len); - -/** - * Send data over a network. - * - * This functions acts like a blocking write by default. To change - * this behavior, use apr_socket_timeout_set() or the APR_SO_NONBLOCK - * socket option. - * - * It is possible for both bytes to be sent and an error to be returned. - * - * APR_EINTR is never returned. - * - * @param sock The socket to send the data over. * @param buf The Byte buffer which contains the data to be sent. * @param offset The offset within the buffer array of the first buffer from * which bytes are to be retrieved; must be non-negative - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/os/unix system.c
jfclere 2005/06/13 06:07:31 Modified:jni/native/os/unix system.c Log: typo. Revision ChangesPath 1.7 +2 -2 jakarta-tomcat-connectors/jni/native/os/unix/system.c Index: system.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/os/unix/system.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- system.c 11 Jun 2005 07:03:45 - 1.6 +++ system.c 13 Jun 2005 13:07:31 - 1.7 @@ -22,7 +22,7 @@ #include "apr.h" #include "apr_pools.h" #include "apr_network_io.h" -#include "apr_pol.h" +#include "apr_poll.h" #include "tcn.h" #if defined(__linux__) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src sslnetwork.c
jfclere 2005/06/10 10:15:56
Modified:jni build.xml
jni/java/org/apache/tomcat/jni SSLSocket.java
jni/native/src sslnetwork.c
Added: jni/examples/org/apache/tomcat/jni BIOSSLServer.java
Log:
Try to used apr sockets instead the openssl ones.
Revision ChangesPath
1.8 +10 -0 jakarta-tomcat-connectors/jni/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 6 Jun 2005 08:53:06 - 1.7
+++ build.xml 10 Jun 2005 17:15:55 - 1.8
@@ -309,4 +309,14 @@
+
+
+
+
+
+
+
+
+
1.1
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/BIOSSLServer.java
Index: BIOSSLServer.java
===
package org.apache.tomcat.jni;
import java.util.Properties;
import java.io.*;
import java.net.*;
import java.lang.*;
/** SSL Server server example
*
* @author Mladen Turk
* @version $Revision: 1.1 $, $Date: 2005/06/10 17:15:56 $
*/
public class BIOSSLServer {
public static String serverAddr = null;
public static int serverPort= 0;
public static int serverNmax= 0;
public static long serverPool = 0;
public static long serverCtx= 0;
public static String serverCert = null;
public static String serverKey = null;
public static String serverCiphers = null;
public static String serverPassword = null;
private static Object threadLock = new Object();
static {
try {
InputStream is = BIOSSLServer.class.getResourceAsStream
("/org/apache/tomcat/jni/SSL.properties");
Properties props = new Properties();
props.load(is);
is.close();
serverAddr = props.getProperty("server.ip", "127.0.0.1");
serverPort = Integer.decode(props.getProperty("server.port",
"4443")).intValue();
serverNmax = Integer.decode(props.getProperty("server.max",
"1")).intValue();
serverCert = props.getProperty("server.cert", "server.pem");
serverKey = props.getProperty("server.key", null);
serverCiphers = props.getProperty("server.ciphers", "ALL");
serverPassword = props.getProperty("server.password", null);
}
catch (Throwable t) {
; // Nothing
}
}
private class CallBack implements BIOCallback {
long clientSock = 0;
public int write(byte [] buf) {
return(Socket.send(clientSock, buf, 0, buf.length));
}
public int read(byte [] buf) {
return(Socket.recv(clientSock, buf, 0, buf.length));
}
public int puts(String data) {
System.out.println("CallBack.puts");
return -1;
}
public String gets(int len) {
System.out.println("CallBack.gets");
return "";
}
public void setsock(long sock) {
clientSock = sock;
}
}
public BIOSSLServer()
{
int i;
serverPool = Pool.create(0);
try {
/* Create SSL Context, one for each Virtual Host */
serverCtx = SSLContext.make(serverPool, SSL.SSL_PROTOCOL_SSLV2 |
SSL.SSL_PROTOCOL_SSLV3, SSL.SSL_MODE_SERVER);
// serverCtx = SSLContext.make(serverPool,
SSL.SSL_PROTOCOL_TLSV1, SSL.SSL_MODE_SERVER);
/* List the ciphers that the client is permitted to negotiate. */
SSLContext.setCipherSuite(serverCtx, serverCiphers);
/* Load Server key and certificate */
SSLContext.setCertificate(serverCtx, serverCert, serverKey,
serverPassword, SSL.SSL_AIDX_RSA);
SSLContext.setVerify(serverCtx, SSL.SSL_CVERIFY_NONE, 0);
/*
CallBack SSLCallBack = new CallBack();
long callback = SSL.newBIO(serverPool, SSLCallBack);
SSLContext.setBIO(serverCtx, callback, 1);
SSLContext.setBIO(serverCtx, callback, 0);
long serverSSL = SSLBIO.make(serverCtx, callback, callback);
*/
long serverSock = Socket.create(Socket.APR_INET,
Socket.SOCK_STREAM,
Socket.APR_PROTO_TCP, serverPool);
long inetAddre
cvs commit: jakarta-tomcat-connectors/jni/native/src ssl.c
jfclere 2005/06/09 02:33:40
Modified:jni/java/org/apache/tomcat/jni BIOCallback.java
jni/native/src ssl.c
Log:
Change the BIOCallback interface to use write(byte[] buf) and
read(byte[] buf);
The buff is in the native encoding that allows to use it for both
stdio/stderri
redirection and for the sockets (JAVA or APR).
Revision ChangesPath
1.4 +7 -7
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/BIOCallback.java
Index: BIOCallback.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/BIOCallback.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BIOCallback.java 9 Jun 2005 09:13:54 - 1.3
+++ BIOCallback.java 9 Jun 2005 09:33:40 - 1.4
@@ -26,17 +26,17 @@
/**
* Write data
- * @param data String to write
- * @return Number of characters written
+ * @param buf containg the bytes to write.
+ * @return Number of characters written.
*/
-public int write(String data);
+public int write(byte [] buf);
/**
* Read data
- * @param len Maximum number of characters to read
- * @return String with up to len bytes readed
+ * @param buf buffer to store the read bytes.
+ * @return number of bytes read.
*/
-public String read(int len);
+public int read(byte [] buf);
/**
* Puts string
1.29 +19 -17jakarta-tomcat-connectors/jni/native/src/ssl.c
Index: ssl.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/ssl.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ssl.c 9 Jun 2005 09:13:55 - 1.28
+++ ssl.c 9 Jun 2005 09:33:40 - 1.29
@@ -551,10 +551,12 @@
if (b->init && in != NULL) {
BIO_JAVA *j = (BIO_JAVA *)b->ptr;
JNIEnv *e = j->cb.env;
-if ((*e)->CallIntMethod(e, j->cb.obj,
-j->cb.mid[0],
-tcn_new_string(e, in, inl)))
-ret = inl;
+jbyteArray jb = (*e)->NewByteArray(e, inl);
+(*e)->SetByteArrayRegion(e, jb, 0, inl, (jbyte *)in);
+jint o = (*e)->CallIntMethod(e, j->cb.obj,
+j->cb.mid[0], jb);
+(*e)->ReleaseByteArrayElements(e, jb, (jbyte *)in, 0);
+ret = o;
}
return ret;
}
@@ -565,16 +567,16 @@
if (b->init && out != NULL) {
BIO_JAVA *j = (BIO_JAVA *)b->ptr;
JNIEnv *e = j->cb.env;
-jobject o;
-if ((o = (*e)->CallObjectMethod(e, j->cb.obj,
-j->cb.mid[1], (jint)(outl - 1 {
-TCN_ALLOC_CSTRING(o);
-if (J2S(o)) {
-int l = (int)strlen(J2S(o));
-ret = TCN_MIN(outl, l);
-memcpy(out, J2S(o), ret);
-}
-TCN_FREE_CSTRING(o);
+jbyteArray jb = (*e)->NewByteArray(e, outl);
+
+jint o = (*e)->CallObjectMethod(e, j->cb.obj,
+j->cb.mid[1], jb);
+if (o>=0) {
+int i;
+jbyte *jout = (*e)->GetByteArrayElements(e, jb, 0);
+memcpy(out, jout, o);
+(*e)->ReleaseByteArrayElements(e, jb, jout, 0);
+ret = o;
}
}
return ret;
@@ -666,8 +668,8 @@
cls = (*e)->GetObjectClass(e, callback);
j->cb.env= e;
-j->cb.mid[0] = (*e)->GetMethodID(e, cls, "write",
"(Ljava/lang/String;)I");
-j->cb.mid[1] = (*e)->GetMethodID(e, cls, "read",
"(I)Ljava/lang/String;");
+j->cb.mid[0] = (*e)->GetMethodID(e, cls, "write", "([B)I");
+j->cb.mid[1] = (*e)->GetMethodID(e, cls, "read", "([B)I");
j->cb.mid[2] = (*e)->GetMethodID(e, cls, "puts",
"(Ljava/lang/String;)I");
j->cb.mid[3] = (*e)->GetMethodID(e, cls, "gets",
"(I)Ljava/lang/String;");
/* TODO: Check if method id's are valid */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src ssl.c sslcontext.c
jfclere 2005/06/09 02:13:55
Modified:jni/examples/org/apache/tomcat/jni SSLServer.java
jni/java/org/apache/tomcat/jni BIOCallback.java SSL.java
SSLContext.java
jni/native/src ssl.c sslcontext.c
Log:
Undo my previous commit.
Revision ChangesPath
1.4 +1 -52
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java
Index: SSLServer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SSLServer.java8 Jun 2005 16:52:57 - 1.3
+++ SSLServer.java9 Jun 2005 09:13:54 - 1.4
@@ -47,27 +47,6 @@
}
}
-private class CallBack implements BIOCallback {
-long clientSock = 0;
-public int write(byte [] buf) {
-return(Socket.send(clientSock, buf, 0, buf.length));
-}
-public int read(byte [] buf) {
-return(Socket.recv(clientSock, buf, 0, buf.length));
-}
-public int puts(String data) {
-System.out.println("CallBack.puts");
-return -1;
-}
-public String gets(int len) {
-System.out.println("CallBack.gets");
-return "";
-}
-public void setsock(long sock) {
-clientSock = sock;
-}
-}
-
public SSLServer()
{
int i;
@@ -81,36 +60,6 @@
SSLContext.setCertificate(serverCtx, serverCert, serverKey,
serverPassword, SSL.SSL_AIDX_RSA);
SSLContext.setVerifyDepth(serverCtx, 10);
SSLContext.setVerifyClient(serverCtx, SSL.SSL_CVERIFY_REQUIRE);
-
-CallBack SSLCallBack = new CallBack();
-long callback = SSL.newBIO(serverPool, SSLCallBack);
-/*
-SSLContext.setBIO(serverCtx, callback, 1);
-SSLContext.setBIO(serverCtx, callback, 0);
- */
-long serverSSL = SSL.make(serverCtx, callback, callback);
-
-long serverSock = Socket.create(Socket.APR_INET,
Socket.SOCK_STREAM,
-Socket.APR_PROTO_TCP,
serverPool);
-long inetAddress = Address.info(SSLServer.serverAddr,
Socket.APR_INET, SSLServer.serverPort, 0, serverPool);
-int rc = Socket.bind(serverSock, inetAddress);
-if (rc != 0) {
-throw(new Exception("Can't bind: " + Error.strerror(rc)));
-}
-Socket.listen(serverSock, 5);
-long clientSock = Socket.accept(serverSock, serverPool);
-long sa = Address.get(Socket.APR_REMOTE, clientSock);
-Sockaddr raddr = new Sockaddr();
-if (Address.fill(raddr, sa)) {
-System.out.println("Remote Host: " + Address.getnameinfo(sa,
0));
-System.out.println("Remote IP: " + Address.getip(sa) +
- ":" + raddr.port);
-}
-SSLCallBack.setsock(clientSock);
-int retcode = SSL.accept(serverSSL);
-if (retcode<=0) {
-throw(new Exception("Can't SSL accept: " +
SSLContext.geterror(serverCtx, retcode)));
-}
} catch (Exception e) {
e.printStackTrace();
1.3 +7 -7
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/BIOCallback.java
Index: BIOCallback.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/BIOCallback.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BIOCallback.java 8 Jun 2005 16:52:58 - 1.2
+++ BIOCallback.java 9 Jun 2005 09:13:54 - 1.3
@@ -26,17 +26,17 @@
/**
* Write data
- * @param buf containg the bytes to write.
- * @return Number of characters written.
+ * @param data String to write
+ * @return Number of characters written
*/
-public int write(byte [] buf);
+public int write(String data);
/**
* Read data
- * @param buf buffer to store the read bytes.
- * @return number of bytes read.
+ * @param len Maximum number of characters to read
+ * @return String with up to len bytes readed
*/
-public int read(byte [] buf);
+public String read(int len);
/**
* Puts string
1.15 +1 -16
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/SSL.java
Index: SSL.java
cvs commit: jakarta-tomcat-connectors/jni/native/src ssl.c sslcontext.c
jfclere 2005/06/08 09:52:58
Modified:jni/examples/org/apache/tomcat/jni SSLServer.java
jni/java/org/apache/tomcat/jni BIOCallback.java SSL.java
SSLContext.java
jni/native/src ssl.c sslcontext.c
Log:
Change the BIOCallback interface to use write(byte[] buf) and
read(byte[] buf);
Add SSL_accept to do the client handshake.
Arrange the corresponding example.
Revision ChangesPath
1.3 +52 -1
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java
Index: SSLServer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SSLServer.java7 Jun 2005 09:16:59 - 1.2
+++ SSLServer.java8 Jun 2005 16:52:57 - 1.3
@@ -47,6 +47,27 @@
}
}
+private class CallBack implements BIOCallback {
+long clientSock = 0;
+public int write(byte [] buf) {
+return(Socket.send(clientSock, buf, 0, buf.length));
+}
+public int read(byte [] buf) {
+return(Socket.recv(clientSock, buf, 0, buf.length));
+}
+public int puts(String data) {
+System.out.println("CallBack.puts");
+return -1;
+}
+public String gets(int len) {
+System.out.println("CallBack.gets");
+return "";
+}
+public void setsock(long sock) {
+clientSock = sock;
+}
+}
+
public SSLServer()
{
int i;
@@ -60,6 +81,36 @@
SSLContext.setCertificate(serverCtx, serverCert, serverKey,
serverPassword, SSL.SSL_AIDX_RSA);
SSLContext.setVerifyDepth(serverCtx, 10);
SSLContext.setVerifyClient(serverCtx, SSL.SSL_CVERIFY_REQUIRE);
+
+CallBack SSLCallBack = new CallBack();
+long callback = SSL.newBIO(serverPool, SSLCallBack);
+/*
+SSLContext.setBIO(serverCtx, callback, 1);
+SSLContext.setBIO(serverCtx, callback, 0);
+ */
+long serverSSL = SSL.make(serverCtx, callback, callback);
+
+long serverSock = Socket.create(Socket.APR_INET,
Socket.SOCK_STREAM,
+Socket.APR_PROTO_TCP,
serverPool);
+long inetAddress = Address.info(SSLServer.serverAddr,
Socket.APR_INET, SSLServer.serverPort, 0, serverPool);
+int rc = Socket.bind(serverSock, inetAddress);
+if (rc != 0) {
+throw(new Exception("Can't bind: " + Error.strerror(rc)));
+}
+Socket.listen(serverSock, 5);
+long clientSock = Socket.accept(serverSock, serverPool);
+long sa = Address.get(Socket.APR_REMOTE, clientSock);
+Sockaddr raddr = new Sockaddr();
+if (Address.fill(raddr, sa)) {
+System.out.println("Remote Host: " + Address.getnameinfo(sa,
0));
+System.out.println("Remote IP: " + Address.getip(sa) +
+ ":" + raddr.port);
+}
+SSLCallBack.setsock(clientSock);
+int retcode = SSL.accept(serverSSL);
+if (retcode<=0) {
+throw(new Exception("Can't SSL accept: " +
SSLContext.geterror(serverCtx, retcode)));
+}
} catch (Exception e) {
e.printStackTrace();
1.2 +7 -7
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/BIOCallback.java
Index: BIOCallback.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/BIOCallback.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BIOCallback.java 1 Jun 2005 08:20:43 - 1.1
+++ BIOCallback.java 8 Jun 2005 16:52:58 - 1.2
@@ -26,17 +26,17 @@
/**
* Write data
- * @param data String to write
- * @return Number of characters written
+ * @param buf containg the bytes to write.
+ * @return Number of characters written.
*/
-public int write(String data);
+public int write(byte [] buf);
/**
* Read data
- * @param len Maximum number of characters to read
- * @return String with up to len bytes readed
+ * @param buf buffer to store the read bytes.
+ * @return number of bytes read.
*/
-public String read(int len);
+public int read(byte [] buf);
/**
* Puts str
cvs commit: jakarta-tomcat-connectors/jni README.txt
jfclere 2005/06/07 03:15:12 Modified:jni README.txt Log: now the ssl server example is working. Revision ChangesPath 1.3 +6 -4 jakarta-tomcat-connectors/jni/README.txt Index: README.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/README.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README.txt6 Jun 2005 16:28:33 - 1.2 +++ README.txt7 Jun 2005 10:15:12 - 1.3 @@ -9,7 +9,9 @@ before running the examples you may have to set LD_LIBRARY_PATH, something like LD_LIBRARY_PATH=/opt/SMAWoIS/openssl/lib; export LD_LIBRARY_PATH -echo: (port in examples/org/apache/tomcat/jni/Echo.properties). -ant echo-example -ssl server: (see parameters in ./examples/org/apache/tomcat/jni/SSL.properties) -ant server-example +1 - echo: (port in examples/org/apache/tomcat/jni/Echo.properties). +ant echo-example +2 - ssl server: +(see parameters in ./examples/org/apache/tomcat/jni/SSL.properties) +The certificate and key should be in dist/classes/examples. +ant server-example - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src error.c
jfclere 2005/06/07 03:08:08 Modified:jni/native/src error.c Log: typo? It cores in my machine... Revision ChangesPath 1.10 +1 -2 jakarta-tomcat-connectors/jni/native/src/error.c Index: error.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- error.c 3 Jun 2005 07:44:10 - 1.9 +++ error.c 7 Jun 2005 10:08:08 - 1.10 @@ -53,7 +53,6 @@ apr_vsnprintf(msg, TCN_BUFFER_SZ, fmt, ap); tcn_ThrowException(env, msg); va_end(ap); -free(msg); } /* - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni README.txt
jfclere 2005/06/06 09:28:33 Modified:jni README.txt Log: Add something about the examples. Revision ChangesPath 1.2 +10 -0 jakarta-tomcat-connectors/jni/README.txt Index: README.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/README.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.txt15 Jan 2005 11:27:31 - 1.1 +++ README.txt6 Jun 2005 16:28:33 - 1.2 @@ -3,3 +3,13 @@ Building +ant + +Running the examples + +before running the examples you may have to set LD_LIBRARY_PATH, something like +LD_LIBRARY_PATH=/opt/SMAWoIS/openssl/lib; export LD_LIBRARY_PATH +echo: (port in examples/org/apache/tomcat/jni/Echo.properties). +ant echo-example +ssl server: (see parameters in ./examples/org/apache/tomcat/jni/SSL.properties) +ant server-example - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native BUILDING
jfclere 2005/06/06 09:07:33 Modified:jni/native BUILDING Log: Add a note about testing with openssl. Revision ChangesPath 1.4 +1 -0 jakarta-tomcat-connectors/jni/native/BUILDING Index: BUILDING === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/BUILDING,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BUILDING 3 Jun 2005 08:43:38 - 1.3 +++ BUILDING 6 Jun 2005 16:07:33 - 1.4 @@ -24,3 +24,4 @@ - To use it in Tomcat you may have to add in bin/setenv.sh: LD_LIBRARY_PATH=openssl_install_location/lib; export LD_LIBRARY_PATH (use ldd ./.libs/libtcnative-1.so to check it). + - quick testing: openssl s_client -connect localhost:8443 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src sslutils.c
jfclere 2005/06/06 02:52:12
Modified:jni/native Makefile.in configure.in
jni/native/build tcnative.m4
jni/native/src sslutils.c
Log:
Allow to work without curses.
Revision ChangesPath
1.5 +1 -1 jakarta-tomcat-connectors/jni/native/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 23 May 2005 12:23:53 - 1.4
+++ Makefile.in 6 Jun 2005 09:52:12 - 1.5
@@ -9,7 +9,7 @@
srcdir = @srcdir@
VPATH = @srcdir@
-INCLUDES = @SSL_CFLAGS@ @APR_INCLUDES@ @TCNATIVE_INCLUDES@
@TCNATIVE_PRIV_INCLUDES@
+INCLUDES = @CURSES_CFLAGS@ @SSL_CFLAGS@ @APR_INCLUDES@ @TCNATIVE_INCLUDES@
@TCNATIVE_PRIV_INCLUDES@
TCNATIVE_LDFLAGS = @TCNATIVE_LDFLAGS@
TCNATIVE_LIBS = @TCNATIVE_LIBS@
1.3 +5 -0 jakarta-tomcat-connectors/jni/native/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.in 23 May 2005 11:43:36 - 1.2
+++ configure.in 6 Jun 2005 09:52:12 - 1.3
@@ -103,6 +103,11 @@
dnl
TCN_CHECK_SSL_TOOLKIT
+dnl
+dnl check curses
+dnl
+TCN_FIND_CURSES
+
so_ext=$APR_SO_EXT
lib_target=$APR_LIB_TARGET
AC_SUBST(so_ext)
1.6 +28 -0 jakarta-tomcat-connectors/jni/native/build/tcnative.m4
Index: tcnative.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/build/tcnative.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tcnative.m4 23 May 2005 12:43:46 - 1.5
+++ tcnative.m4 6 Jun 2005 09:52:12 - 1.6
@@ -327,3 +327,31 @@
AC_SUBST(SSL_LIBS)
AC_SUBST(SSL_CFLAGS)
])
+
+dnl
+dnl TCN_FIND_CURSES: figure out how to use curses.
+dnl
+AC_DEFUN(
+ [TCN_FIND_CURSES],
+ [
+AC_MSG_CHECKING([for curses (please wait)])
+AC_ARG_WITH(curses,
+[ --with-curses path to the installed curses library],
+[
+if test "$withval" = "yes"; then
+ APR_ADDTO(TCNATIVE_LIBS, [-lcurses])
+ APR_ADDTO(CURSES_CFLAGS, [-DHAVE_CURSES])
+elif test "$withval" != "no"; then
+ if test ! -d "${withval}"; then
+AC_MSG_ERROR(Not a directory: ${withval})
+ fi
+ APR_ADDTO(TCNATIVE_LIBS, [-L${withval}/lib -lcurses])
+ APR_ADDTO(CURSES_CFLAGS, [-DHAVE_CURSES -I${withval}/include])
+fi
+],
+[
+AC_MSG_RESULT("no curses")
+])
+
+ AC_SUBST(CURSES_CFLAGS)
+ ])
1.14 +28 -1 jakarta-tomcat-connectors/jni/native/src/sslutils.c
Index: sslutils.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslutils.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sslutils.c6 Jun 2005 08:19:18 - 1.13
+++ sslutils.c6 Jun 2005 09:52:12 - 1.14
@@ -34,8 +34,10 @@
#ifdef WIN32
#include /* getch() */
#else
+#ifdef HAVE_CURSES
#include /* getch() */
#endif
+#endif
/* _
**
@@ -106,6 +108,7 @@
return APR_SUCCESS;
}
+#if defined(WIN32) || defined(HAVE_CURSES)
static void password_prompt(const char *prompt, char *buf, size_t len)
{
size_t i;
@@ -128,6 +131,30 @@
}
buf[i] = '\0';
}
+#else
+static void password_prompt(const char *prompt, char *buf, size_t len)
+{
+size_t i=0;
+int ch;
+
+fprintf(stderr, prompt);
+for (i = 0; i < (len - 1); i++) {
+ch = getchar();
+if (ch == EOF)
+break;
+if (ch == '\n')
+break;
+else if (ch == '\b') {
+i--;
+if (i > 0)
+i--;
+}
+else
+buf[i] = ch;
+}
+buf[i] = '\0';
+}
+#endif
#define PROMPT_STRING "Enter password: "
/* Simple echo password prompting */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native BUILDING
jfclere 2005/06/03 01:43:38 Modified:jni/native BUILDING Log: Add about ssl and correct setup to setenv. Revision ChangesPath 1.3 +9 -3 jakarta-tomcat-connectors/jni/native/BUILDING Index: BUILDING === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/BUILDING,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BUILDING 18 Apr 2005 13:52:49 - 1.2 +++ BUILDING 3 Jun 2005 08:43:38 - 1.3 @@ -1,6 +1,6 @@ Building from the cvs tree: sh buildconf --with-apr=apr_source_location. - configure --with-apr=apr_install_location. + configure --with-apr=apr_install_location --with-ssl=openssl_install_location make Testing the build: @@ -14,7 +14,13 @@ Using it in Tomcat: 1 - In use of conf/server.xml: protocol="org.apache.coyote.http11.Http11AprProtocol" - 2 - In bin/setup.sh add the following: + 2 - In bin/setenv.sh add the following: CATALINA_OPTS="$CATALINA_OPTS -Djava.library.path=tclib_location" In my machine I am using: -/home/jfclere/jakarta-tomcat-connectors/jni/native/.libs for tclib_location +/home/jfclere/jakarta-tomcat-connectors/jni/native/.libs for tclib_location + +NOTES: + - configure --without-ssl : Configure without ssl support. + - To use it in Tomcat you may have to add in bin/setenv.sh: +LD_LIBRARY_PATH=openssl_install_location/lib; export LD_LIBRARY_PATH +(use ldd ./.libs/libtcnative-1.so to check it). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java
jfclere 2005/05/05 00:00:10
Modified:catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
Undo my previous commit - Still looking for a better solution -
Revision ChangesPath
1.38 +1 -11
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- DefaultServlet.java 4 May 2005 07:04:30 - 1.37
+++ DefaultServlet.java 5 May 2005 07:00:09 - 1.38
@@ -1725,16 +1725,6 @@
if (cacheEntry.resource != null) {
byte buffer[] = cacheEntry.resource.getContent();
if (buffer != null) {
-if (fileEncoding != null &&
-cacheEntry.attributes.getMimeType()!=null &&
-cacheEntry.attributes.getMimeType().equals("text/html"))
{
-/* the "binary" have to be converted from fileEncoding
to UTF-8 */
-try {
-String str = new String(buffer, fileEncoding);
-buffer = str.getBytes("UTF-8");
-} catch (Exception e) {
-}
-}
ostream.write(buffer, 0, buffer.length);
return;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader WebappClassLoader.java
jfclere 2005/05/04 00:30:24
Modified:catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java
Log:
Allow to use properties in native encoding.
In EBCDIC Environments the FileInputStream is localized but not the
ByteArrayInputStream therefore loading a properties from such
a file using the WebappClassLoader class loader failed.
Revision ChangesPath
1.49 +32 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Index: WebappClassLoader.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- WebappClassLoader.java30 Mar 2005 13:01:00 - 1.48
+++ WebappClassLoader.java4 May 2005 07:30:24 - 1.49
@@ -354,6 +354,11 @@
*/
protected boolean hasExternalRepositories = false;
+/**
+ * need conversion for properties files
+ */
+protected boolean needConvert = false;
+
/**
* All permission.
@@ -1444,6 +1449,15 @@
public void start() throws LifecycleException {
started = true;
+String encoding = null;
+try {
+encoding = System.getProperty("file.encoding");
+} catch (Exception e) {
+return;
+}
+if (encoding.indexOf("EBCDIC")!=-1) {
+needConvert = true;
+}
}
@@ -1695,6 +1709,8 @@
Resource resource = null;
+boolean fileNeedConvert = false;
+
for (i = 0; (entry == null) && (i < repositoriesLength); i++) {
try {
@@ -1728,6 +1744,12 @@
return null;
}
+if (needConvert) {
+if (path.endsWith(".properties")) {
+fileNeedConvert = true;
+}
+}
+
// Register the full path for modification checking
// Note: Only syncing on a 'constant' object is needed
synchronized (allPermission) {
@@ -1855,8 +1877,8 @@
byte[] binaryContent = new byte[contentLength];
+int pos = 0;
try {
-int pos = 0;
while (true) {
int n = binaryStream.read(binaryContent, pos,
@@ -1874,6 +1896,14 @@
return null;
}
+if (fileNeedConvert) {
+String str = new String(binaryContent,0,pos);
+try {
+binaryContent = str.getBytes("UTF-8");
+} catch (Exception e) {
+return null;
+}
+}
entry.binaryContent = binaryContent;
// The certificates are only available after the JarEntry
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java
jfclere 2005/05/04 00:04:30
Modified:catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
When the file comes from a resource fileEncoding was not working.
The default beahviour is unchanged: the file is send without a conversion.
Revision ChangesPath
1.37 +11 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- DefaultServlet.java 2 May 2005 16:52:10 - 1.36
+++ DefaultServlet.java 4 May 2005 07:04:30 - 1.37
@@ -1725,6 +1725,16 @@
if (cacheEntry.resource != null) {
byte buffer[] = cacheEntry.resource.getContent();
if (buffer != null) {
+if (fileEncoding != null &&
+cacheEntry.attributes.getMimeType()!=null &&
+cacheEntry.attributes.getMimeType().equals("text/html"))
{
+/* the "binary" have to be converted from fileEncoding
to UTF-8 */
+try {
+String str = new String(buffer, fileEncoding);
+buffer = str.getBytes("UTF-8");
+} catch (Exception e) {
+}
+}
ostream.write(buffer, 0, buffer.length);
return;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni Echo.java
jfclere 2005/04/18 08:28:06
Modified:jni/examples/org/apache/tomcat/jni Echo.java
Log:
use Error.strerror(). Thanks Mladen ;-)
Revision ChangesPath
1.10 +2 -2
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java
Index: Echo.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Echo.java 18 Apr 2005 15:24:01 - 1.9
+++ Echo.java 18 Apr 2005 15:28:06 - 1.10
@@ -85,7 +85,7 @@
}
int rc = Socket.bind(serverSock, inetAddress);
if (rc != 0) {
- throw(new Exception("Can't create Acceptor:bind failed"));
+ throw(new Exception("Can't create Acceptor: bind: " +
Error.strerror(rc)));
}
Socket.listen(serverSock, 5);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni Echo.java
jfclere 2005/04/18 07:06:42
Modified:jni/examples/org/apache/tomcat/jni Echo.java
Log:
Check the return code of bind().
Revision ChangesPath
1.8 +5 -2
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java
Index: Echo.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Echo.java 16 Apr 2005 17:24:13 - 1.7
+++ Echo.java 18 Apr 2005 14:06:42 - 1.8
@@ -83,7 +83,10 @@
System.out.println("IP: " + Address.getip(sa) +
":" + addr.port);
}
-Socket.bind(serverSock, inetAddress);
+int rc = Socket.bind(serverSock, inetAddress);
+if (rc != 0) {
+ throw(new Exception("Can't create Acceptor:bind failed"));
+}
Socket.listen(serverSock, 5);
}
catch( Exception ex ) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native BUILDING
jfclere 2005/04/18 06:52:49 Modified:jni/native BUILDING Log: Add how to run the example and to use Tomcat 5.5.x with the new code. Revision ChangesPath 1.2 +17 -2 jakarta-tomcat-connectors/jni/native/BUILDING Index: BUILDING === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/BUILDING,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BUILDING 15 Apr 2005 12:36:05 - 1.1 +++ BUILDING 18 Apr 2005 13:52:49 - 1.2 @@ -1,5 +1,20 @@ Building from the cvs tree: - chmod a+x build/get-version.sh sh buildconf --with-apr=apr_source_location. configure --with-apr=apr_install_location. - + make + + Testing the build: + The make should produce a .so file named libtcnative-1.so. + Build the jar containing the example by + cd .. + ant jar + Run the example: + ant example-basic + + Using it in Tomcat: + 1 - In use of conf/server.xml: +protocol="org.apache.coyote.http11.Http11AprProtocol" + 2 - In bin/setup.sh add the following: +CATALINA_OPTS="$CATALINA_OPTS -Djava.library.path=tclib_location" +In my machine I am using: +/home/jfclere/jakarta-tomcat-connectors/jni/native/.libs for tclib_location - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni Echo.java
jfclere 2005/04/16 03:46:55
Modified:jni/examples/org/apache/tomcat/jni Echo.java
Log:
catch the next exception.
Revision ChangesPath
1.4 +11 -6
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java
Index: Echo.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Echo.java 15 Apr 2005 14:24:53 - 1.3
+++ Echo.java 16 Apr 2005 10:46:55 - 1.4
@@ -64,7 +64,7 @@
private long serverSock = 0;
private long inetAddress = 0;
private long pool = 0;
-public Acceptor() {
+public Acceptor() throws Exception {
try {
pool = Pool.create(Echo.echoPool);
@@ -80,6 +80,7 @@
}
catch( Exception ex ) {
ex.printStackTrace();
+throw(new Exception("Can't create Acceptor"));
}
}
@@ -232,10 +233,14 @@
{
int i;
echoPool = Pool.create(0);
-echoAcceptor = new Acceptor();
-echoAcceptor.start();
-echoPoller = new Poller();
-echoPoller.start();
+try {
+echoAcceptor = new Acceptor();
+echoAcceptor.start();
+echoPoller = new Poller();
+echoPoller.start();
+} catch (Exception e) {
+e.printStackTrace();
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src network.c
jfclere 2005/04/16 03:31:34 Modified:jni/java/org/apache/tomcat/jni Socket.java jni/native/src network.c Log: Throw an exception when bind() failed. Revision ChangesPath 1.7 +3 -2 jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Socket.java Index: Socket.java === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Socket.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Socket.java 15 Apr 2005 10:26:19 - 1.6 +++ Socket.java 16 Apr 2005 10:31:34 - 1.7 @@ -138,7 +138,8 @@ * This may be where we will find out if there is any other process * using the selected port. */ -public static native int bind(long sock, long sa); +public static native int bind(long sock, long sa) +throws Exception; /** * Listen to a bound socket for connections. 1.7 +3 -1 jakarta-tomcat-connectors/jni/native/src/network.c Index: network.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/network.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- network.c 15 Apr 2005 10:26:19 - 1.6 +++ network.c 16 Apr 2005 10:31:34 - 1.7 @@ -135,7 +135,9 @@ apr_sockaddr_t *a = J2P(sa, apr_sockaddr_t *); UNREFERENCED_STDARGS; -return (jint)apr_socket_bind(s, a); +TCN_THROW_IF_ERR(apr_socket_bind(s, a), s); +cleanup: +return (jint)0; } TCN_IMPLEMENT_CALL(jint, Socket, listen)(TCN_STDARGS, jlong sock, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni build.xml
jfclere 2005/04/16 02:53:42 Modified:jni build.xml Log: use example instead compile-example (why do with need compile-example?). Revision ChangesPath 1.6 +1 -1 jakarta-tomcat-connectors/jni/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- build.xml 16 Apr 2005 09:35:57 - 1.5 +++ build.xml 16 Apr 2005 09:53:42 - 1.6 @@ -289,7 +289,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni build.xml
jfclere 2005/04/16 02:35:57 Modified:jni build.xml Log: Add tc.library.path to help the JVM to find the library. Revision ChangesPath 1.5 +3 -0 jakarta-tomcat-connectors/jni/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- build.xml 15 Apr 2005 21:57:08 - 1.4 +++ build.xml 16 Apr 2005 09:35:57 - 1.5 @@ -35,6 +35,7 @@ + @@ -66,6 +67,7 @@ + @@ -292,6 +294,7 @@ + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni Library.java
jfclere 2005/04/16 02:17:38
Modified:jni/java/org/apache/tomcat/jni Library.java
Log:
print java.library.path when the library cannot be loaded.
Revision ChangesPath
1.4 +4 -1
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Library.java
Index: Library.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Library.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Library.java 18 Jan 2005 10:22:32 - 1.3
+++ Library.java 16 Apr 2005 09:17:38 - 1.4
@@ -49,6 +49,9 @@
break;
}
if (!loaded) {
+err += "(";
+err += System.getProperty("java.library.path");
+err += ")";
throw new UnsatisfiedLinkError(err);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni build.xml
jfclere 2005/04/15 14:57:08 Modified:jni build.xml Log: The example is named Echo for moment. Revision ChangesPath 1.4 +2 -2 jakarta-tomcat-connectors/jni/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 14 Apr 2005 18:52:28 - 1.3 +++ build.xml 15 Apr 2005 21:57:08 - 1.4 @@ -288,8 +288,8 @@ - - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni Echo.java
jfclere 2005/04/15 07:24:53
Modified:jni/examples/org/apache/tomcat/jni Echo.java
Log:
Quick hack to get it compiled.
Revision ChangesPath
1.3 +6 -4
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java
Index: Echo.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Echo.java 14 Apr 2005 06:46:28 - 1.2
+++ Echo.java 15 Apr 2005 14:24:53 - 1.3
@@ -51,8 +51,8 @@
props.load(is);
is.close();
echoAddr = props.getProperty("echo.ip", "127.0.0.1");
-echoPort = Integer.decode(props.getProperty("echo.port", "23"));
-echoNmax = Integer.decode(props.getProperty("echo.max", "1"));
+echoPort = Integer.decode(props.getProperty("echo.port",
"23")).intValue();
+echoNmax = Integer.decode(props.getProperty("echo.max",
"1")).intValue();
}
catch (Throwable t) {
; // Nothing
@@ -159,15 +159,17 @@
worker.start();
}
}
+/* XXX: JFC quick hack
catch(Error err ) {
if (Status.APR_STATUS_IS_TIMEUP(err.getError())) {
-/* TODO: deal with timeout */
+/0 TODO: deal with timeout 0/
}
else {
err.printStackTrace();
break;
}
}
+ */
catch( Exception ex ) {
ex.printStackTrace();
break;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native BUILDING
jfclere 2005/04/15 05:36:05 Added: jni/native BUILDING Log: Just some hints to help building. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jni/native/BUILDING Index: BUILDING === Building from the cvs tree: chmod a+x build/get-version.sh sh buildconf --with-apr=apr_source_location. configure --with-apr=apr_install_location. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
jfclere 2005/01/31 00:14:03
Modified:jk/support jk_apxs.m4
Log:
Add HP/UX support, thanks to "William A. Rowe, Jr."
Revision ChangesPath
1.17 +10 -4 jakarta-tomcat-connectors/jk/support/jk_apxs.m4
Index: jk_apxs.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apxs.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_apxs.m41 Apr 2004 07:08:20 - 1.16
+++ jk_apxs.m431 Jan 2005 08:14:03 - 1.17
@@ -101,11 +101,17 @@
APR_UTIL_INCDIR="-I`${APXS$1} -q APU_INCLUDEDIR`"
APACHE2_LIBDIR="`${APXS$1} -q LIBDIR`"
LIBTOOL=`${APXS$1} -q LIBTOOL`
- if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so -o -f
${APACHE2_LIBDIR}/libapr-1.dylib; then
+ if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so \
+ -o -f ${APACHE2_LIBDIR}/libapr-1.sl \
+ -o -f ${APACHE2_LIBDIR}/libapr-1.dylib; then
APR_LIBS="-L${APACHE2_LIBDIR} -lapr-1"
- elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so -o -f
${APACHE2_LIBDIR}/libapr-0.dylib; then
+ elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so \
+-o -f ${APACHE2_LIBDIR}/libapr-0.sl \
+-o -f ${APACHE2_LIBDIR}/libapr-0.dylib; then
APR_LIBS="-L${APACHE2_LIBDIR} -lapr-0"
- elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so -o -f
${APACHE2_LIBDIR}/libapr.dylib; then
+ elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so \
+-o -f ${APACHE2_LIBDIR}/libapr.sl \
+-o -f ${APACHE2_LIBDIR}/libapr.dylib; then
APR_LIBS="-L${APACHE2_LIBDIR} -lapr"
else
AC_MSG_ERROR(can't locate libapr)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/install apache2.xml
jfclere 2004/11/22 09:36:03 Modified:jk/xdocs/install apache2.xml Log: EAPI is only for Apache-1.3. Revision ChangesPath 1.2 +0 -5 jakarta-tomcat-connectors/jk/xdocs/install/apache2.xml Index: apache2.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/install/apache2.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apache2.xml 18 Nov 2004 18:31:37 - 1.1 +++ apache2.xml 22 Nov 2004 17:36:03 - 1.2 @@ -82,11 +82,6 @@ DIR is something like: /home/apache/apache_1.3.33 It builds a static Apache module. - - This parameter is needed when using Apache-1.3 and mod_ssl, otherwise you will get the error message: -"this module might crash under EAPI!" when loading mod_jk.so in httpd. -Not needed when --with-apxs has been used. - JNI related parameters : - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/nt_service jk_nt_service.c
jfclere 2004/11/05 07:28:39
Modified:jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
jk/native/common jk_map.c jk_map.h jk_util.c jk_worker.c
jk/native/domino jk_dsapi_plugin.c
jk/native/iis jk_isapi_plugin.c
jk/native/isapi jk_isapi_plugin.c
jk/native/netscape jk_nsapi_plugin.c
jk/native/nt_service jk_nt_service.c
Log:
Change map_free() to jk_map_free() because it conflics with a map_free in php.
The map_free() of php comes from cyrus-imapd-2.2.x
Revision ChangesPath
1.49 +4 -4 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mod_jk.c 8 Oct 2004 08:55:13 - 1.48
+++ mod_jk.c 5 Nov 2004 15:28:39 - 1.49
@@ -2005,9 +2005,9 @@
if (NULL != conf) {
wc_close(conf->log);
uri_worker_map_free(&(conf->uw_map), conf->log);
-map_free(&(conf->uri_to_context));
-map_free(&(conf->worker_properties));
-map_free(&(conf->automount));
+jk_map_free(&(conf->uri_to_context));
+jk_map_free(&(conf->worker_properties));
+jk_map_free(&(conf->automount));
if (conf->log)
jk_close_file_logger(&(conf->log));
}
1.97 +4 -4 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mod_jk.c 8 Oct 2004 08:55:13 - 1.96
+++ mod_jk.c 5 Nov 2004 15:28:39 - 1.97
@@ -1844,11 +1844,11 @@
up between APR implementations. */
wc_close(NULL);
if (conf->worker_properties)
-map_free(&conf->worker_properties);
+jk_map_free(&conf->worker_properties);
if (conf->uri_to_context)
-map_free(&conf->uri_to_context);
+jk_map_free(&conf->uri_to_context);
if (conf->automount)
-map_free(&conf->automount);
+jk_map_free(&conf->automount);
if (conf->uw_map)
uri_worker_map_free(&conf->uw_map, NULL);
}
1.15 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_map.c
Index: jk_map.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_map.c 8 Oct 2004 07:50:39 - 1.14
+++ jk_map.c 5 Nov 2004 15:28:39 - 1.15
@@ -57,7 +57,7 @@
return JK_FALSE;
}
-int map_free(jk_map_t **m)
+int jk_map_free(jk_map_t **m)
{
int rc = JK_FALSE;
1.10 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_map.h
Index: jk_map.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_map.h 8 Oct 2004 07:50:40 - 1.9
+++ jk_map.h 5 Nov 2004 15:28:39 - 1.10
@@ -35,7 +35,7 @@
int map_alloc(jk_map_t **m);
-int map_free(jk_map_t **m);
+int jk_map_free(jk_map_t **m);
int map_open(jk_map_t *m);
1.31 +6 -4 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jk_util.c 8 Oct 2004 07:50:40 - 1.30
+++ jk_util.c 5 Nov 2004 15:28:39 - 1.31
@@ -205,9 +205,11 @@
{
if (l && *l) {
file_logger_t *p = (*l)->logger_private;
-fflush(p->logfile);
-fclose(p->logfile);
-free(p);
+if (p) {
+ fflush(p->logfile);
+ fclose(p->logfile);
+ free(p);
+}
free(*l);
*l = NULL;
1.17 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_worker.c
Index: jk_worker.c
=
cvs commit: jakarta-tomcat-connectors/jk/xdocs index.xml
jfclere 2004/10/05 03:01:04 Modified:jk/xdocs index.xml Log: Typo. Revision ChangesPath 1.19 +2 -2 jakarta-tomcat-connectors/jk/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- index.xml 5 Oct 2004 09:57:06 - 1.18 +++ index.xml 5 Oct 2004 10:01:04 - 1.19 @@ -126,7 +126,7 @@ -Tomcat's AJP stack and httpd-2.1 AJP proxy that is a addition to the mod_proxy of http. It is developped in httpd-2.1 and integrated in it. +Tomcat's AJP stack and httpd-2.1 AJP proxy that is an addition to the mod_proxy of http. It is developped in httpd-2.1 and integrated in it. (See AJP proxy). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs index.xml proxy.xml
jfclere 2004/10/05 02:57:06 Modified:jk/xdocs index.xml proxy.xml Log: Add something about the new ajp proxy modules of httpd-2.1. Revision ChangesPath 1.18 +5 -1 jakarta-tomcat-connectors/jk/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- index.xml 14 Jul 2004 07:51:32 - 1.17 +++ index.xml 5 Oct 2004 09:57:06 - 1.18 @@ -126,6 +126,10 @@ +Tomcat's AJP stack and httpd-2.1 AJP proxy that is a addition to the mod_proxy of http. It is developped in httpd-2.1 and integrated in it. +(See AJP proxy). + + Tomcat's internal HTTP stack and mod_proxy which is not that bad, but slow, well, of course Tomcat didn't have 10/11 years of C routine optimization like the Apache Web Server, but it's quite good. The only disadvantage is that it 1.2 +14 -3 jakarta-tomcat-connectors/jk/xdocs/proxy.xml Index: proxy.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/proxy.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- proxy.xml 4 Aug 2004 13:57:19 - 1.1 +++ proxy.xml 5 Oct 2004 09:57:06 - 1.2 @@ -32,14 +32,25 @@ - + -The Ajp proxy is a new module based on the standard Http proxy it uses AJP instead of HTTP. +The AJP proxy is a new module based on the standard Http proxy it uses AJP instead of HTTP. <Location /examples/> ProxyPass ajp://localhost:8009/examples/ </Location> + + + + + +AJP proxy is integrated in httpd-2.1 and the developement and discussions take +place http://httpd.apache.org/lists.html";>there. +More documentation can be found there +http://httpd.apache.org/docs-2.1/mod/mod_proxy_ajp.html";>mod_proxy_ajp +and +http://httpd.apache.org/docs-2.1/mod/mod_proxy_balancer.html";>mod_proxy_balancer. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/proxy mod_proxy.c
jfclere 2004/08/04 09:07:03 Modified:ajp/proxy mod_proxy.c Log: DON'T remove it. It doesn't work without it!!! Revision ChangesPath 1.21 +2 -2 jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c Index: mod_proxy.c === RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mod_proxy.c 4 Aug 2004 14:48:13 - 1.20 +++ mod_proxy.c 4 Aug 2004 16:07:03 - 1.21 @@ -848,8 +848,8 @@ return "ProxyPass needs a path when not defined in a location"; new = apr_array_push(conf->aliases); -new->fake = f; -new->real = r; +new->fake = apr_pstrdup(cmd->pool, f); +new->real = apr_pstrdup(cmd->pool, r); arr = apr_table_elts(params); elts = (const apr_table_entry_t *)arr->elts; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/proxy proxy_util.c
jfclere 2004/08/04 08:53:21
Modified:ajp/proxy proxy_util.c
Log:
Arrange the handling of apr_array_header_t arrays.
Revision ChangesPath
1.9 +12 -10jakarta-tomcat-connectors/ajp/proxy/proxy_util.c
Index: proxy_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/proxy_util.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- proxy_util.c 4 Aug 2004 15:13:35 - 1.8
+++ proxy_util.c 4 Aug 2004 15:53:21 - 1.9
@@ -992,7 +992,7 @@
proxy_server_conf
*conf,
const char *url)
{
-struct proxy_balancer *balancers;
+struct proxy_balancer *balancer;
char *c, *uri = apr_pstrdup(p, url);
int i;
@@ -1002,10 +1002,11 @@
/* remove path from uri */
if ((c = strchr(c + 3, '/')))
*c = '\0';
-balancers = (struct proxy_balancer *)conf->balancers;
+balancer = (struct proxy_balancer *)conf->balancers->elts;
for (i = 0; i < conf->balancers->nelts; i++) {
-if (strcasecmp(balancers[i].name, uri) == 0)
-return &balancers[i];
+if (strcasecmp(balancer->name, uri) == 0)
+return balancer;
+balancer++;
}
return NULL;
}
@@ -1056,7 +1057,7 @@
proxy_server_conf *conf,
const char *url)
{
-proxy_worker *workers;
+proxy_worker *worker;
char *c, *uri = apr_pstrdup(p, url);
int i;
@@ -1066,10 +1067,11 @@
/* remove path from uri */
if ((c = strchr(c + 3, '/')))
*c = '\0';
-workers = (proxy_worker *)conf->workers;
+worker = (proxy_worker *)conf->workers->elts;
for (i = 0; i < conf->workers->nelts; i++) {
-if (strcasecmp(workers[i].name, uri) == 0)
-return &workers[i];
+if (strcasecmp(worker->name, uri) == 0)
+return worker;
+worker++;
}
return NULL;
}
@@ -1115,7 +1117,7 @@
char *c, *q, *uri = apr_pstrdup(p, url);
int port;
-c = strchr(url, ':');
+c = strchr(uri, ':');
if (c == NULL || c[1] != '/' || c[2] != '/' || c[3] == '\0')
return "Bad syntax for a remote proxy server";
/* remove path from uri */
@@ -1133,7 +1135,7 @@
port = -1;
ap_str_tolower(uri);
*worker = apr_array_push(conf->workers);
-(*worker)->name = apr_pstrdup(p, uri);
+(*worker)->name = apr_pstrdup(p, url);
*c = '\0';
(*worker)->scheme = uri;
if (port == -1)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/proxy mod_proxy.c
jfclere 2004/08/04 07:48:13
Modified:ajp/proxy mod_proxy.c
Log:
Add a trace.
Revision ChangesPath
1.20 +4 -1 jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c
Index: mod_proxy.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_proxy.c 4 Aug 2004 14:37:48 - 1.19
+++ mod_proxy.c 4 Aug 2004 14:48:13 - 1.20
@@ -521,8 +521,11 @@
url = r->filename + 6;
p = strchr(url, ':');
-if (p == NULL)
+if (p == NULL) {
+ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ "proxy_handler no URL in %s", r->filename);
return HTTP_BAD_REQUEST;
+}
/* If the host doesn't have a domain name, add one and redirect. */
if (conf->domain != NULL) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs proxy.xml
jfclere 2004/08/04 06:57:19 Added: jk/xdocs proxy.xml Log: Start to document the new proxy code. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/xdocs/proxy.xml Index: proxy.xml === Copyright 1999-2004 The Apache Software Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. Using proxies with Tomcat $Date: 2004/08/04 13:57:19 $ It easy to use the standard Http proxy of Apache when single Tomcat is connected to Apache. <Location /examples/> ProxyPass http://localhost:8080/examples/ ProxyPassReverse http://localhost:8080/examples/ </Location> The Ajp proxy is a new module based on the standard Http proxy it uses AJP instead of HTTP. <Location /examples/> ProxyPass ajp://localhost:8009/examples/ </Location> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/proxy mod_proxy.c
jfclere 2004/08/04 03:43:15 Modified:ajp/proxy mod_proxy.c Log: dup real and fake. Revision ChangesPath 1.17 +2 -2 jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c Index: mod_proxy.c === RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mod_proxy.c 4 Aug 2004 08:56:54 - 1.16 +++ mod_proxy.c 4 Aug 2004 10:43:15 - 1.17 @@ -819,8 +819,8 @@ return "ProxyPass needs a path when not defined in a location"; new = apr_array_push(conf->aliases); -new->fake = f; -new->real = r; +new->fake = apr_pstrdup(cmd->pool, f); +new->real = apr_pstrdup(cmd->pool, r); arr = apr_table_elts(params); elts = (const apr_table_entry_t *)arr->elts; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
