From tomcat-dev-return-29899-qmlist-jakarta-archive-tomcat-dev=nagoya.apache.org@jakarta.apache.org Sat May 17 03:27:45 2003 Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 25749 invoked from network); 17 May 2003 03:27:44 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 17 May 2003 03:27:44 -0000 Received: (qmail 3802 invoked by uid 97); 17 May 2003 03:30:00 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 3795 invoked from network); 17 May 2003 03:30:00 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 17 May 2003 03:30:00 -0000 Received: (qmail 24881 invoked by uid 500); 17 May 2003 03:27:37 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 24870 invoked by uid 500); 17 May 2003 03:27:37 -0000 Received: (qmail 24867 invoked from network); 17 May 2003 03:27:37 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 17 May 2003 03:27:37 -0000 Received: (qmail 65845 invoked by uid 1385); 17 May 2003 03:27:36 -0000 Date: 17 May 2003 03:27:36 -0000 Message-ID: <20030517032736.65844.qmail@icarus.apache.org> From: billbarker@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkCoyoteHandler.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N billbarker 2003/05/16 20:27:36 Modified: jk/java/org/apache/jk/common Tag: coyote_10 HandlerRequest.java jk/java/org/apache/jk/server Tag: coyote_10 JkCoyoteHandler.java Log: Port Patch. Revision Changes Path No revision No revision 1.20.2.1 +10 -3 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java Index: HandlerRequest.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -u -r1.20 -r1.20.2.1 --- HandlerRequest.java 18 Dec 2002 09:26:48 -0000 1.20 +++ HandlerRequest.java 17 May 2003 03:27:36 -0000 1.20.2.1 @@ -412,6 +412,10 @@ ep.setRequest( req ); } + MessageBytes tmpMB2 = (MessageBytes)req.getNote(WorkerEnv.SSL_CERT_NOTE); + if(tmpMB2 != null) { + tmpMB2.recycle(); + } JkInputStream jkBody=(JkInputStream)ep.getNote( bodyNote ); if( jkBody==null ) { jkBody=new JkInputStream(); @@ -532,10 +536,13 @@ case SC_A_SSL_CERT : req.scheme().setString( "https" ); // Transform the string into certificate. - MessageBytes tmpMB2 = new MessageBytes(); - msg.getBytes(tmpMB2); + MessageBytes tmpMB2 = (MessageBytes)req.getNote(WorkerEnv.SSL_CERT_NOTE); + if(tmpMB2 == null) { + tmpMB2 = new MessageBytes(); + req.setNote(WorkerEnv.SSL_CERT_NOTE, tmpMB2); + } // SSL certificate extraction is costy, moved to JkCoyoteHandler - req.setNote(WorkerEnv.SSL_CERT_NOTE, tmpMB2); + msg.getBytes(tmpMB2); break; case SC_A_SSL_CIPHER : No revision No revision 1.32.2.2 +1 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java Index: JkCoyoteHandler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v retrieving revision 1.32.2.1 retrieving revision 1.32.2.2 diff -u -r1.32.2.1 -r1.32.2.2 --- JkCoyoteHandler.java 9 Apr 2003 02:57:51 -0000 1.32.2.1 +++ JkCoyoteHandler.java 17 May 2003 03:27:36 -0000 1.32.2.2 @@ -393,7 +393,7 @@ // Extract SSL certificate information (if requested) MessageBytes certString = (MessageBytes)req.getNote(WorkerEnv.SSL_CERT_NOTE); - if( certString != null ) { + if( certString != null && !certString.isNull() ) { ByteChunk certData = certString.getByteChunk(); ByteArrayInputStream bais = new ByteArrayInputStream(certData.getBytes(), --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org