tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_iis.h jk_isapi_plugin.c jk_service_iis.c iis.h
Date Fri, 19 Apr 2002 00:23:45 GMT
nacho       02/04/18 17:23:45

  Modified:    jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
  Added:       jk/native2/server/isapi jk_iis.h
  Removed:     jk/native2/server/isapi iis.h
  Log:
  iis.h -> jk_iis.h
  
  Revision  Changes    Path
  1.3       +2 -2      jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_isapi_plugin.c	19 Apr 2002 00:20:13 -0000	1.2
  +++ jk_isapi_plugin.c	19 Apr 2002 00:23:45 -0000	1.3
  @@ -60,7 +60,7 @@
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Author:      Larry Isaacs <larryi@apache.org>                           *
    * Author:      Ignacio J. Ortega <nacho@apache.org>                       *
  - * Version:     $Revision: 1.2 $                                           *
  + * Version:     $Revision: 1.3 $                                           *
    ***************************************************************************/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -78,7 +78,7 @@
   #include "jk_service.h"
   #include "jk_worker.h"
   
  -#include "iis.h"
  +#include "jk_iis.h"
   //#include "jk_uri_worker_map.h"
   
   #define jk_log(a,b,c)
  
  
  
  1.3       +2 -2      jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
  
  Index: jk_service_iis.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_service_iis.c	19 Apr 2002 00:20:13 -0000	1.2
  +++ jk_service_iis.c	19 Apr 2002 00:23:45 -0000	1.3
  @@ -60,7 +60,7 @@
    * Author:      Gal Shachor <shachor@il.ibm.com>                           
    *              Henri Gomez <hgomez@slib.fr> 
    *				Ignacio J. Ortega <nacho@apache.org>
  - * Version:     $Revision: 1.2 $                                           
  + * Version:     $Revision: 1.3 $                                           
    */
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -78,7 +78,7 @@
   #include "jk_service.h"
   #include "jk_worker.h"
   
  -#include "iis.h"
  +#include "jk_iis.h"
   //#include "jk_uri_worker_map.h"
   
   
  
  
  
  1.1                  jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h
  
  Index: jk_iis.h
  ===================================================================
  /* ========================================================================= *
   *                                                                           *
   *                 The Apache Software License,  Version 1.1                 *
   *                                                                           *
   *          Copyright (c) 1999-2001 The Apache Software Foundation.          *
   *                           All rights reserved.                            *
   *                                                                           *
   * ========================================================================= *
   *                                                                           *
   * Redistribution and use in source and binary forms,  with or without modi- *
   * fication, are permitted provided that the following conditions are met:   *
   *                                                                           *
   * 1. Redistributions of source code  must retain the above copyright notice *
   *    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. The end-user documentation  included with the redistribution,  if any, *
   *    must include the following acknowlegement:                             *
   *                                                                           *
   *       "This product includes  software developed  by the Apache  Software *
   *        Foundation <http://www.apache.org/>."                              *
   *                                                                           *
   *    Alternately, this acknowlegement may appear in the software itself, if *
   *    and wherever such third-party acknowlegements normally appear.         *
   *                                                                           *
   * 4. The names  "The  Jakarta  Project",  "Jk",  and  "Apache  Software     *
   *    Foundation"  must not be used  to endorse or promote  products derived *
   *    from this  software without  prior  written  permission.  For  written *
   *    permission, please contact <apache@apache.org>.                        *
   *                                                                           *
   * 5. Products derived from this software may not be called "Apache" nor may *
   *    "Apache" appear in their names without prior written permission of the *
   *    Apache Software Foundation.                                            *
   *                                                                           *
   * THIS SOFTWARE IS PROVIDED "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 APACHE  SOFTWARE  FOUNDATION 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 indivi- *
   * duals on behalf of the  Apache Software Foundation.  For more information *
   * on the Apache Software Foundation, please see <http://www.apache.org/>.   *
   *                                                                           *
   * ========================================================================= */
  
  #ifndef IIS_H
  #define IIS_H
  
  #define _WIN32_WINNT 0x0400
  
  #include <httpext.h>
  #include <httpfilt.h>
  #include <wininet.h>
  
  #include "jk_global.h"
  //#include "jk_util.h"
  #include "jk_pool.h"
  
  #ifdef __cplusplus
  extern "C" {
  #endif /* __cplusplus */
  
  
  
  struct isapi_private_data {
      jk_pool_t p;    
      int request_started;
      unsigned bytes_read_so_far;
      LPEXTENSION_CONTROL_BLOCK  lpEcb;
  };
  typedef struct isapi_private_data isapi_private_data_t;
  
  
  
  #define VERSION_STRING "Jakarta/ISAPI/1.2Dev"
  
  #define DEFAULT_WORKER_NAME ("ajp13")
  /*
   * We use special headers to pass values from the filter to the 
   * extension. These values are:
   *
   * 1. The real URI before redirection took place
   * 2. The name of the worker to be used.
   * 3. The contents of the Translate header, if any
   *
   */
  #define URI_HEADER_NAME         ("TOMCATURI:")
  #define QUERY_HEADER_NAME       ("TOMCATQUERY:")
  #define WORKER_HEADER_NAME      ("TOMCATWORKER:")
  #define TOMCAT_TRANSLATE_HEADER_NAME ("TOMCATTRANSLATE:")
  #define CONTENT_LENGTH          ("CONTENT_LENGTH:")
  
  #define HTTP_URI_HEADER_NAME     ("HTTP_TOMCATURI")
  #define HTTP_QUERY_HEADER_NAME   ("HTTP_TOMCATQUERY")
  #define HTTP_WORKER_HEADER_NAME  ("HTTP_TOMCATWORKER")
  
  #define REGISTRY_LOCATION       ("Software\\Apache Software Foundation\\Jakarta Isapi Redirector\\1.2")
  #define EXTENSION_URI_TAG       ("extension_uri")
  
  #define URI_SELECT_TAG          ("uri_select")
  
  #define URI_SELECT_PARSED_VERB      ("parsed")
  #define URI_SELECT_UNPARSED_VERB    ("unparsed")
  #define URI_SELECT_ESCAPED_VERB     ("escaped")
  
  #define BAD_REQUEST		-1
  #define BAD_PATH		-2
  #define MAX_SERVERNAME			128
  
  
  #define GET_SERVER_VARIABLE_VALUE(name, place) {    \
      (place) = NULL;                                   \
      huge_buf_sz = sizeof(huge_buf);                 \
      if (get_server_value(private_data->lpEcb,        \
                          (name),                     \
                          huge_buf,                   \
                          huge_buf_sz,                \
                          "")) {                      \
          (place) = private_data->p.pstrdup(env,&private_data->p,huge_buf);   \
      }   \
  }\
  
  #define GET_SERVER_VARIABLE_VALUE_INT(name, place, def) {   \
      huge_buf_sz = sizeof(huge_buf);                 \
      if (get_server_value(private_data->lpEcb,        \
                          (name),                     \
                          huge_buf,                   \
                          huge_buf_sz,                \
                          "")) {                      \
          (place) = atoi(huge_buf);                   \
          if (0 == (place)) {                          \
              (place) = def;                          \
          }                                           \
      } else {    \
          (place) = def;  \
      }           \
  }\
  
  
  static int JK_METHOD jk2_service_iis_head(jk_env_t *env, jk_ws_service_t *s );
  
  static int JK_METHOD jk2_service_iis_read(jk_env_t *env, jk_ws_service_t *s,
                            void *b, unsigned len,
                            unsigned *actually_read);
  
  static int JK_METHOD jk2_service_iis_write(jk_env_t *env,jk_ws_service_t *s,
                             const void *b,
                             unsigned l);
  
  static int JK_METHOD jk2_service_iis_init_ws_service( struct jk_env *env, jk_ws_service_t
*_this,
                   struct jk_worker *w, void *serverObj );
  
  
  #ifdef __cplusplus
  }
  #endif /* __cplusplus */
  
  #endif 
  
  
  

--
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