tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_workerEnv.h
Date Thu, 25 Apr 2002 18:44:41 GMT
costin      02/04/25 11:44:41

  Modified:    jk/native2/include jk_workerEnv.h
  Log:
  Simplified the registration of ajp handlers.
  
  Moved the hadnler definition to workerEnv. We'll eventually move to
  a dynamic mechanism ( instead of hardcoded values ), but later.
  
  Revision  Changes    Path
  1.16      +40 -3     jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h
  
  Index: jk_workerEnv.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- jk_workerEnv.h	11 Apr 2002 19:28:01 -0000	1.15
  +++ jk_workerEnv.h	25 Apr 2002 18:44:37 -0000	1.16
  @@ -58,7 +58,7 @@
   /***************************************************************************
    * Description: Workers controller header file                             *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           * 
  - * Version:     $Revision: 1.15 $                                           *
  + * Version:     $Revision: 1.16 $                                           *
    ***************************************************************************/
   
   #ifndef JK_WORKERENV_H
  @@ -92,6 +92,39 @@
   struct jk_handler;
   struct jk_ws_service;
   
  +/* Temporary hardcoded handler IDs. Will be replaced with a name based dynamic mechanism
*/
  +
  +/* Write a body chunk from the servlet container to the web server */
  +#define JK_HANDLE_AJP13_SEND_BODY_CHUNK    3
  +
  +/* Send response headers from the servlet container to the web server. */
  +#define JK_HANDLE_AJP13_SEND_HEADERS       4
  +
  +/* Marks the end of response. */
  +#define JK_HANDLE_AJP13_GET_BODY_CHUNK     6
  +
  +/*  Marks the end of response. */
  +#define JK_HANDLE_AJP13_END_RESPONSE       5
  +
  +/* Second Login Phase (servlet engine -> web server), md5 seed is received */
  +#define JK_HANDLE_LOGON_SEED	0x11
  +
  +/* Login Accepted (servlet engine -> web server) */
  +#define JK_HANDLE_LOGON_OK	0x13
  +
  +/* Login Rejected (servlet engine -> web server) */
  +#define JK_HANDLE_LOGON_ERR	0x14
  +
  +/* Dispatcher for jni channel ( JNI -> web server ) */
  +#define JK_HANDLE_JNI_DISPATCH 0x15
  +
  +/* Dispatcher for shm ( JNI -> web server ) */
  +#define JK_HANDLE_SHM_DISPATCH 0x16
  +
  +/* Dispatcher for apr channel ( JNI -> web server ) */
  +#define JK_HANDLE_CHANNELAPR_DISPATCH 0x17
  +
  +    
   /*
    * Jk configuration and global methods. 
    * 
  @@ -215,9 +248,13 @@
       
       /* -------------------- Methods -------------------- */
   
  +    /* Register a callback handler, for methods from java to C
  +     */
       int (*registerHandler)(struct jk_env *env,
                              struct jk_workerEnv *_this,
  -                           struct jk_handler *h);
  +                           const char *type, const char *name, int id,
  +                           jk_handler_callback callback,
  +                           char *signature);
   
       
       int (*addWorker)(struct jk_env *env,
  @@ -234,7 +271,7 @@
       /** Call the handler associated with the message type.
        */
       int (*dispatch)(struct jk_env *env, struct jk_workerEnv *_this,
  -                    struct jk_endpoint *e, struct jk_ws_service *r );
  +                    void *target, struct jk_endpoint *ep, int code, struct jk_msg *msg);
   
       /** Utility method for stream-based workers. It'll read
        *  messages, dispatch, send the response if any until
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message