tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_endpoint.h jk_global.h jk_service.h
Date Thu, 30 Oct 2003 20:11:34 GMT
mturk       2003/10/30 12:11:34

  Modified:    jk/native2/include jk_endpoint.h jk_global.h jk_service.h
  Log:
  Remove HAS_APR checking.
  
  Revision  Changes    Path
  1.19      +1 -3      jakarta-tomcat-connectors/jk/native2/include/jk_endpoint.h
  
  Index: jk_endpoint.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_endpoint.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- jk_endpoint.h	25 Sep 2003 15:23:23 -0000	1.18
  +++ jk_endpoint.h	30 Oct 2003 20:11:33 -0000	1.19
  @@ -200,7 +200,6 @@
        */
       char active[64];
   
  -#ifdef HAS_APR
       /* Time when this endpoint has opened a connection to
          tomcat
       */
  @@ -215,7 +214,6 @@
       apr_time_t startTime;
       apr_time_t jkStartTime;
       apr_time_t endTime;
  -#endif
   };
   
       
  
  
  
  1.19      +18 -41    jakarta-tomcat-connectors/jk/native2/include/jk_global.h
  
  Index: jk_global.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- jk_global.h	4 Feb 2003 07:40:32 -0000	1.18
  +++ jk_global.h	30 Oct 2003 20:11:33 -0000	1.19
  @@ -65,6 +65,15 @@
   #ifndef JK_GLOBAL_H
   #define JK_GLOBAL_H
   
  +#include "apr.h"
  +#include "apr_lib.h"
  +#include "apr_general.h"
  +#include "apr_strings.h"
  +#include "apr_network_io.h"
  +#include "apr_errno.h"
  +#include "apr_version.h"
  +#include "apr_time.h"
  +
   #include <stdio.h>
   #include <stdlib.h>
   #include <string.h>
  @@ -74,9 +83,8 @@
   #include <ctype.h>
   
   #ifdef AS400
  +/*XXX: why is this include here in common? */
   #include "ap_config.h"
  -#include "apr_strings.h"
  -#include "apr_lib.h"
   extern char *strdup (const char *str);
   #endif
   
  @@ -86,8 +94,8 @@
   /************** START OF AREA TO MODIFY BEFORE RELEASING *************/
   #define JK_VERMAJOR     2
   #define JK_VERMINOR     0
  -#define JK_VERFIX       3
  -#define JK_VERSTRING    "2.0.3"
  +#define JK_VERFIX       4
  +#define JK_VERSTRING    "2.0.4"
   
   /* Beta number */
   #define JK_VERBETA      0
  @@ -159,37 +167,6 @@
   /* We'll use APR whenever it's possible. However for a transition period and
      for essential components we can build a minimal mod_jk without APR.
   */
  -   
  -#ifdef HAS_APR
  -
  -#include "apr.h"
  -#include "apr_errno.h"
  -#include "apr_time.h"
  -#include "apr_strings.h"
  -
  -#else
  -
  -/* No APR - define for forward/backward compatibility
  - */
  -
  -/* cut&paste from apr_errno.h */
  -typedef int apr_status_t;
  -#ifndef APR_SUCCESS
  -#define APR_SUCCESS (0)
  -#endif
  -
  -#ifndef APR_OS_START_USEERR
  -#define APR_OS_START_USEERR 21000
  -#endif
  -
  -
  -typedef  unsigned char   apr_byte_t;
  -typedef  short           apr_int16_t;
  -typedef  unsigned short  apr_uint16_t;
  -typedef  int             apr_int32_t;
  -typedef  unsigned int    apr_uint32_t;
  -
  -#endif
       
   #define JK_OK APR_SUCCESS
   #define JK_ERR APR_OS_START_USEERR
  @@ -252,18 +229,18 @@
       #define FILE_SEPERATOR          ('\\')
       #define FILE_SEPARATOR_STR      ("\\")
       #define PATH_ENV_VARIABLE       ("PATH")
  -	
  +    
       /* incompatible names... */
       #ifndef strcasecmp 
           #define strcasecmp stricmp
       #endif
       #ifndef strncasecmp 
           #define strncasecmp strnicmp
  -	#endif
  +    #endif
   
  -	#ifndef vsnprintf
  -		#define vsnprintf _vsnprintf
  -	#endif
  +    #ifndef vsnprintf
  +        #define vsnprintf _vsnprintf
  +    #endif
   #else
       #define JK_METHOD
       #define C_LEVEL_TRY_START       
  
  
  
  1.20      +9 -11     jakarta-tomcat-connectors/jk/native2/include/jk_service.h
  
  Index: jk_service.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_service.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- jk_service.h	25 Sep 2003 15:23:23 -0000	1.19
  +++ jk_service.h	30 Oct 2003 20:11:33 -0000	1.20
  @@ -111,7 +111,7 @@
   #define SC_M_MOVE               (unsigned char)12
   #define SC_M_LOCK               (unsigned char)13
   #define SC_M_UNLOCK             (unsigned char)14
  -#define SC_M_ACL		        (unsigned char)15
  +#define SC_M_ACL                (unsigned char)15
   #define SC_M_REPORT             (unsigned char)16
   #define SC_M_VERSION_CONTROL    (unsigned char)17
   #define SC_M_CHECKIN            (unsigned char)18
  @@ -230,13 +230,13 @@
       char     *ssl_cipher;
       char     *ssl_session;
   
  -	/*
  -	 * SSL extra information for Servlet 2.3 API
  -	 * 
  -	 * ssl_key_size - ssl key size in use
  -	 */
  -	int		ssl_key_size;
  -	
  +    /*
  +     * SSL extra information for Servlet 2.3 API
  +     * 
  +     * ssl_key_size - ssl key size in use
  +     */
  +    int     ssl_key_size;
  +    
       /** Incoming headers */
       struct jk_map *headers_in;
   
  @@ -275,9 +275,7 @@
       int outPos;
       int outSize;
       char *outBuf;
  -#ifdef HAS_APR
       apr_time_t startTime;
  -#endif
       
       /** printf style output. Formats in the tmp buf, then calls write
        */
  
  
  

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


Mime
View raw message