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/native/common jk_ajp_common.c jk_service.h jk_util.c jk_version.h
Date Sat, 13 Oct 2001 17:36:36 GMT
nacho       01/10/13 10:36:36

  Modified:    jk/native/iis isapi.dsp
               jk/native/common jk_ajp_common.c jk_service.h jk_util.c
                        jk_version.h
  Log:
  Eol problems..
  
  Revision  Changes    Path
  1.5       +283 -283  jakarta-tomcat-connectors/jk/native/iis/isapi.dsp
  
  Index: isapi.dsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/isapi.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- isapi.dsp	2001/06/23 15:56:55	1.4
  +++ isapi.dsp	2001/10/13 17:36:36	1.5
  @@ -1,283 +1,283 @@
  -# Microsoft Developer Studio Project File - Name="isapi" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  -# ** DO NOT EDIT **
  -
  -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  -
  -CFG=isapi - 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 "isapi.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 "isapi.mak" CFG="isapi - Win32 Debug"
  -!MESSAGE 
  -!MESSAGE Possible choices for configuration are:
  -!MESSAGE 
  -!MESSAGE "isapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "isapi - 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)" == "isapi - 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 "isapi_release"
  -# PROP Intermediate_Dir "isapi_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 "ISAPI_EXPORTS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32"
/D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c
  -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  -# ADD BASE RSC /l 0x809 /d "NDEBUG"
  -# ADD RSC /l 0x809 /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 wsock32.lib advapi32.lib /nologo /dll /machine:I386 /out:"isapi_release\isapi_redirect.dll"
  -
  -!ELSEIF  "$(CFG)" == "isapi - 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 "isapi_debug"
  -# PROP Intermediate_Dir "isapi_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 "ISAPI_EXPORTS" /YX /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "ISAPI_EXPORTS" /FR /YX /FD /GZ /c
  -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  -# ADD BASE RSC /l 0x809 /d "_DEBUG"
  -# ADD RSC /l 0x809 /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 wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:"isapi_debug\isapi_redirect.dll"
/pdbtype:sept
  -
  -!ENDIF 
  -
  -# Begin Target
  -
  -# Name "isapi - Win32 Release"
  -# Name "isapi - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
  -# Begin Source File
  -
  -SOURCE=.\isapi.def
  -# End Source File
  -# 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_ajp14.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_ajp14_worker.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_ajp_common.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_connect.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_context.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=.\jk_isapi_plugin.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_md5.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_msg_buff.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_nwmain.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
  -# 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_ajp14.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_ajp14_worker.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_ajp_common.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_connect.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_context.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_md5.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_version.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_worker.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_worker_list.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
  +# Microsoft Developer Studio Project File - Name="isapi" - Package Owner=<4>
  +# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# ** DO NOT EDIT **
  +
  +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  +
  +CFG=isapi - 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 "isapi.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 "isapi.mak" CFG="isapi - Win32 Debug"
  +!MESSAGE 
  +!MESSAGE Possible choices for configuration are:
  +!MESSAGE 
  +!MESSAGE "isapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "isapi - 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)" == "isapi - 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 "isapi_release"
  +# PROP Intermediate_Dir "isapi_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 "ISAPI_EXPORTS" /YX /FD /c
  +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32"
/D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c
  +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  +# ADD BASE RSC /l 0x809 /d "NDEBUG"
  +# ADD RSC /l 0x809 /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 wsock32.lib advapi32.lib /nologo /dll /machine:I386 /out:"isapi_release\isapi_redirect.dll"
  +
  +!ELSEIF  "$(CFG)" == "isapi - 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 "isapi_debug"
  +# PROP Intermediate_Dir "isapi_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 "ISAPI_EXPORTS" /YX /FD /GZ /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "ISAPI_EXPORTS" /FR /YX /FD /GZ /c
  +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  +# ADD BASE RSC /l 0x809 /d "_DEBUG"
  +# ADD RSC /l 0x809 /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 wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:"isapi_debug\isapi_redirect.dll"
/pdbtype:sept
  +
  +!ENDIF 
  +
  +# Begin Target
  +
  +# Name "isapi - Win32 Release"
  +# Name "isapi - Win32 Debug"
  +# Begin Group "Source Files"
  +
  +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
  +# Begin Source File
  +
  +SOURCE=.\isapi.def
  +# End Source File
  +# 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_ajp14.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_ajp14_worker.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_ajp_common.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_connect.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_context.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\jk_isapi_plugin.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_md5.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_msg_buff.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_nwmain.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
  +# 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_ajp14.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_ajp14_worker.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_ajp_common.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_connect.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_context.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_md5.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_version.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_worker.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_worker_list.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
  
  
  
  1.16      +20 -20    jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
  
  Index: jk_ajp_common.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- jk_ajp_common.c	2001/10/09 18:07:37	1.15
  +++ jk_ajp_common.c	2001/10/13 17:36:36	1.16
  @@ -59,7 +59,7 @@
    * Description: common stuff for bi-directional protocols ajp13/ajp14.     *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Author:      Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.15 $                                           *
  + * Version:     $Revision: 1.16 $                                           *
    ***************************************************************************/
   
   
  @@ -733,7 +733,7 @@
   
   
   /*
  - * Read data from AJP13/AJP14 protocol
  + * Read data from AJP13/AJP14 protocol
    * Returns -1 on error, else number of bytes read
    */
   
  @@ -750,28 +750,28 @@
       read_buf += AJP_HEADER_LEN;    /* leave some space for the buffer headers */
       read_buf += AJP_HEADER_SZ_LEN; /* leave some space for the read length */
   
  -    /* Pick the max size since we don't know the content_length */
  -    if (r->is_chunked && len == 0) {
  -	len = AJP13_MAX_SEND_BODY_SZ;
  -    }
  -
  +    /* Pick the max size since we don't know the content_length */
  +    if (r->is_chunked && len == 0) {
  +	len = AJP13_MAX_SEND_BODY_SZ;
  +    }
  +
       if ((len = ajp_read_fully_from_server(r, read_buf, len)) < 0) {
           jk_log(l, JK_LOG_ERROR, "ajp_read_into_msg_buff: Error - ajp_read_fully_from_server
failed\n");
           return -1;
  +    }
  +
  +    if (!r->is_chunked) {
  +	ae->left_bytes_to_send -= len;
       }
  -
  -    if (!r->is_chunked) {
  -	ae->left_bytes_to_send -= len;
  -    }
  -
  -    if (len > 0) {
  -	/* Recipient recognizes empty packet as end of stream, not
  -	   an empty body packet */
  -        if(0 != jk_b_append_int(msg, (unsigned short)len)) {
  -            jk_log(l, JK_LOG_ERROR, 
  -                   "read_into_msg_buff: Error - jk_b_append_int failed\n");
  -            return -1;
  -	}
  +
  +    if (len > 0) {
  +	/* Recipient recognizes empty packet as end of stream, not
  +	   an empty body packet */
  +        if(0 != jk_b_append_int(msg, (unsigned short)len)) {
  +            jk_log(l, JK_LOG_ERROR, 
  +                   "read_into_msg_buff: Error - jk_b_append_int failed\n");
  +            return -1;
  +	}
       }
   
       jk_b_set_len(msg, jk_b_get_len(msg) + len);
  
  
  
  1.9       +3 -3      jakarta-tomcat-connectors/jk/native/common/jk_service.h
  
  Index: jk_service.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_service.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_service.h	2001/09/10 18:32:36	1.8
  +++ jk_service.h	2001/10/13 17:36:36	1.9
  @@ -63,7 +63,7 @@
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Author:      Dan Milstein <danmil@shore.net>                            *
    * Author:      Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.8 $                                           *
  + * Version:     $Revision: 1.9 $                                           *
    ***************************************************************************/
   
   #ifndef JK_SERVICE_H
  @@ -169,8 +169,8 @@
       unsigned server_port;   
       char    *server_software;
       unsigned content_length;    /* integer that represents the content  */
  -                                /* length should be 0 if unknown.        */
  -    unsigned is_chunked;        /* 1 if content length is unknown (chunked rq) */
  +                                /* length should be 0 if unknown.        */
  +    unsigned is_chunked;        /* 1 if content length is unknown (chunked rq) */
       unsigned no_more_chunks;    /* 1 if last chunk has been read */
       unsigned content_read;      /* number of bytes read */
   
  
  
  
  1.8       +22 -22    jakarta-tomcat-connectors/jk/native/common/jk_util.c
  
  Index: jk_util.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_util.c	2001/09/10 18:32:36	1.7
  +++ jk_util.c	2001/10/13 17:36:36	1.8
  @@ -59,7 +59,7 @@
    * Description: Utility functions (mainly configuration)                   *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Author:      Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.7 $                                           *
  + * Version:     $Revision: 1.8 $                                           *
    ***************************************************************************/
   
   
  @@ -568,31 +568,31 @@
       }
       return JK_FALSE;
   }
  -
  -static int jk_is_some_property(const char *prp_name, const char *suffix)
  -{
  -    if (prp_name && suffix) {
  -		size_t prp_name_len = strlen(prp_name);
  -		size_t suffix_len = strlen(suffix);
  -		if (prp_name_len >= suffix_len) {
  -			const char *prp_suffix = prp_name + prp_name_len - suffix_len;
  -			if(0 == strcmp(suffix, prp_suffix)) {
  -		        return JK_TRUE;
  -			}
  -        }
  -    }
  -
  -    return JK_FALSE;
  -}
  -
  +
  +static int jk_is_some_property(const char *prp_name, const char *suffix)
  +{
  +    if (prp_name && suffix) {
  +		size_t prp_name_len = strlen(prp_name);
  +		size_t suffix_len = strlen(suffix);
  +		if (prp_name_len >= suffix_len) {
  +			const char *prp_suffix = prp_name + prp_name_len - suffix_len;
  +			if(0 == strcmp(suffix, prp_suffix)) {
  +		        return JK_TRUE;
  +			}
  +        }
  +    }
  +
  +    return JK_FALSE;
  +}
  +
   int jk_is_path_poperty(const char *prp_name)
  -{
  +{
   	return jk_is_some_property(prp_name, "path");
   }
   
   int jk_is_cmd_line_poperty(const char *prp_name)
   {
  -	return jk_is_some_property(prp_name, CMD_LINE_OF_WORKER);
  +	return jk_is_some_property(prp_name, CMD_LINE_OF_WORKER);
   }
   
   int jk_get_worker_stdout(jk_map_t *m, 
  @@ -749,8 +749,8 @@
       s->server_name          = NULL;
       s->server_port          = 80;
       s->server_software      = NULL;
  -    s->content_length       = 0;
  -    s->is_chunked           = 0;
  +    s->content_length       = 0;
  +    s->is_chunked           = 0;
       s->no_more_chunks       = 0;
       s->content_read         = 0;
       s->is_ssl               = JK_FALSE;
  
  
  
  1.3       +96 -96    jakarta-tomcat-connectors/jk/native/common/jk_version.h
  
  Index: jk_version.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_version.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_version.h	2001/07/06 15:27:15	1.2
  +++ jk_version.h	2001/10/13 17:36:36	1.3
  @@ -1,96 +1,96 @@
  -/* ========================================================================= *
  - *                                                                           *
  - *                 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/>.   *
  - *                                                                           *
  - * ========================================================================= */
  -
  -/***************************************************************************
  - * Description: Socket buffer header file                                  *
  - * Author:      Jean-Frederic Clere <jfrederic.clere@fujitsu-siemens.com>  *
  - * Version:     $Revision: 1.2 $                                                 *
  - ***************************************************************************/
  -
  -#ifndef __JK_VERSION_H
  -#define __JK_VERSION_H
  -
  -/************** START OF AREA TO MODIFY BEFORE RELEASING *************/
  -#define JK_VERMAJOR     1
  -#define JK_VERMINOR     2
  -#define JK_VERFIX       0
  -#define JK_VERSTRING    "1.2.0"
  -
  -/* Beta number */
  -#define JK_VERBETA      1
  -#define JK_BETASTRING   "1"
  -/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
  -#define JK_VERISRELEASE 1
  -/************** END OF AREA TO MODIFY BEFORE RELEASING *************/
  -
  -#define PACKAGE "mod_jk/"
  -/* Build JK_EXPOSED_VERSION and JK_VERSION */
  -#define JK_EXPOSED_VERSION_INT PACKAGE JK_VERSTRING
  -
  -#if ( JK_VERISRELEASE == 1 )
  -#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT
  -#undef JK_VERBETA
  -#define JK_VERBETA 255
  -#else
  -#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-beta-" JK_BETASTRING
  -#endif
  -
  -#define JK_MAKEVERSION(major, minor, fix, beta) (((major) << 24) + ((minor) <<
16) + ((fix) << 8) + (beta))
  -
  -#define JK_VERSION JK_MAKEVERSION(JK_VERMAJOR, JK_VERMINOR, JK_VERFIX, JK_VERBETA)
  -
  -#endif /* __JK_VERSION_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/>.   *
  + *                                                                           *
  + * ========================================================================= */
  +
  +/***************************************************************************
  + * Description: Socket buffer header file                                  *
  + * Author:      Jean-Frederic Clere <jfrederic.clere@fujitsu-siemens.com>  *
  + * Version:     $Revision: 1.3 $                                                 *
  + ***************************************************************************/
  +
  +#ifndef __JK_VERSION_H
  +#define __JK_VERSION_H
  +
  +/************** START OF AREA TO MODIFY BEFORE RELEASING *************/
  +#define JK_VERMAJOR     1
  +#define JK_VERMINOR     2
  +#define JK_VERFIX       0
  +#define JK_VERSTRING    "1.2.0"
  +
  +/* Beta number */
  +#define JK_VERBETA      1
  +#define JK_BETASTRING   "1"
  +/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
  +#define JK_VERISRELEASE 1
  +/************** END OF AREA TO MODIFY BEFORE RELEASING *************/
  +
  +#define PACKAGE "mod_jk/"
  +/* Build JK_EXPOSED_VERSION and JK_VERSION */
  +#define JK_EXPOSED_VERSION_INT PACKAGE JK_VERSTRING
  +
  +#if ( JK_VERISRELEASE == 1 )
  +#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT
  +#undef JK_VERBETA
  +#define JK_VERBETA 255
  +#else
  +#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-beta-" JK_BETASTRING
  +#endif
  +
  +#define JK_MAKEVERSION(major, minor, fix, beta) (((major) << 24) + ((minor) <<
16) + ((fix) << 8) + (beta))
  +
  +#define JK_VERSION JK_MAKEVERSION(JK_VERMAJOR, JK_VERMINOR, JK_VERFIX, JK_VERBETA)
  +
  +#endif /* __JK_VERSION_H */
  
  
  

Mime
View raw message