tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hgo...@apache.org
Subject cvs commit: jakarta-tomcat/proposals/web-connector/native/apache2.0 Makefile.linux build-unix.sh install-unix.sh mod_jk.c mod_jk.dsp
Date Thu, 03 May 2001 13:56:20 GMT
hgomez      01/05/03 06:56:20

  Added:       proposals/web-connector/native/apache2.0 Makefile.linux
                        build-unix.sh install-unix.sh mod_jk.c mod_jk.dsp
  Log:
  Latest mod_jk stuff for Apache 2.0
  
  Revision  Changes    Path
  1.1                  jakarta-tomcat/proposals/web-connector/native/apache2.0/Makefile.linux
  
  Index: Makefile.linux
  ===================================================================
  ## You need to edit this file - configure later :-)
  
  ## I assume this one is set up already
  # JAVA_HOME=
  OS=linux
  
  JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
  JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
  
  #
  # I've built a RPM, named apache2 (ftp://ftp.falsehope.com/home/gomez/apache2/),
  # which postfix all apache2 stuff with 2, ie apxs = apxs2. 
  # It will allow to have both apache 1.3 and 2.0 the same time on the system
  #
  #ifndef APXS
  APXS=/usr/sbin/apxs2
  #endif
  
  JK=../common
  SRCS=${JK}/jk_ajp12_worker.c ${JK}/jk_connect.c ${JK}/jk_msg_buff.c ${JK}/jk_util.c ${JK}/jk_ajp13.c
\
       ${JK}/jk_jni_worker.c ${JK}/jk_pool.c ${JK}/jk_worker.c ${JK}/jk_ajp13_worker.c ${JK}/jk_lb_worker.c
\
       ${JK}/jk_sockbuf.c  ${JK}/jk_map.c ${JK}/jk_uri_worker_map.c          
  
  LSRCS=jk_ajp12_worker.c jk_connect.c jk_msg_buff.c jk_util.c jk_ajp13.c \
        jk_jni_worker.c jk_pool.c jk_worker.c jk_ajp13_worker.c jk_lb_worker.c \
        jk_sockbuf.c  jk_map.c jk_uri_worker_map.c          
  
  
  all: mod_jk.so
  
  mod_jk.so: 
  	$(APXS) -I ${JK} ${JAVA_INCL} -c -o mod_jk.la mod_jk.c $(SRCS) 
  	mv .libs/mod_jk.so .
  
  clean:
  	rm -f *.o *.so *.lo *.la *.slo ${JK}/*.o ${JK}/*.so ${JK}/*.lo ${JK}/*.la ${JK}/*.slo
  	rm -rf .libs
  
  
  
  1.1                  jakarta-tomcat/proposals/web-connector/native/apache2.0/build-unix.sh
  
  Index: build-unix.sh
  ===================================================================
  #!/bin/sh
  
  # $Id: build-unix.sh,v 1.1 2001/05/03 13:56:16 hgomez Exp $
  
  # build.sh for mod_jk.so
  # Usage: build-unix.sh 
  
  # Sets a bunch of variables and calls APXS to build mod_jk
  # on Unix.  An alternative to the makefiles, hopefully more portable.
  
  # Configure by changing the following variables:
  
  # JAVA_HOME is required, but it should be set in the environment, not here
  #JAVA_HOME=/usr/local/jdk1.2
  
  # Where your apache lives
  if [ -z "$APACHE_HOME" ]
  then
  echo APACHE_HOME=/usr/local/apache
  APACHE_HOME=/usr/local/apache
  fi
  
  # name of subdir under JAVA_HOME/jre/lib
  ARCH=i386
  
  CFLAGS="-DHAVE_CONFIG_H -g -fpic  -DSHARED_MODULE -O2 -D_REENTRANT -pthread -DLINUX -Wall"
  
  APXS=$APACHE_HOME/bin/apxs
  
  # Find JAVA_HOME
  if [ -z "$JAVA_HOME" ]
  then
  echo "Please set JAVA_HOME"
  exit 1
  fi
  
  # Figure out INCLUDE directories
  
  # use "find" to pick the right include directories for current machine
  JAVA_INCLUDE="`find ${JAVA_HOME}/include -type d -printf \"-I %p \"`" ||  echo "find failed,
edit build-unix.sh source to fix"
  
  # if "find" fails, use (uncomment) the following instead, substituting your
  # platform for "linux"
  # JAVA_INCLUDE="-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/linux"
  
  INCLUDE="-I ../common -I$APACHE_HOME/include/apr-util $JAVA_INCLUDE"
  # SRC="mod_jk.c ../common/*.c"
  SRC="*.c"
  
  #echo INCLUDE=$INCLUDE
  #echo SRC=$SRC
  
  # Run APXS to compile module
  echo Compiling mod_jk
  cp ../common/*.c .
  $APXS -c -o mod_jk.so $INCLUDE $LIB $SRC
  
  # Copy mod_jk.so into the apache libexec directory
  echo Installing mod_jk.so into $APACHE_HOME/libexec
  cp mod_jk.so $APACHE_HOME/libexec
  
  # Done!
  echo "Done. Install by running ./install-unix.sh"
  
  
  
  
  1.1                  jakarta-tomcat/proposals/web-connector/native/apache2.0/install-unix.sh
  
  Index: install-unix.sh
  ===================================================================
  #!/bin/sh
  
  # $Id: install-unix.sh,v 1.1 2001/05/03 13:56:17 hgomez Exp $
  
  # install.sh for mod_jk.so
  # copies built mod_jk.so into apache/libexec dir
  # Usage: install-unix.sh 
  
  # Sets a bunch of variables and calls APXS to install mod_jk
  # on Unix.  An alternative to the makefiles, hopefully more portable.
  
  # Find APACHE_HOME
  if [ -z "$APACHE_HOME" ]
  then
  # Where your apache lives
  APACHE_HOME=/usr/local/apache
  fi
  
  # Copy mod_jk.so into the apache libexec directory
  echo Installing mod_jk.so into $APACHE_HOME/libexec
  cp mod_jk.so $APACHE_HOME/libexec
  
  # Done!
  echo Done. Add the following line to $APACHE_HOME/conf/httpd.conf:
  echo "   " Include TOMCAT_HOME/conf/mod_jk.conf-auto
  echo '(replace "TOMCAT_HOME" with the actual directory name)'
  
  
  
  1.1                  jakarta-tomcat/proposals/web-connector/native/apache2.0/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  /*
   * Copyright (c) 1997-1999 The Java Apache Project.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *    software must display the following acknowledgment:
   *    "This product includes software developed by the Java Apache 
   *    Project for use in the Apache JServ servlet engine project
   *    <http://java.apache.org/>."
   *
   * 4. The names "Apache JServ", "Apache JServ Servlet Engine" and 
   *    "Java Apache Project" must not be used to endorse or promote products 
   *    derived from this software without prior written permission.
   *
   * 5. Products derived from this software may not be called "Apache JServ"
   *    nor may "Apache" nor "Apache JServ" appear in their names without 
   *    prior written permission of the Java Apache Project.
   *
   * 6. Redistributions of any form whatsoever must retain the following
   *    acknowledgment:
   *    "This product includes software developed by the Java Apache 
   *    Project for use in the Apache JServ servlet engine project
   *    <http://java.apache.org/>."
   *    
   * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Java Apache Group. For more information
   * on the Java Apache Project and the Apache JServ Servlet Engine project,
   * please see <http://java.apache.org/>.
   *
   */
  
  /***************************************************************************
   * Description: Apache 2 plugin for Jakarta/Tomcat                         *
   * Author:      Gal Shachor <shachor@il.ibm.com>                           *
   * 		        Henri Gomez <hgomez@slib.fr>                               *
   * Version:     $ $                                                        *
   ***************************************************************************/
  
  /*
   * mod_jk: keeps all servlet/jakarta related ramblings together.
   */
  
  #include "ap_config.h"
  #include "httpd.h"
  #include "http_config.h"
  #include "http_request.h"
  #include "http_core.h"
  #include "http_protocol.h"
  #include "http_main.h"
  #include "http_log.h"
  #include "util_script.h"
  #include "util_date.h"
  #include "apr_strings.h"
  /*
   * Jakarta (jk_) include files
   */
  #include "jk_global.h"
  #include "jk_util.h"
  #include "jk_map.h"
  #include "jk_pool.h"
  #include "jk_service.h"
  #include "jk_worker.h"
  #include "jk_uri_worker_map.h"
  
  #define JK_WORKER_ID        ("jakarta.worker")
  #define JK_HANDLER          ("jakarta-servlet")
  #define JK_MAGIC_TYPE       ("application/x-jakarta-servlet")
  #define NULL_FOR_EMPTY(x)   ((x && !strlen(x)) ? NULL : x) 
  
  /* module MODULE_VAR_EXPORT jk_module; */
  AP_DECLARE_DATA module jk_module;
  
  
  typedef struct {
      char *log_file;
      int  log_level;
      jk_logger_t *log;
  
      char *worker_file;
      int  mountcopy;
      jk_map_t *uri_to_context;
      jk_uri_worker_map_t *uw_map;
  
      int was_initialized;
      server_rec *s;
  } jk_server_conf_t;
  
  struct apache_private_data {
      jk_pool_t p;
      
      int response_started;
      int read_body_started;
      request_rec *r;
  };
  typedef struct apache_private_data apache_private_data_t;
  
  static jk_logger_t *main_log = NULL;
  
  static int JK_METHOD ws_start_response(jk_ws_service_t *s,
                                         int status,
                                         const char *reason,
                                         const char * const *header_names,
                                         const char * const *header_values,
                                         unsigned num_of_headers);
  
  static int JK_METHOD ws_read(jk_ws_service_t *s,
                               void *b,
                               unsigned l,
                               unsigned *a);
  
  static int JK_METHOD ws_write(jk_ws_service_t *s,
                                const void *b,
                                unsigned l);
  
  
  /* ========================================================================= */
  /* JK Service step callbacks                                                 */
  /* ========================================================================= */
  
  static int JK_METHOD ws_start_response(jk_ws_service_t *s,
                                         int status,
                                         const char *reason,
                                         const char * const *header_names,
                                         const char * const *header_values,
                                         unsigned num_of_headers)
  {
      if(s && s->ws_private) {
          unsigned h;
          apache_private_data_t *p = s->ws_private;
          request_rec *r = p->r;
          
          if(!reason) {
              reason = "";
          }
  	    r->status = status;
  	    r->status_line = apr_psprintf(r->pool, "%d %s", status, reason);
  
          for(h = 0 ; h < num_of_headers ; h++) {
              if(!strcasecmp(header_names[h], "Content-type")) {
                  char *tmp = apr_pstrdup(r->pool, header_values[h]);
                  ap_content_type_tolower(tmp);
                  r->content_type = tmp;
              } else if(!strcasecmp(header_names[h], "Location")) {
  	            apr_table_set(r->headers_out, header_names[h], header_values[h]);
  	        } else if(!strcasecmp(header_names[h], "Content-Length")) {
  	            apr_table_set(r->headers_out, header_names[h], header_values[h]);
  	        } else if(!strcasecmp(header_names[h], "Transfer-Encoding")) {
  	            apr_table_set(r->headers_out, header_names[h], header_values[h]);
              } else if(!strcasecmp(header_names[h], "Last-Modified")) {
  	            /*
  	             * If the script gave us a Last-Modified header, we can't just
  	             * pass it on blindly because of restrictions on future values.
  	             */
  	            ap_update_mtime(r, ap_parseHTTPdate(header_values[h]));
  	            ap_set_last_modified(r);
  	        } else {	            
  	            apr_table_add(r->headers_out, header_names[h], header_values[h]);
              }
          }
  
          /* this NOP function was removed in apache 2.0 alpha14 */
          /* ap_send_http_header(r); */
          p->response_started = JK_TRUE;
          
          return JK_TRUE;
      }
      return JK_FALSE;
  }
  
  static int JK_METHOD ws_read(jk_ws_service_t *s,
                               void *b,
                               unsigned l,
                               unsigned *a)
  {
      if(s && s->ws_private && b && a) {
          apache_private_data_t *p = s->ws_private;
          if(!p->read_body_started) {
              if(!ap_setup_client_block(p->r, REQUEST_CHUNKED_DECHUNK)) {
                  if(ap_should_client_block(p->r)) { 
                      p->read_body_started = JK_TRUE; 
                  }
              }
          }
  
          if(p->read_body_started) {
              *a = ap_get_client_block(p->r, b, l);
              return JK_TRUE;
          }
      }
      return JK_FALSE;
  }
  
  /* Works with 4096, fails with 8192 */
  #define CHUNK_SIZE 4096
  
  static int JK_METHOD ws_write(jk_ws_service_t *s,
                                const void *b,
                                unsigned l)
  {
      if(s && s->ws_private && b) {
          apache_private_data_t *p = s->ws_private;
  
          if(l) {
              // BUFF *bf = p->r->connection->client;
              size_t w = (size_t)l;
              size_t r = 0;
  	    long ll=l;
  	    char *bb=b;
  
              if(!p->response_started) {
                  if(!s->start_response(s, 200, NULL, NULL, NULL, 0)) {
                      return JK_FALSE;
                  }
              }
              
  	    // Debug - try to get around rwrite
  	    while( ll > 0 ) {
  		long toSend=(ll>CHUNK_SIZE) ? CHUNK_SIZE : ll;
  		r = ap_rwrite((const char *)bb, toSend, p->r );
  		// DEBUG 
  #ifdef JK_DEBUG
  		ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, 
  			     NULL, "mod_jk: writing %ld (%ld) out of %ld \n",
  			     toSend, r, ll );
  #endif
  		ll-=CHUNK_SIZE;
  		bb+=CHUNK_SIZE;
  		
  		if(toSend != r) { 
  		    return JK_FALSE; 
  		} 
  
  		/*
  		 * To allow server push.
  		 */
  		if(ap_rflush(p->r) != APR_SUCCESS) {
  		    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, 
  				 NULL, "mod_jk: Error flushing \n"  );
  		    return JK_FALSE;
  		}
  	    }
          }
  
          return JK_TRUE;
      }
      return JK_FALSE;
  }
  
  /* ========================================================================= */
  /* Utility functions                                                         */
  /* ========================================================================= */
  
  /* ========================================================================= */
  /* Log something to JServ log file then exit */
  static void jk_error_exit(const char *file, 
                            int line, 
                            int level, 
                            server_rec *s,
                            const char *fmt, ...) 
  {
      va_list ap;
      char *res;
  
      va_start(ap, fmt);
      res = apr_pvsprintf(s->process->pool, fmt, ap);
      va_end(ap);
  
      ap_log_error(file, line, level, 0, s, res);
  
      /* Exit process */
      exit(1);
  }
  
  static int get_content_length(request_rec *r)
  {
      if(r->clength > 0) {
          return r->clength;
      } else {
          char *lenp = (char *)apr_table_get(r->headers_in, "Content-Length");
  
          if(lenp) {
              int rc = atoi(lenp);
              if(rc > 0) {
                  return rc;
              }
          }
      }
  
      return 0;
  }
  
  static int init_ws_service(apache_private_data_t *private_data,
                             jk_ws_service_t *s)
  {
      request_rec *r      = private_data->r;
      s->jvm_route        = NULL;
      s->start_response   = ws_start_response;
      s->read             = ws_read;
      s->write            = ws_write;
  
      s->auth_type    = NULL_FOR_EMPTY(r->ap_auth_type);
      s->remote_user  = NULL_FOR_EMPTY(r->user);
  
      s->protocol     = r->protocol;
      s->remote_host  = (char *)ap_get_remote_host(r->connection, r->per_dir_config,
REMOTE_HOST, NULL);
      s->remote_host  = NULL_FOR_EMPTY(s->remote_host);
      s->remote_addr  = NULL_FOR_EMPTY(r->connection->remote_ip);
  
  	jk_log(main_log, JK_LOG_DEBUG, 
  		 		"agsp=%u agsn=%s hostn=%s shostn=%s cbsport=%d sport=%d \n",
  				ap_get_server_port( r ),
  				ap_get_server_name( r ),
  				r->hostname,
  				r->server->server_hostname,
  				r->connection->base_server->port,
  				r->server->port
  				);
  
  #ifdef NOTNEEDEDFORNOW
      /* Wrong:    s->server_name  = (char *)ap_get_server_name( r ); */
      s->server_name= (char *)(r->hostname ? r->hostname :
                   r->server->server_hostname);
  
  
      s->server_port= htons( r->connection->local_addr.sin_port );
      /* Wrong: s->server_port  = r->server->port; */
  
     
      /*    Winners:  htons( r->connection->local_addr.sin_port )
                        (r->hostname ? r->hostname :
                               r->server->server_hostname),
      */
      /* printf( "Port %u %u %u %s %s %s %d %d \n",
          ap_get_server_port( r ),
          htons( r->connection->local_addr.sin_port ),
          ntohs( r->connection->local_addr.sin_port ),
          ap_get_server_name( r ),
          (r->hostname ? r->hostname : r->server->server_hostname),
          r->hostname,
          r->connection->base_server->port,
          r->server->port
          );
      */
  #else
  	s->server_name  = (char *)ap_get_server_name( r );
  	s->server_port  = r->server->port;
  #endif
  
      s->server_software = ap_get_server_version();
  
      s->method       = (char *)r->method;
      s->content_length = get_content_length(r);
      s->query_string = r->args;
      s->req_uri      = r->uri;
      
      s->is_ssl       = JK_FALSE;
      s->ssl_cert     = NULL;
      s->ssl_cert_len = 0;
      s->ssl_cipher   = NULL;
      s->ssl_session  = NULL;
  
      s->headers_names    = NULL;
      s->headers_values   = NULL;
      s->num_headers      = 0;
      if(r->headers_in && apr_table_elts(r->headers_in)) {
          apr_array_header_t *t = apr_table_elts(r->headers_in);        
          if(t && t->nelts) {
              int i;
              apr_table_entry_t *elts = (apr_table_entry_t *)t->elts;
              s->num_headers = t->nelts;
              s->headers_names  = apr_palloc(r->pool, sizeof(char *) * t->nelts);
              s->headers_values = apr_palloc(r->pool, sizeof(char *) * t->nelts);
              for(i = 0 ; i < t->nelts ; i++) {
                  char *hname = apr_pstrdup(r->pool, elts[i].key);
                  s->headers_values[i] = apr_pstrdup(r->pool, elts[i].val);
                  s->headers_names[i] = hname;
                  while(*hname) {
                      *hname = tolower(*hname);
                      hname++;
                  }
              }
          }
      }
  
      return JK_TRUE;
  }
  
  /* ========================================================================= */
  /* The JK module command processors                                          */
  /* ========================================================================= */
  
  static const char *jk_set_mountcopy(cmd_parms *cmd, 
                                      void *dummy, 
                                      int flag) 
  {
      server_rec *s = cmd->server;
      jk_server_conf_t *conf =
          (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
      
      /* Set up our value */
      conf->mountcopy = flag ? JK_TRUE : JK_FALSE;
  
      return NULL;
  }
  
  static const char *jk_mount_context(cmd_parms *cmd, 
                                      void *dummy, 
                                      char *context,
                                      char *worker,
                                      char *maybe_cookie)
  {
      server_rec *s = cmd->server;
      jk_server_conf_t *conf =
          (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
  
      /*
       * Add the new worker to the alias map.
       */
      char *old;
      map_put(conf->uri_to_context, context, worker, (void **)&old);
      return NULL;
  }
  
  static const char *jk_set_worker_file(cmd_parms *cmd, 
                                        void *dummy, 
                                        char *worker_file)
  {
      server_rec *s = cmd->server;
      struct stat statbuf;
  
      jk_server_conf_t *conf =
          (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
  
      conf->worker_file = worker_file;
  
      if (stat(worker_file, &statbuf) == -1)
          return "Can't find the workers file specified";
  
      return NULL;
  }
  
  static const char *jk_set_log_file(cmd_parms *cmd, 
                                     void *dummy, 
                                     char *log_file)
  {
      server_rec *s = cmd->server;
      jk_server_conf_t *conf =
          (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
  
      conf->log_file = log_file;
  
      return NULL;
  }
  
  static const char *jk_set_log_level(cmd_parms *cmd, 
                                      void *dummy, 
                                      char *log_level)
  {
      server_rec *s = cmd->server;
      jk_server_conf_t *conf =
          (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
  
      conf->log_level = jk_parse_log_level(log_level);
  
      return NULL;
  }
  
  static const char * jk_set_log_fmt(cmd_parms *cmd,
  				      void *dummy,
  				      char * log_format)
  {
  	jk_set_log_format(log_format);
  	return NULL;
  }
  	
  static const command_rec jk_cmds[] =
  {
      {"JkWorkersFile", jk_set_worker_file, NULL, RSRC_CONF, TAKE1,
       "the name of a worker file for the Jakarta servlet containers"},
      {"JkMount", jk_mount_context, NULL, RSRC_CONF, TAKE23,
       "A mount point from a context to a Tomcat worker"},
      {"JkMountCopy", jk_set_mountcopy, NULL, RSRC_CONF, FLAG,
       "Should the base server mounts be copied to the virtual server"},
      {"JkLogFile", jk_set_log_file, NULL, RSRC_CONF, TAKE1,
       "Full path to the Jakarta Tomcat module log file"},
      {"JkLogLevel", jk_set_log_level, NULL, RSRC_CONF, TAKE1,
       "The Jakarta Tomcat module log level, can be debug, info, error or emerg"},
      {"JkLogStampFormat", jk_set_log_fmt, NULL, RSRC_CONF, TAKE1,
       "The Jakarta Tomcat module log format, follow strftime synthax"},
      {NULL}
  };
  
  /* ========================================================================= */
  /* The JK module handlers                                                    */
  /* ========================================================================= */
  
  apr_status_t jk_cleanup_endpoint( void *data ) {
      jk_endpoint_t *end = (jk_endpoint_t *)data;    
      /*     printf("XXX jk_cleanup1 %ld\n", data); */
      end->done(&end, NULL);  
      return 0;
  }
  
  static int jk_handler(request_rec *r)
  {   
      const char *worker_name;
  
      if(strcmp(r->handler,JK_HANDLER))	/* not for me, try next handler */
      return DECLINED;
  
  	if (1)
  	{
  	jk_server_conf_t *xconf =
  			(jk_server_conf_t *)ap_get_module_config(r->server->module_config, &jk_module);
  	jk_logger_t *xl = xconf->log ? xconf->log : main_log;
  	jk_log(xl, JK_LOG_DEBUG, "Into handler r->proxyreq=%d r->handler=%s r->notes=%d\n",
r->proxyreq, r->handler, r->notes); 
  	}
  
  	worker_name = apr_table_get(r->notes, JK_WORKER_ID);
  
      /* If this is a proxy request, we'll notify an error */
      if(r->proxyreq) {
          return HTTP_INTERNAL_SERVER_ERROR;
      }
        
      if(worker_name) {
          jk_server_conf_t *conf =
              (jk_server_conf_t *)ap_get_module_config(r->server->module_config, &jk_module);
          jk_logger_t *l = conf->log ? conf->log : main_log;
  
          jk_worker_t *worker = wc_get_worker_for_name(worker_name, l);
  
          if(worker) {
              int rc = JK_FALSE;
              apache_private_data_t private_data;
              jk_ws_service_t s;
              jk_pool_atom_t buf[SMALL_POOL_SIZE];
              jk_open_pool(&private_data.p, buf, sizeof(buf));
  
              private_data.response_started = JK_FALSE;
              private_data.read_body_started = JK_FALSE;
              private_data.r = r;
  
              jk_init_ws_service(&s);
  
              s.ws_private = &private_data;
              s.pool = &private_data.p;            
              
              if(init_ws_service(&private_data, &s)) {
                  jk_endpoint_t *end = NULL;
  
  		/* Use per/thread pool ( or "context" ) to reuse the 
  		   endpoint. It's a bit faster, but I don't know 
  		   how to deal with load balancing - but it's usefull for JNI
  		*/
  
  #ifdef REUSE_WORKER
  		apr_pool_t *rpool=r->pool;
  		apr_pool_t *tpool=rpool->parent->parent;
  		
  		ap_get_userdata( &end, "jk_thread_endpoint", tpool );
                  if(end==NULL ) {
  		    worker->get_endpoint(worker, &end, l);
  		    ap_set_userdata( end , "jk_thread_endpoint", &jk_cleanup_endpoint,  tpool );
  		}
  #else
  		worker->get_endpoint(worker, &end, l);
  #endif
  		{   
  		    int is_recoverable_error = JK_FALSE;
                      rc = end->service(end, 
                                        &s, 
                                        l, 
                                        &is_recoverable_error);
  
  			if (s.content_read < s.content_length) {
  			/* Toss all further characters left to read fm client */
  				char *buff = apr_palloc(r->pool, 2048);
  				if (buff != NULL) {
  					int rd;
  					while ((rd = ap_get_client_block(r, buff, 2048)) > 0) {
  						s.content_read += rd;
  					}
   				}
  			}
                                                                              
  #ifndef REUSE_WORKER		    
  		    end->done(&end, l); 
  #endif
                  }
              }
  
              if(rc) {
                  return OK;	/* NOT r->status, even if it has changed. */
              }
          }
      }
  
  	return DECLINED;
  }
  
  static void *create_jk_config(apr_pool_t *p, server_rec *s)
  {
      jk_server_conf_t *c =
          (jk_server_conf_t *) apr_pcalloc(p, sizeof(jk_server_conf_t));
  
      c->worker_file = NULL;
      c->log_file    = NULL;
      c->log_level   = -1;
      c->log         = NULL;
      c->mountcopy   = JK_FALSE;
      c->was_initialized = JK_FALSE;
  
      if(!map_alloc(&(c->uri_to_context))) {
          jk_error_exit(APLOG_MARK, APLOG_EMERG, s, "Memory error");
      }
      c->uw_map = NULL;
      c->s = s;
  
      return c;
  }
  
  
  static void *merge_jk_config(apr_pool_t *p, 
                               void *basev, 
                               void *overridesv)
  {
      jk_server_conf_t *base = (jk_server_conf_t *) basev;
      jk_server_conf_t *overrides = (jk_server_conf_t *)overridesv;
   
      if(overrides->mountcopy) {
          int sz = map_size(base->uri_to_context);
          int i;
          for(i = 0 ; i < sz ; i++) {
              void *old;
              char *name = map_name_at(base->uri_to_context, i);
              if(NULL == map_get(overrides->uri_to_context, name, NULL)) {
                  if(!map_put(overrides->uri_to_context, 
                              name,
                              apr_pstrdup(p, map_get_string(base->uri_to_context, name,
NULL)),
                              &old)) {
                      jk_error_exit(APLOG_MARK, APLOG_EMERG, overrides->s, "Memory error");
                  }
              }
          }
      }
      if(overrides->log_file && overrides->log_level >= 0) {
          if(!jk_open_file_logger(&(overrides->log), overrides->log_file, overrides->log_level))
{
              overrides->log = NULL;
          }
      }
      if(!uri_worker_map_alloc(&(overrides->uw_map), 
                               overrides->uri_to_context, 
                               overrides->log)) {
          jk_error_exit(APLOG_MARK, APLOG_EMERG, overrides->s, "Memory error");
      }
      
      return overrides;
  }
  
  static void jk_child_init(apr_pool_t *pconf, 
  			  server_rec *s)
  {
      jk_map_t *init_map = NULL;
      jk_server_conf_t *conf =
          (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
  
      if(conf->log_file && conf->log_level >= 0) {
          if(!jk_open_file_logger(&(conf->log), conf->log_file, conf->log_level))
{
              conf->log = NULL;
          } else {
              main_log = conf->log;
          }
      }
      
      if(!uri_worker_map_alloc(&(conf->uw_map), conf->uri_to_context, conf->log))
{
          jk_error_exit(APLOG_MARK, APLOG_EMERG, s, "Memory error");
      }
  
      if(map_alloc(&init_map)) {
          if(map_read_properties(init_map, conf->worker_file)) {
  	    if(wc_open(init_map, conf->log)) {
  		return;
          }            
          }
      }
  
      jk_error_exit(APLOG_MARK, APLOG_EMERG, s, "Error while opening the workers");
  }
  
  static void jk_post_config(apr_pool_t *pconf, 
                             apr_pool_t *plog, 
                             apr_pool_t *ptemp, 
                             server_rec *s)
  {
      if(!s->is_virtual) {
          jk_map_t *init_map = NULL;
          jk_server_conf_t *conf =
              (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
          if(!conf->was_initialized) {
              conf->was_initialized = JK_TRUE;        
              if(conf->log_file && conf->log_level >= 0) {
                  if(!jk_open_file_logger(&(conf->log), conf->log_file, conf->log_level))
{
                      conf->log = NULL;
                  } else {
                      main_log = conf->log;
                  }
              }
      
              if(!uri_worker_map_alloc(&(conf->uw_map), conf->uri_to_context, conf->log))
{
                  jk_error_exit(APLOG_MARK, APLOG_EMERG, s, "Memory error");
              }
  
              if(map_alloc(&init_map)) {
                  if(map_read_properties(init_map, conf->worker_file)) {
  			ap_add_version_component(pconf, "mod_jk");
                          if(wc_open(init_map, conf->log)) {
                              return;
                          }            
                  }
              }
  
              jk_error_exit(APLOG_MARK, APLOG_EMERG, s, "Error while opening the workers");
          }
      }
  }
  
  static int jk_translate(request_rec *r)
  {    
      if(!r->proxyreq) {        
          jk_server_conf_t *conf =
              (jk_server_conf_t *)ap_get_module_config(r->server->module_config, &jk_module);
  
          if(conf) {
              char *worker = map_uri_to_worker(conf->uw_map, 
                                               r->uri, 
                                               conf->log ? conf->log : main_log);
  
              if(worker) {
                  r->handler=apr_pstrdup(r->pool,JK_HANDLER);
                  apr_table_setn(r->notes, JK_WORKER_ID, worker);
                  return OK;
              }
          }
      }
  
      return DECLINED;
  }
  
  static void jk_register_hooks(void)
  {
      ap_hook_handler(jk_handler, NULL, NULL, APR_HOOK_MIDDLE);
      ap_hook_post_config(jk_post_config,NULL,NULL,APR_HOOK_MIDDLE);
      ap_hook_child_init(jk_child_init,NULL,NULL,APR_HOOK_MIDDLE);
      ap_hook_translate_name(jk_translate,NULL,NULL,APR_HOOK_FIRST);
  
  }
  
  module AP_MODULE_DECLARE_DATA jk_module =
  {
      STANDARD20_MODULE_STUFF,
      NULL,	            /* dir config creater */
      NULL,	            /* dir merger --- default is to override */
      create_jk_config,	/* server config */
      merge_jk_config,	/* merge server config */
      jk_cmds,			/* command ap_table_t */
      jk_register_hooks	/* register hooks */
  };
  
  
  
  
  1.1                  jakarta-tomcat/proposals/web-connector/native/apache2.0/mod_jk.dsp
  
  Index: mod_jk.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="apache" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
  CFG=apache - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "mod_jk.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "mod_jk.mak" CFG="apache - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "apache - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "apache - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
  # Begin Project
  # PROP AllowPerConfigDependencies 0
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "apache - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "APACHE_EXPORTS" /YX /FD /c
  # ADD CPP /nologo /MT /W3 /GX /O2 /I "../common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32"
/I "$(APACHE2_HOME)\src\include" /I "$(APACHE2_HOME)\src\lib\apr\include" /I "$(APACHE2_HOME)\src\os\win32"
/D "_WIN32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "_MBCS" /D "_USRDLL"
/D "SHARED_MODULE" /FD /c
  # SUBTRACT CPP /Fr /YX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
  # ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
/nologo /dll /machine:I386 /libpath:"$(APACHE2_HOME)\src\lib\apr\Release" /libpath:"$(APACHE2_HOME)\src\CoreR"
  
  !ELSEIF  "$(CFG)" == "apache - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "APACHE_EXPORTS" /YX /FD /GZ /c
  # ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "../common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32"
/I "$(APACHE2_HOME)\src\include" /I "$(APACHE2_HOME)\src\lib\apr\include" /I "$(APACHE2_HOME)\src\os\win32"
/D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /FR /YX /FD
/GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
/pdbtype:sept
  # ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
/nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(APACHE2_HOME)\src\lib\apr\Debug"
/libpath:"$(APACHE2_HOME)\src\CoreD"
  
  !ENDIF 
  
  # Begin Target
  
  # Name "apache - Win32 Release"
  # Name "apache - Win32 Debug"
  # Begin Group "Source Files"
  
  # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
  # Begin Source File
  
  SOURCE=..\common\jk_ajp12_worker.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_ajp13.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_ajp13_worker.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_connect.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_jni_worker.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_lb_worker.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_map.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_msg_buff.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_pool.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_sockbuf.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_uri_worker_map.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_util.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_worker.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\mod_jk.c
  # End Source File
  # End Group
  # Begin Group "Header Files"
  
  # PROP Default_Filter "h;hpp;hxx;hm;inl"
  # Begin Source File
  
  SOURCE=..\common\jk_ajp12_worker.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_ajp13.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_ajp13_worker.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_ajp23_worker.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_connect.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_global.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_jni_worker.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_lb_worker.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_logger.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_map.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_msg_buff.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_mt.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_pool.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_service.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_sockbuf.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_uri_worker_map.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_util.h
  # End Source File
  # Begin Source File
  
  SOURCE=..\common\jk_worker.h
  # End Source File
  # End Group
  # Begin Group "Resource Files"
  
  # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
  # End Group
  # End Target
  # End Project
  
  
  

Mime
View raw message