tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_md5.c
Date Thu, 20 Dec 2001 17:55:43 GMT
costin      01/12/20 09:55:43

  Modified:    jk/native build.xml
               jk/native2 build.xml
               jk/native2/common jk_md5.c
  Log:
  More fixes to the build.
  
  Revision  Changes    Path
  1.25      +2 -2      jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- build.xml	2001/12/20 00:39:24	1.24
  +++ build.xml	2001/12/20 17:55:42	1.25
  @@ -41,8 +41,8 @@
   	     classpathref="cp.jkant" />
       <available property="apache13.detect" 
                  file="${apache13.home}" />
  -    <available property="apache20.detect" 
  -               file="${apache20.home}" />
  +    <available property="apache2.detect" 
  +               file="${apache2.home}" />
       <available property="iis.detect" 
                  file="${iis.home}" />
       <available property="iplanet.detect" 
  
  
  
  1.6       +20 -13    jakarta-tomcat-connectors/jk/native2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	2001/12/20 00:15:43	1.5
  +++ build.xml	2001/12/20 17:55:42	1.6
  @@ -11,10 +11,7 @@
   
     <!-- ========== Local paths, overriden in build.properties ========== -->
   
  -  <property name="apxs13" value="/usr/sbin/apxs" />
  -  <property name="apxs20" value="/opt/apache2/bin/apxs" />
  -  
  -  <property name="netscape.home" location="/opt/iplanet/plugins" />
  +  <property name="netscape.home" location="${iplanet.home}/plugins" />
     <property name="apache2.home" location="/opt/apache2" />
     <property name="apache13.home" location="/usr" />
     
  @@ -32,6 +29,7 @@
    
     <!-- Base dir for jk sources -->
     <property name="jk.src" location=".." />
  +  <property name="jk.build" location="../build" />
   
     <property name="native.dir" location="${jk.src}/native2" />
   
  @@ -43,17 +41,25 @@
   
     <!-- ==================== Targets ==================== -->
   
  -  <target name="main" depends="init,apache20,jni">
  +  <target name="main" depends="init,apache20,jni,apache13">
     </target>
   
     <target name="init" >
       <taskdef resource="META-INF/ant.tasks" 
   	     classpathref="jkant" />
       <available property="HAVE_APR" file="${apr.include}/apr.h" />
  +    <available property="apache13.detect" 
  +               file="${apache13.home}" />
  +    <available property="apache2.detect" 
  +               file="${apache2.home}" />
  +    <available property="iis.detect" 
  +               file="${iis.home}" />
  +    <available property="iplanet.detect" 
  +               file="${iplanet.home}" />
       <mkdir dir="${build.dir}" />
     </target>
   
  -  <target name="apache20" depends="init">
  +  <target name="apache20" depends="init" if="apache2.detect">
       <mkdir dir="${build.dir}/apache2" />
       <so sofile="mod_jk" 
   	buildDir="${build.dir}/apache2"
  @@ -159,17 +165,16 @@
     </target>
   
   
  -  <target name="apache13" depends="init">
  -    <mkdir dir="apache-1.3/obj" />
  +  <target name="apache13" depends="init" if="apache13.detect">
  +    <mkdir dir="${jk.build}/WEB-INF/jk2/apache13" />
       <so sofile="mod_jk" 
  -	buildDir="apache-1.3/obj"
  +	buildDir="${jk.build}/WEB-INF/jk2/apache13"
   	optimize="${so.optimize}"
   	debug="${so.debug}"
   	profile="${so.profile}">
  -      <apacheConfig apxs="${apxs13}" />
   
         <src dir=".">
  -	<include name="apache-1.3/mod_jk.c" />
  +	<include name="server/apache13/mod_jk.c" />
   	<include name="common/*.c" />
           <exclude name="jk_nwmain.c" 
   		 unless="netware" />
  @@ -242,7 +247,7 @@
       </so>
     </target>
   
  -  <target name="iis" depends="init">
  +  <target name="iis" depends="init" if="iis.detect">
       <so sofile="isapi_redirector" 
           buildDir="iis"
           optimize="${so.optimize}"
  @@ -286,7 +291,9 @@
       </so>
     </target>
   
  -  <target name="netscape" depends="init">
  +  <target name="netscape" depends="init" if="iplanet.detect">
  +    <available property="unix" file="/etc/passwd" />
  +  
       <mkdir dir="netscape/obj" />
       <so sofile="nsapi_redirector" 
   	buildDir="netscape/obj"
  
  
  
  1.3       +3 -3      jakarta-tomcat-connectors/jk/native2/common/jk_md5.c
  
  Index: jk_md5.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_md5.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_md5.c	2001/12/16 23:29:55	1.2
  +++ jk_md5.c	2001/12/20 17:55:43	1.3
  @@ -103,7 +103,7 @@
   /***************************************************************************
    * Description: MD5 encoding wrapper                                       *
    * Author:      Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.2 $                                           *
  + * Version:     $Revision: 1.3 $                                           *
    ***************************************************************************/
   
   /*
  @@ -120,6 +120,7 @@
    */
    
   #include "jk_global.h"
  +#include "jk_env.h"
   #include "jk_md5.h"
   
   char * JK_METHOD jk_hextocstr(unsigned char *org, char * dst, int n)
  @@ -457,8 +458,7 @@
       }
   }
   
  -char * JK_METHOD jk_md5(jk_env_t *env,
  -                        const unsigned char *org, const unsigned char *org2, char *dst)
  +char * JK_METHOD jk_md5(const unsigned char *org, const unsigned char *org2, char *dst)
   {
   	JK_MD5_CTX  ctx;
   	char		buf[JK_MD5_DIGESTSIZE + 1];
  
  
  

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