You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bi...@apache.org on 2003/04/09 04:57:08 UTC
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkCoyoteHandler.java
billbarker 2003/04/08 19:57:08
Modified: jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
Small fix to the Status-Line.
Fix loading of CLIENT-CERT from Apache.
Fix for Bug #15790
Reported By: Jay Garala jgarala@conclusive.com
Revision Changes Path
1.39 +6 -3 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- JkCoyoteHandler.java 14 Mar 2003 00:03:03 -0000 1.38
+++ JkCoyoteHandler.java 9 Apr 2003 02:57:08 -0000 1.39
@@ -305,7 +305,7 @@
ep.setNote( tmpMessageBytesNote, mb );
}
String message=res.getMessage();
- if( message==null ) message="OK";
+ if( message==null ) message= HttpMessages.getMessage(res.getStatus());
mb.setString( message );
c2b.convert( mb );
msg.appendBytes(mb);
@@ -402,8 +402,11 @@
// Extract SSL certificate information (if requested)
MessageBytes certString = (MessageBytes)req.getNote(WorkerEnv.SSL_CERT_NOTE);
if( certString != null ) {
- byte[] certData = certString.getByteChunk().getBytes();
- ByteArrayInputStream bais = new ByteArrayInputStream(certData);
+ ByteChunk certData = certString.getByteChunk();
+ ByteArrayInputStream bais =
+ new ByteArrayInputStream(certData.getBytes(),
+ certData.getStart(),
+ certData.getLength());
// Fill the first element.
X509Certificate jsseCerts[] = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org