Re: Releasing JK 1.2.14
Mladen Turk wrote: jean-frederic clere wrote: Done, the branch is ready. The files are in http://people.apache.org/~jfclere/jakarta-tomcat-connectors/ Hmm, it will not do. The .zip files should have .dsp files (at least) in CR-LF format. For the next release I will arrange jkrelease.sh to the CR-LF in the needed files... Think you'll need a win platform for making those. If you don't have one, I can build a .zip files. No I don't have windoze, so please build the .zip files. Regards, Mladen - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/
Hi, Just a note: the current files are a bit old, shouldn't they point via a link to the last released version? Cheers Jean-Frederic - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/
jean-frederic clere wrote: Hi, Just a note: the current files are a bit old, shouldn't they point via a link to the last released version? No, the current should point to the latest stable version. You can add dev that will point to the latest version. Regards, Mladen - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/include ssl_private.h
mturk 2005/07/07 01:10:08 Modified:jni/native/include ssl_private.h Log: Add openssl/md5.h to the includes. This is needed with 0.9.8 and it doean't hurt previous versions. Revision ChangesPath 1.32 +2 -1 jakarta-tomcat-connectors/jni/native/include/ssl_private.h Index: ssl_private.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/include/ssl_private.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ssl_private.h 17 Jun 2005 09:41:30 - 1.31 +++ ssl_private.h 7 Jul 2005 08:10:08 - 1.32 @@ -47,6 +47,7 @@ #include openssl/evp.h #include openssl/rand.h #include openssl/x509v3.h +#include openssl/md5.h /* Avoid tripping over an engine build installed globally and detected * when the user points at an explicit non-engine flavor of OpenSSL */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src sslutils.c
mturk 2005/07/07 01:12:30 Modified:jni/native/src sslutils.c Log: Remove CA verify hack. The CA verification works, only that for CA file one needs to use the real CA or self generated one. Revision ChangesPath 1.31 +1 -5 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.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sslutils.c18 Jun 2005 08:01:54 - 1.30 +++ sslutils.c7 Jul 2005 08:12:30 - 1.31 @@ -666,10 +666,6 @@ */ ok = 0; } -#if 1 -else if (!ok) -ok = 1; -#endif return ok; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src sslnetwork.c
mturk 2005/07/07 01:35:47
Modified:jni/java/org/apache/tomcat/jni SSLSocket.java
jni/native/src sslnetwork.c
Log:
Add SSL renegotiate support to be able to attach a different context
after the header has been read and before any resonse has been send.
We'll see if Tomcat can use something like that. At least it has to
explicitly configured, like in mod_ssl by using:
SSLOptions +OptRenegotiate.
Revision ChangesPath
1.16 +17 -1
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SSLSocket.java18 Jun 2005 08:03:21 - 1.15
+++ SSLSocket.java7 Jul 2005 08:35:46 - 1.16
@@ -43,6 +43,22 @@
public static native int handshake(long thesocket);
/**
+ * Do a SSL renegotiation.
+ * SSL supports per-directory re-configuration of SSL parameters.
+ * This is implemented by performing an SSL renegotiation of the
+ * re-configured parameters after the request is read, but before the
+ * response is sent. In more detail: the renegotiation happens after the
+ * request line and MIME headers were read, but _before_ the attached
+ * request body is read. The reason simply is that in the HTTP protocol
+ * usually there is no acknowledgment step between the headers and the
+ * body (there is the 100-continue feature and the chunking facility
+ * only), so Apache has no API hook for this step.
+ *
+ * @param thesocket The socket to use
+ */
+public static native int renegotiate(long thesocket);
+
+/**
* Retrun SSL Info parameter as byte array.
*
* @param sock The socket to read the data from.
1.22 +13 -1 jakarta-tomcat-connectors/jni/native/src/sslnetwork.c
Index: sslnetwork.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslnetwork.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sslnetwork.c 2 Jul 2005 07:19:10 - 1.21
+++ sslnetwork.c 7 Jul 2005 08:35:46 - 1.22
@@ -495,6 +495,18 @@
return APR_SUCCESS;
}
+TCN_IMPLEMENT_CALL(jint, SSLSocket, renegotiate)(TCN_STDARGS,
+ jlong sock)
+{
+tcn_socket_t *s = J2P(sock, tcn_socket_t *);
+tcn_ssl_conn_t *con;
+
+UNREFERENCED_STDARGS;
+TCN_ASSERT(sock != 0);
+con = (tcn_ssl_conn_t *)s-opaque;
+return SSL_renegotiate(con-ssl);
+}
+
#else
/* OpenSSL is not supported
* If someday we make OpenSSL optional
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/
Mladen Turk wrote: jean-frederic clere wrote: Hi, Just a note: the current files are a bit old, shouldn't they point via a link to the last released version? No, the current should point to the latest stable version. You can add dev that will point to the latest version. No I have added (-current-) in README.html Regards, Mladen - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 35640] New: - Description of logging in documentation not precise
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=35640. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=35640 Summary: Description of logging in documentation not precise Product: Tomcat 5 Version: 5.5.9 Platform: Other OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: tomcat-dev@jakarta.apache.org ReportedBy: [EMAIL PROTECTED] In the documentation it is written that jar files be put in: common/lib and the log4j.properties in common/classes bin/catalina.sh does not add these directories to the initial classpath. Therefore neither jar file, nor configuration is found during start. Adding common/classes to classpath in catalina.sh and putting the jar files to the jvm lib is one way to solve the problem. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/examples mkcerts
mturk 2005/07/07 02:14:14 Modified:jni/examples mkcerts Log: Update mkcerts to create a cabundle.crt file in the form of the original ca-bundle.crt file, that will have only our ca.crt. This can be used a CAfile for our demo Root CA. Revision ChangesPath 1.2 +13 -0 jakarta-tomcat-connectors/jni/examples/mkcerts Index: mkcerts === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/examples/mkcerts,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mkcerts 5 Jul 2005 16:14:16 - 1.1 +++ mkcerts 7 Jul 2005 09:14:14 - 1.2 @@ -25,7 +25,10 @@ if [ -z $OPENSSL ]; then OPENSSL=openssl; fi PASSPHRASE=pass:secret +# Encrypt all keys GENRSA=$OPENSSL genrsa -des3 +# Uncomment for no key encryption +# GENRSA=$OPENSSL genrsa REQ=$OPENSSL req -new CA=$OPENSSL ca X509=$OPENSSL x509 @@ -112,6 +115,16 @@ $REQ -x509 -days 3650 -batch -config ca.cfg -key ca.key -out ca.crt +# Create cabundle.crt that can be used for CAfile +cat cabundle.crt EOT +Tomcat Demo Root CA += +`$X509 -noout -fingerprint -in ca.crt` +PEM Data: +`$X509 -in ca.crt` +`$X509 -noout -text -in ca.crt` +EOT + $GENRSA -passout $PASSPHRASE -out localhost.key -rand .rnd 1024 cat localhost.cfg EOT - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 35640] - Description of logging in documentation not precise
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=35640. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=35640 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2005-07-07 11:26 --- Your statements are wrong. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 35641] New: - Error decoding request in Tomcat server on submit of a jsp page
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=35641. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=35641 Summary: Error decoding request in Tomcat server on submit of a jsp page Product: Tomcat 5 Version: 5.5.4 Platform: Other OS/Version: Windows XP Status: NEW Severity: blocker Priority: P2 Component: Catalina AssignedTo: tomcat-dev@jakarta.apache.org ReportedBy: [EMAIL PROTECTED] On submit of a jsp page the following error comes on the server and message in browser saying Page cannot be displayed Jul 7, 2005 5:29:04 PM org.apache.jk.common.HandlerRequest invoke SEVERE: Error decoding request java.io.IOException at org.apache.jk.common.JkInputStream.receive(JkInputStream.java:252) at org.apache.jk.common.HandlerRequest.decodeRequest (HandlerRequest.java :519) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:361) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:743) at org.apache.jk.common.ChannelSocket.processConnection (ChannelSocket.ja va:675) at org.apache.jk.common.SocketConnection.runIt(ChannelSocket.java:866) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run (ThreadP ool.java:684) at java.lang.Thread.run(Thread.java:595) Jul 7, 2005 5:29:04 PM org.apache.jk.common.ChannelSocket processConnection WARNING: processCallbacks status 2 Tomcat default port is commented and call to tomcat is redirected through IIS on port 8009. the first jsp page is successfully returned but the submit of this page shows the address of the next page but does not finds it. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni Socket.java
mturk 2005/07/07 05:45:09 Modified:jni/java/org/apache/tomcat/jni Socket.java Log: optGet throws exception if APR call returns != APR_SUCCESS Revision ChangesPath 1.19 +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.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Socket.java 18 Jun 2005 16:36:15 - 1.18 +++ Socket.java 7 Jul 2005 12:45:08 - 1.19 @@ -418,7 +418,8 @@ * /PRE * @return Socket option returned on the call. */ -public static native int optGet(long sock, int opt); +public static native int optGet(long sock, int opt) +throws Exception; /** * Setup socket timeout for the specified socket - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11AprProtocol.java
remm2005/07/07 06:38:38
Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
http11/src/java/org/apache/coyote/http11
Http11AprProtocol.java
Log:
- Add basic SSL support (no cert extraction yet).
- Untested.
Revision ChangesPath
1.58 +160 -37
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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- AprEndpoint.java 3 Jul 2005 10:12:51 - 1.57
+++ AprEndpoint.java 7 Jul 2005 13:38:38 - 1.58
@@ -31,10 +31,12 @@
import org.apache.tomcat.jni.Pool;
import org.apache.tomcat.jni.Socket;
import org.apache.tomcat.jni.Status;
+import org.apache.tomcat.jni.SSL;
+import org.apache.tomcat.jni.SSLContext;
+import org.apache.tomcat.jni.SSLSocket;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.threads.ThreadWithAttributes;
-
/**
* APR tailored thread pool, providing the following services:
* ul
@@ -149,6 +151,12 @@
*/
protected long serverSockPool = 0;
+
+/**
+ * SSL context.
+ */
+protected long sslContext = 0;
+
// -
Properties
@@ -205,7 +213,7 @@
* Handling of accepted sockets.
*/
protected Handler handler = null;
-public void setHandler(Handler handler ) { this.handler=handler; }
+public void setHandler(Handler handler ) { this.handler = handler; }
public Handler getHandler() { return handler; }
@@ -325,7 +333,104 @@
*/
public int getMinSpareThreads() { return 0; }
+
+/**
+ * SSL engine.
+ */
+protected String SSLEngine = off;
+public String getSSLEngine() { return SSLEngine; }
+public void setSSLEngine(String SSLEngine) { this.SSLEngine = SSLEngine;
}
+
+
+/**
+ * SSL password (if a cert is encrypted, and no password has been
provided, a callback
+ * will ask for a password).
+ */
+protected String SSLPassword = null;
+public String getSSLPassword() { return SSLPassword; }
+public void setSSLPassword(String SSLPassword) { this.SSLPassword =
SSLPassword; }
+
+/**
+ * SSL cipher suite.
+ */
+protected String SSLCipherSuite = ALL;
+public String getSSLCipherSuite() { return SSLCipherSuite; }
+public void setSSLCipherSuite(String SSLCipherSuite) {
this.SSLCipherSuite = SSLCipherSuite; }
+
+
+/**
+ * SSL certificate file.
+ */
+protected String SSLCertificateFile = null;
+public String getSSLCertificateFile() { return SSLCertificateFile; }
+public void setSSLCertificateFile(String SSLCertificateFile) {
this.SSLCertificateFile = SSLCertificateFile; }
+
+
+/**
+ * SSL certificate key file.
+ */
+protected String SSLCertificateKeyFile = null;
+public String getSSLCertificateKeyFile() { return SSLCertificateKeyFile;
}
+public void setSSLCertificateKeyFile(String SSLCertificateKeyFile) {
this.SSLCertificateKeyFile = SSLCertificateKeyFile; }
+
+
+/**
+ * SSL certificate chain file.
+ */
+protected String SSLCertificateChainFile = null;
+public String getSSLCertificateChainFile() { return
SSLCertificateChainFile; }
+public void setSSLCertificateChainFile(String SSLCertificateChainFile) {
this.SSLCertificateChainFile = SSLCertificateChainFile; }
+
+
+/**
+ * SSL CA certificate path.
+ */
+protected String SSLCACertificatePath = null;
+public String getSSLCACertificatePath() { return SSLCACertificatePath; }
+public void setSSLCACertificatePath(String SSLCACertificatePath) {
this.SSLCACertificatePath = SSLCACertificatePath; }
+
+
+/**
+ * SSL CA certificate file.
+ */
+protected String SSLCACertificateFile = null;
+public String getSSLCACertificateFile() { return SSLCACertificateFile; }
+public void setSSLCACertificateFile(String SSLCACertificateFile) {
this.SSLCACertificateFile = SSLCACertificateFile; }
+
+
+/**
+ * SSL CA revocation path.
+ */
+protected String SSLCARevocationPath = null;
+public String getSSLCARevocationPath() { return SSLCARevocationPath; }
+public void setSSLCARevocationPath(String SSLCARevocationPath) {
this.SSLCARevocationPath = SSLCARevocationPath; }
+
+
+/**
+ * SSL CA revocation file.
+ */
+protected String SSLCARevocationFile = null;
+public String
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11AprProtocol.java
remm2005/07/07 07:08:40
Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
http11/src/java/org/apache/coyote/http11
Http11AprProtocol.java
Log:
- Client cert config should be an int.
Revision ChangesPath
1.59 +4 -4
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.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- AprEndpoint.java 7 Jul 2005 13:38:38 - 1.58
+++ AprEndpoint.java 7 Jul 2005 14:08:40 - 1.59
@@ -418,9 +418,9 @@
/**
* SSL verify client.
*/
-protected boolean SSLVerifyClient = false;
-public boolean getSSLVerifyClient() { return SSLVerifyClient; }
-public void setSSLVerifyClient(boolean SSLVerifyClient) {
this.SSLVerifyClient = SSLVerifyClient; }
+protected int SSLVerifyClient = 0;
+public int getSSLVerifyClient() { return SSLVerifyClient; }
+public void setSSLVerifyClient(int SSLVerifyClient) {
this.SSLVerifyClient = SSLVerifyClient; }
/**
@@ -534,7 +534,7 @@
// Load Server key and certificate
SSLContext.setCertificate(sslContext, SSLCertificateFile,
SSLCertificateKeyFile, SSLPassword, SSL.SSL_AIDX_RSA);
// Support Client Certificates
-SSLContext.setVerify(sslContext, SSLVerifyClient ? 1 : 0,
SSLVerifyDepth);
+SSLContext.setVerify(sslContext, SSLVerifyClient,
SSLVerifyDepth);
if (SSLCACertificateFile != null) {
SSLContext.setCACertificate(sslContext,
SSLCACertificateFile, null);
}
1.13 +2 -2
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
Index: Http11AprProtocol.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Http11AprProtocol.java7 Jul 2005 13:38:38 - 1.12
+++ Http11AprProtocol.java7 Jul 2005 14:08:40 - 1.13
@@ -568,8 +568,8 @@
/**
* SSL verify client.
*/
-public boolean getSSLVerifyClient() { return ep.getSSLVerifyClient(); }
-public void setSSLVerifyClient(boolean SSLVerifyClient) {
ep.setSSLVerifyClient(SSLVerifyClient); }
+public int getSSLVerifyClient() { return ep.getSSLVerifyClient(); }
+public void setSSLVerifyClient(int SSLVerifyClient) {
ep.setSSLVerifyClient(SSLVerifyClient); }
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 35648] New: - Using Anonymous Loggers with JULI causes NPE
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=35648.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=35648
Summary: Using Anonymous Loggers with JULI causes NPE
Product: Tomcat 5
Version: 5.5.9
Platform: Other
OS/Version: Linux
Status: NEW
Severity: normal
Priority: P4
Component: Unknown
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]
This issue is not related with Tomcat 5, but with the JULI ClassLoaderLogManager
implementation in Tomcat.
Using an Anonymous Logger, we get NPE:
Exception in thread main java.lang.NullPointerException
at java.util.logging.Logger.doSetParent(Logger.java:1360)
at java.util.logging.Logger.getAnonymousLogger(Logger.java:314)
at com.pararede.test.juli.Main.main(Main.java:11)
Sample Code:
=== START HERE ===
package com.pararede.test.juli;
import java.util.logging.*;
public class Main {
public Main() {
}
public static void main(String[] args) {
Logger.getAnonymousLogger().log(Level.INFO , some log);
}
}
=== END HERE ===
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
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
remm2005/07/07 07:26:25
Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
Log:
- Fix init a little.
Revision ChangesPath
1.60 +1 -1
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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- AprEndpoint.java 7 Jul 2005 14:08:40 - 1.59
+++ AprEndpoint.java 7 Jul 2005 14:26:25 - 1.60
@@ -534,10 +534,10 @@
// Load Server key and certificate
SSLContext.setCertificate(sslContext, SSLCertificateFile,
SSLCertificateKeyFile, SSLPassword, SSL.SSL_AIDX_RSA);
// Support Client Certificates
-SSLContext.setVerify(sslContext, SSLVerifyClient,
SSLVerifyDepth);
if (SSLCACertificateFile != null) {
SSLContext.setCACertificate(sslContext,
SSLCACertificateFile, null);
}
+SSLContext.setVerify(sslContext, SSLVerifyClient,
SSLVerifyDepth);
// For now, sendfile is not supported with SSL
useSendfile = false;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src sslnetwork.c
mturk 2005/07/07 08:20:54
Modified:jni/native/src sslnetwork.c
Log:
SSL clears the errno, so make sure the errno is remembered before
the SSL_get_error call.
Revision ChangesPath
1.23 +8 -8 jakarta-tomcat-connectors/jni/native/src/sslnetwork.c
Index: sslnetwork.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslnetwork.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sslnetwork.c 7 Jul 2005 08:35:46 - 1.22
+++ sslnetwork.c 7 Jul 2005 15:20:54 - 1.23
@@ -345,6 +345,7 @@
for (;;) {
if ((s = SSL_read(con-ssl, buf, rd)) = 0) {
+apr_status_t os = apr_get_netos_error();
int i = SSL_get_error(con-ssl, s);
/* Special case if the close notify alert send by peer */
if (s == 0 (con-ssl-shutdown SSL_RECEIVED_SHUTDOWN)) {
@@ -363,11 +364,10 @@
}
break;
case SSL_ERROR_SYSCALL:
-s = apr_get_netos_error();
-if (!APR_STATUS_IS_EAGAIN(s)
-!APR_STATUS_IS_EINTR(s)) {
+if (!APR_STATUS_IS_EAGAIN(os)
+!APR_STATUS_IS_EINTR(os)) {
con-shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
-return s;
+return os;
}
break;
default:
@@ -393,6 +393,7 @@
for (;;) {
if ((s = SSL_write(con-ssl, buf, rd)) = 0) {
+apr_status_t os = apr_get_netos_error();
int i = SSL_get_error(con-ssl, s);
switch (i) {
case SSL_ERROR_ZERO_RETURN:
@@ -406,9 +407,8 @@
}
break;
case SSL_ERROR_SYSCALL:
-s = apr_get_netos_error();
-if (!APR_STATUS_IS_EAGAIN(s)
-!APR_STATUS_IS_EINTR(s)) {
+if (!APR_STATUS_IS_EAGAIN(os)
+!APR_STATUS_IS_EINTR(os)) {
con-shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
return s;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src sslnetwork.c
mturk 2005/07/07 08:28:58
Modified:jni/native/src sslnetwork.c
Log:
Return the original errno on send too.
Revision ChangesPath
1.24 +4 -4 jakarta-tomcat-connectors/jni/native/src/sslnetwork.c
Index: sslnetwork.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslnetwork.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sslnetwork.c 7 Jul 2005 15:20:54 - 1.23
+++ sslnetwork.c 7 Jul 2005 15:28:58 - 1.24
@@ -340,11 +340,11 @@
ssl_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
{
tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
-int s, rd = (int)(*len);
+int s, wr = (int)(*len);
apr_status_t rv = APR_SUCCESS;
for (;;) {
-if ((s = SSL_read(con-ssl, buf, rd)) = 0) {
+if ((s = SSL_read(con-ssl, buf, wr)) = 0) {
apr_status_t os = apr_get_netos_error();
int i = SSL_get_error(con-ssl, s);
/* Special case if the close notify alert send by peer */
@@ -410,7 +410,7 @@
if (!APR_STATUS_IS_EAGAIN(os)
!APR_STATUS_IS_EINTR(os)) {
con-shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
-return s;
+return os;
}
break;
default:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 35650] New: - ApplicationDispatcher[] Servlet.service() jasper exception and 404 error
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=35650. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=35650 Summary: ApplicationDispatcher[] Servlet.service() jasper exception and 404 error Product: Tomcat 4 Version: 4.1.30 Platform: Sun OS/Version: Solaris Status: NEW Severity: major Priority: P1 Component: Jasper AssignedTo: tomcat-dev@jakarta.apache.org ReportedBy: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] I am getting 404 error when I access the jsp page. When I look in to the logs I see the following exception. This is only happening sometimes and when we restart the server we are able to access the jsp page.We are using tomcat 4.1.30 version runing JAVA 1.4.1. 2005-07-07 10:02:26 ApplicationDispatcher[] Servlet.service() for servlet jsp th rew exception javax.servlet.ServletException: /ehs/environmental/kalamazoo.jsp at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper .java:239) at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:2 95) at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:241) at javax.servlet.http.HttpServlet.service(HttpServlet.java:853) at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDisp atcher.java:684) at org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationD ispatcher.java:575) at org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDis patcher.java:498) at org.apache.jasper.runtime.JspRuntimeLibrary.include(JspRuntimeLibrary .java:822) at org.apache.jsp.framework_jsp._jspService(framework_jsp.java:206) at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:137) at javax.servlet.http.HttpServlet.service(HttpServlet.java:853) at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper .java:210) at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:2 95) at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:241) at javax.servlet.http.HttpServlet.service(HttpServlet.java:853) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Appl icationFilterChain.java:247) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationF ilterChain.java:193) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperV alve.java:256) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContex t.invokeNext(StandardPipeline.java:643) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.jav a:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextV alve.java:191) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContex t.invokeNext(StandardPipeline.java:643) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.jav a:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.core.StandardContext.invoke(StandardContext.java: 2422) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.j ava:180) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContex t.invokeNext(StandardPipeline.java:643) at org.apache.catalina.valves.ErrorDispatcherValve.invoke(ErrorDispatche rValve.java:171) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContex t.invokeNext(StandardPipeline.java:641) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.j ava:163) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContex t.invokeNext(StandardPipeline.java:641) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.jav a:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineVal ve.java:174) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContex t.invokeNext(StandardPipeline.java:643) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.jav a:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.coyote.tomcat4.CoyoteAdapter.service(CoyoteAdapter.java:19 9) at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java :828) at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.proce
cvs commit: jakarta-tomcat-connectors/jni/native/src sslnetwork.c
mturk 2005/07/07 09:02:02 Modified:jni/native/src sslnetwork.c Log: Use alread provided os error for unknown errors. Revision ChangesPath 1.25 +3 -3 jakarta-tomcat-connectors/jni/native/src/sslnetwork.c Index: sslnetwork.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslnetwork.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sslnetwork.c 7 Jul 2005 15:28:58 - 1.24 +++ sslnetwork.c 7 Jul 2005 16:02:01 - 1.25 @@ -371,7 +371,7 @@ } break; default: -return apr_get_netos_error(); +return os; break; } } @@ -414,7 +414,7 @@ } break; default: -return apr_get_netos_error(); +return os; break; } } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Tomcat Session Replication Portlets
I have been working on getting session replication working with some web applications that use cross context dispatching. In this case it is uPortal and JSR-168 portlets running via the Jakarta Pluto portlet container. Session replication is working as expected with uPortal. Portlets on the other hand are not having their sessions replicated. In this application configuration the follow calls are happening. The browser makes a request to tomcat for the uPortal web application. While uPortal is rendering it makes cross context dispatch calls to servlets in the portlet web applications to render the results in the portal's response. After some digging and stack traces to figure out how session replication in tomcat is implemented I've determined why the portlet applications are not having their sessions replicated. It appears that there is a ReplicationValve which is enabled by the presence of the Cluster tag in Tomcat's server.xml. This valve is only present in the stack for a direct call to the container and is not present in a cross context dispatched call. I would like to work with the Tomcat developers to implement the ability for cross context calls to also notify the session manager that replication should be considered for the context. I am prepared to do the work for this task but would like to get some feed back from the tomcat developer community on recommendations and in what way the work could be done to ensure its eventual inclusion in the tomcat codebase. Thank you, Eric Dalquist Below are the stack traces I captures when looking into the issue. The following is a stack trace of a request being made to uPortal. You can see the ReplicationValve class which the request is passing through 7 items down. Thread [TP-Processor3] (Suspended) PortalSessionManager(HttpServlet).service(ServletRequest, ServletResponse) line: 802 ApplicationFilterChain.internalDoFilter(ServletRequest, ServletResponse) line: 252 ApplicationFilterChain.doFilter(ServletRequest, ServletResponse) line: 173 StandardWrapperValve.invoke(Request, Response) line: 213 StandardContextValve.invoke(Request, Response) line: 178 StandardHostValve.invoke(Request, Response) line: 126 ReplicationValve.invoke(Request, Response) line: 145 ErrorReportValve.invoke(Request, Response) line: 105 StandardEngineValve.invoke(Request, Response) line: 107 CoyoteAdapter.service(Request, Response) line: 148 JkCoyoteHandler.invoke(Msg, MsgContext) line: 307 HandlerRequest.invoke(Msg, MsgContext) line: 385 ChannelSocket.invoke(Msg, MsgContext) line: 748 ChannelSocket.processConnection(MsgContext) line: 678 SocketConnection.runIt(Object[]) line: 871 After the portal completes servicing of the request the ReplicationValve performs the replication call (SimpleTcpReplicationManager.requestCompleted(String)) for the context. Thread [TP-Processor3] (Suspended (breakpoint at line 242 in SimpleTcpReplicationManager)) SimpleTcpReplicationManager.requestCompleted(String) line: 242 ReplicationValve.invoke(Request, Response) line: 206 ErrorReportValve.invoke(Request, Response) line: 105 StandardEngineValve.invoke(Request, Response) line: 107 CoyoteAdapter.service(Request, Response) line: 148 JkCoyoteHandler.invoke(Msg, MsgContext) line: 307 HandlerRequest.invoke(Msg, MsgContext) line: 385 ChannelSocket.invoke(Msg, MsgContext) line: 748 ChannelSocket.processConnection(MsgContext) line: 678 SocketConnection.runIt(Object[]) line: 871 The following is a request to uPortal that also interacts with a portlet. Looking far enough down the stack you see the base is the same as the first example stack. The 9th item down in the stack is the last uPortal class (CPortletAdapter) that gets used to call the portlet. The next 3 items are pluto classes that get the cross context request dispatcher and call it (ApplicationDispatcher.include(ServletRequest, ServletResponse) line: 499). The top of the stack is the last tomcat class that gets called before Pluto's PortletServlet gets executed. Thread [TP-Processor3] (Suspended) ApplicationFilterChain.internalDoFilter(ServletRequest, ServletResponse) line: 234 ApplicationFilterChain.doFilter(ServletRequest, ServletResponse) line: 173 ApplicationDispatcher.invoke(ServletRequest, ServletResponse) line: 672 ApplicationDispatcher.doInclude(ServletRequest, ServletResponse) line: 574 ApplicationDispatcher.include(ServletRequest, ServletResponse) line: 499 PortletInvokerImpl.invoke(PortletRequest, PortletResponse, Integer) line: 120 PortletInvokerImpl.action(ActionRequest, ActionResponse) line: 68 PortletContainerImpl.processPortletAction(PortletWindow, HttpServletRequest, HttpServletResponse) line: 150 CPortletAdapter.setRuntimeData(ChannelRuntimeData, String) line: 578 MultithreadedPrivilegedCacheableDirectResponseCharacterChannelAdapter(MultithreadedCharacterChannelAdapter).setRuntimeData(ChannelRuntimeData) line: 29
Good day
The message cannot be represented in 7-bit ASCII encoding and has been sent as a binary attachment. Norton AntiVirus Deleted1.txt Description: plain/text - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Good day
The message cannot be represented in 7-bit ASCII encoding and has been sent as a binary attachment. Norton AntiVirus Deleted1.txt Description: plain/text - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 35650] - ApplicationDispatcher[] Servlet.service() jasper exception and 404 error
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=35650. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=35650 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2005-07-08 00:07 --- An upgrade to 4.1.31+ should fix this. *** This bug has been marked as a duplicate of 16113 *** -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 16113] - removing then replacing a jsp page continues to give a 404
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=16113. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=16113 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2005-07-08 00:07 --- *** Bug 35650 has been marked as a duplicate of this bug. *** -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm JAASMemoryLoginModule.java JAASRealm.java LocalStrings.properties MemoryRealm.java
markt 2005/07/07 15:42:03
Modified:catalina/src/share/org/apache/catalina/realm
JAASMemoryLoginModule.java JAASRealm.java
LocalStrings.properties MemoryRealm.java
Log:
Fix bug 16274. Essentially a port from TC%, mainly of Costin's work.
The JAAS realm is still experimental but it can now be used to authenticate
against
tomcat-users.xml.
Revision ChangesPath
1.3 +12 -194
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java
Index: JAASMemoryLoginModule.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JAASMemoryLoginModule.java26 Aug 2004 21:37:21 - 1.2
+++ JAASMemoryLoginModule.java7 Jul 2005 22:42:03 - 1.3
@@ -18,14 +18,11 @@
package org.apache.catalina.realm;
-import java.beans.PropertyChangeListener;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.security.Principal;
-import java.security.cert.X509Certificate;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -35,8 +32,6 @@
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import org.apache.catalina.Container;
-import org.apache.catalina.Realm;
import org.apache.commons.digester.Digester;
@@ -69,7 +64,13 @@
* @version $Revision$ $Date$
*/
-public class JAASMemoryLoginModule implements LoginModule, Realm {
+public class JAASMemoryLoginModule extends MemoryRealm implements
LoginModule {
+
+/**
+ * Descriptive information about this Realm implementation.
+ */
+protected final String info =
+org.apache.catalina.realm.JAASMemoryLoginModule/1.0;
// - Instance
Variables
@@ -135,35 +136,6 @@
/**
- * Add a new user to the in-memory database.
- *
- * @param username User's username
- * @param password User's password (clear text)
- * @param roles Comma-delimited set of roles associated with this user
- */
-void addUser(String username, String password, String roles) {
-
-// Accumulate the list of roles for this user
-ArrayList list = new ArrayList();
-roles += ,;
-while (true) {
-int comma = roles.indexOf(',');
-if (comma 0)
-break;
-String role = roles.substring(0, comma).trim();
-list.add(role);
-roles = roles.substring(comma + 1);
-}
-
-// Construct and cache the Principal for this user
-GenericPrincipal principal =
-new GenericPrincipal(this, username, password, list);
-principals.put(username, principal);
-
-}
-
-
-/**
* Phase 2 of authenticating a codeSubject/code when Phase 1
* fails. This method is called if the codeLoginContext/code
* failed somewhere in the overall authentication chain.
@@ -283,7 +255,7 @@
}
// Validate the username and password we have received
-principal = null; // FIXME - look up and check password
+principal = super.authenticate(username, password);
// Report results based on success or failure
if (principal != null) {
@@ -316,29 +288,6 @@
// -- Realm
Methods
-
-/**
- * Return the Container with which this Realm has been associated.
- */
-public Container getContainer() {
-
-return (null);
-
-}
-
-
-/**
- * Set the Container with which this Realm has been associated.
- *
- * @param container The associated Container
- */
-public void setContainer(Container container) {
-
-;
-
-}
-
-
/**
* Return descriptive information about this Realm implementation and
* the corresponding version number, in the format
@@ -346,113 +295,7 @@
*/
public String getInfo() {
-return (null);
-
-}
-
-
-/**
- * Add a property change listener to this component.
- *
- * @param listener The listener to add
- */
-public void addPropertyChangeListener(PropertyChangeListener listener) {
-
-;
-
-}
-
-
-/**
- * Return the Principal associated with
DO NOT REPLY [Bug 16274] - JAASRealm breaks catalina classloader under JDK 1.4
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=16274. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=16274 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2005-07-08 00:43 --- This has been fixed in CVS and will be included in 4.1.32+ The JAAS realm remains experimental and there is still work to be done (there are some fixes that should be ported from TC5) but it is now possible to use the JAAS realm to authentication against tomcat-users.xml on a 1.4 JDK. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11AprProtocol.java Http11AprProcessor.java
remm2005/07/07 15:54:14
Modified:http11/src/java/org/apache/coyote/http11
Http11AprProtocol.java Http11AprProcessor.java
Log:
- Fix if block for replay data.
- The SSL code there is still a placeholder.
Revision ChangesPath
1.14 +0 -1
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
Index: Http11AprProtocol.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Http11AprProtocol.java7 Jul 2005 14:08:40 - 1.13
+++ Http11AprProtocol.java7 Jul 2005 22:54:13 - 1.14
@@ -187,7 +187,6 @@
protected AprEndpoint ep=new AprEndpoint();
protected boolean secure;
-// socket factory attriubtes ( XXX replace with normal setters )
protected Hashtable attributes = new Hashtable();
private int maxKeepAliveRequests=100; // as in Apache HTTPD server
1.22 +36 -34
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Index: Http11AprProcessor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Http11AprProcessor.java 3 Jul 2005 10:12:51 - 1.21
+++ Http11AprProcessor.java 7 Jul 2005 22:54:13 - 1.22
@@ -993,31 +993,6 @@
started = false;
-} else if (actionCode == ActionCode.ACTION_REQ_SSL_ATTRIBUTE ) {
-
-try {
-if (sslSupport != null) {
-Object sslO = sslSupport.getCipherSuite();
-if (sslO != null)
-request.setAttribute
-(SSLSupport.CIPHER_SUITE_KEY, sslO);
-sslO = sslSupport.getPeerCertificateChain(false);
-if (sslO != null)
-request.setAttribute
-(SSLSupport.CERTIFICATE_KEY, sslO);
-sslO = sslSupport.getKeySize();
-if (sslO != null)
-request.setAttribute
-(SSLSupport.KEY_SIZE_KEY, sslO);
-sslO = sslSupport.getSessionId();
-if (sslO != null)
-request.setAttribute
-(SSLSupport.SESSION_ID_KEY, sslO);
-}
-} catch (Exception e) {
-log.warn(Exception getting SSL attributes ,e);
-}
-
} else if (actionCode == ActionCode.ACTION_REQ_HOST_ADDR_ATTRIBUTE) {
// Get remote host address
@@ -1106,7 +1081,33 @@
}
request.setLocalPort(localPort);
+} else if (actionCode == ActionCode.ACTION_REQ_SSL_ATTRIBUTE ) {
+
+try {
+if (sslSupport != null) {
+Object sslO = sslSupport.getCipherSuite();
+if (sslO != null)
+request.setAttribute
+(SSLSupport.CIPHER_SUITE_KEY, sslO);
+sslO = sslSupport.getPeerCertificateChain(false);
+if (sslO != null)
+request.setAttribute
+(SSLSupport.CERTIFICATE_KEY, sslO);
+sslO = sslSupport.getKeySize();
+if (sslO != null)
+request.setAttribute
+(SSLSupport.KEY_SIZE_KEY, sslO);
+sslO = sslSupport.getSessionId();
+if (sslO != null)
+request.setAttribute
+(SSLSupport.SESSION_ID_KEY, sslO);
+}
+} catch (Exception e) {
+log.warn(Exception getting SSL attributes ,e);
+}
+
} else if (actionCode == ActionCode.ACTION_REQ_SSL_CERTIFICATE) {
+
if( sslSupport != null) {
/*
* Consume and buffer the request body, so that it does not
@@ -1126,16 +1127,17 @@
} catch (Exception e) {
log.warn(Exception getting SSL Cert, e);
}
-} else if (actionCode == ActionCode.ACTION_REQ_SET_BODY_REPLAY) {
-ByteChunk body = (ByteChunk) param;
-
-InputFilter savedBody = new SavedRequestInputFilter(body);
-savedBody.setRequest(request);
-
-
Bernhard Kluschat/EZW/EN01 ist außer Haus.
Ich werde ab 08.07.2005 nicht im Büro sein. Ich kehre zurück am 01.08.2005. Ich werde Ihre Nachricht nach meiner Rückkehr beantworten. In dringenden Fällen wenden Sie sich bitte an meinen Kollegen Rolf-Dieter Gross, Tel.: 02056/ 259-5440 e-mail:[EMAIL PROTECTED] oder erreichen mich unter Mobil: 0172 745 81 45 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
