cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkCoyoteHandler.java

[costin]

costin      2003/03/13 16:00:22

  Modified:    jk/java/org/apache/jk/server JkCoyoteHandler.java
  Log:
  Send the status string
  PR: 14292
  
  Revision  Changes    Path
  1.37      +11 -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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- JkCoyoteHandler.java      17 Feb 2003 02:10:29 -0000      1.36
  +++ JkCoyoteHandler.java      14 Mar 2003 00:00:21 -0000      1.37
  @@ -97,6 +97,7 @@
   
       int headersMsgNote;
       int c2bConvertersNote;
  +    int tmpMessageBytesNote;
       int utfC2bNote;
       int obNote;
       int epNote;
  @@ -162,6 +163,7 @@
               jkMain.init();
   
               headersMsgNote=wEnv.getNoteId( WorkerEnv.ENDPOINT_NOTE, "headerMsg" );
  +            tmpMessageBytesNote=wEnv.getNoteId( WorkerEnv.ENDPOINT_NOTE, 
"tmpMessageBytes" );
               utfC2bNote=wEnv.getNoteId( WorkerEnv.ENDPOINT_NOTE, "utfC2B" );
               epNote=wEnv.getNoteId( WorkerEnv.ENDPOINT_NOTE, "ep" );
               obNote=wEnv.getNoteId( WorkerEnv.ENDPOINT_NOTE, "coyoteBuffer" );
  @@ -297,9 +299,15 @@
           msg.appendByte(HandlerRequest.JK_AJP13_SEND_HEADERS);
           msg.appendInt( res.getStatus() );
           
  -        // s->b conversion, message
  -        msg.appendBytes( null );
  -        
  +        MessageBytes mb=(MessageBytes)ep.getNote( tmpMessageBytesNote );
  +        if( mb==null ) {
  +            mb=new MessageBytes();
  +            ep.setNote( tmpMessageBytesNote, mb );
  +        }
  +        mb.setString( res.getMessage());
  +        c2b.convert( mb );
  +        msg.appendBytes(mb);
  +
           // XXX add headers
           
           MimeHeaders headers=res.getMimeHeaders();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]