httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@hyperreal.org
Subject cvs commit: apache-1.3/src/support Makefile.tmpl
Date Fri, 29 May 1998 18:21:18 GMT
randy       98/05/29 11:21:17

  Modified:    src      ApacheCore.dsp ApacheCore.mak CHANGES
               src/include util_md5.h
               src/main Makefile.tmpl md5c.c
               src/modules/proxy ApacheModuleProxy.mak Makefile.tmpl
                        proxy_cache.c proxy_util.c
               src/os/win32 ApacheModuleDigest.mak
               src/os/win32/installer apache.iwz
               src/support Makefile.tmpl
  Added:       src/include ap_md5.h
  Removed:     src/include md5.h
  Log:
  Rename md5.h -> ap_md5.h to avoid local conflicts.
  Submitted by:	Randy Terbush <randy@covalent.net>
  Reviewed by:	Brian Behlendorf, Dirk-Willem van Gulik
  
  Revision  Changes    Path
  1.27      +1 -1      apache-1.3/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.dsp,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ApacheCore.dsp	1998/04/09 08:20:18	1.26
  +++ ApacheCore.dsp	1998/05/29 18:20:34	1.27
  @@ -342,7 +342,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\include\md5.h
  +SOURCE=.\include\ap_md5.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.37      +6 -6      apache-1.3/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.mak,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- ApacheCore.mak	1998/04/09 08:20:18	1.36
  +++ ApacheCore.mak	1998/05/29 18:20:34	1.37
  @@ -707,7 +707,7 @@
   	".\include\http_request.h"\
   	".\include\http_vhost.h"\
   	".\include\httpd.h"\
  -	".\include\md5.h"\
  +	".\include\ap_md5.h"\
   	".\include\rfc1413.h"\
   	".\include\scoreboard.h"\
   	".\include\util_md5.h"\
  @@ -745,7 +745,7 @@
   	".\include\http_request.h"\
   	".\include\http_vhost.h"\
   	".\include\httpd.h"\
  -	".\include\md5.h"\
  +	".\include\ap_md5.h"\
   	".\include\rfc1413.h"\
   	".\include\scoreboard.h"\
   	".\include\util_md5.h"\
  @@ -1090,7 +1090,7 @@
   DEP_CPP_MD5C_=\
   	".\include\conf.h"\
   	".\include\hsregex.h"\
  -	".\include\md5.h"\
  +	".\include\ap_md5.h"\
   	".\os\win32\os.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
  @@ -1108,7 +1108,7 @@
   DEP_CPP_MD5C_=\
   	".\include\conf.h"\
   	".\include\hsregex.h"\
  -	".\include\md5.h"\
  +	".\include\ap_md5.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -2515,7 +2515,7 @@
   	".\include\conf.h"\
   	".\include\hsregex.h"\
   	".\include\httpd.h"\
  -	".\include\md5.h"\
  +	".\include\ap_md5.h"\
   	".\include\util_md5.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
  @@ -2542,7 +2542,7 @@
   	".\include\conf.h"\
   	".\include\hsregex.h"\
   	".\include\httpd.h"\
  -	".\include\md5.h"\
  +	".\include\ap_md5.h"\
   	".\include\util_md5.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
  
  
  
  1.877     +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.876
  retrieving revision 1.877
  diff -u -r1.876 -r1.877
  --- CHANGES	1998/05/29 08:32:36	1.876
  +++ CHANGES	1998/05/29 18:20:34	1.877
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3b8
   
  +  *) Rename md5.h to ap_md5.h to avoid conflicts with native MD5 on
  +     some systems. [Randy Terbush]
  +
     *) Change usage of perror()+fprintf(stderr,...) in mod_rewrite to
        more proper ap_log_error() variants.
        [Ralf S. Engelschall]
  
  
  
  1.15      +1 -1      apache-1.3/src/include/util_md5.h
  
  Index: util_md5.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/util_md5.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- util_md5.h	1998/05/03 17:31:11	1.14
  +++ util_md5.h	1998/05/29 18:20:49	1.15
  @@ -62,7 +62,7 @@
   extern "C" {
   #endif
   
  -#include "md5.h"
  +#include "ap_md5.h"
   
   API_EXPORT(char *) ap_md5(pool *a, unsigned char *string);
   API_EXPORT(char *) ap_md5contextTo64(pool *p, AP_MD5_CTX * context);
  
  
  
  1.1                  apache-1.3/src/include/ap_md5.h
  
  Index: ap_md5.h
  ===================================================================
  /*
   * This is work is derived from material Copyright RSA Data Security, Inc.
   *
   * The RSA copyright statement and Licence for that original material is
   * included below. This is followed by the Apache copyright statement and
   * licence for the modifications made to that material.
   */
  
  /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
     rights reserved.
  
     License to copy and use this software is granted provided that it
     is identified as the "RSA Data Security, Inc. MD5 Message-Digest
     Algorithm" in all material mentioning or referencing this software
     or this function.
  
     License is also granted to make and use derivative works provided
     that such works are identified as "derived from the RSA Data
     Security, Inc. MD5 Message-Digest Algorithm" in all material
     mentioning or referencing the derived work.
  
     RSA Data Security, Inc. makes no representations concerning either
     the merchantability of this software or the suitability of this
     software for any particular purpose. It is provided "as is"
     without express or implied warranty of any kind.
  
     These notices must be retained in any copies of any part of this
     documentation and/or software.
   */
  
  /* ====================================================================
   * Copyright (c) 1996-1998 The Apache Group.  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 Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * 4. The names "Apache Server" and "Apache Group" 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 Group.
   *
   * 6. Redistributions of any form whatsoever must retain the following
   *    acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``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 GROUP 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 Apache Group and was originally based
   * on public domain software written at the National Center for
   * Supercomputing Applications, University of Illinois, Urbana-Champaign.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see <http://www.apache.org/>.
   *
   */
  
  #ifndef APACHE_MD5_H
  #define APACHE_MD5_H
  
  #ifdef __cplusplus
  extern "C" {
  #endif
  
  /* MD5.H - header file for MD5C.C */
  
  /* UINT4 defines a four byte word */
  typedef unsigned int UINT4;
  
  /* MD5 context. */
  typedef struct {
      UINT4 state[4];		/* state (ABCD) */
      UINT4 count[2];		/* number of bits, modulo 2^64 (lsb first) */
      unsigned char buffer[64];	/* input buffer */
  } AP_MD5_CTX;
  
  API_EXPORT(void) ap_MD5Init(AP_MD5_CTX * context);
  API_EXPORT(void) ap_MD5Update(AP_MD5_CTX * context, const unsigned char *input,
  			   unsigned int inputLen);
  API_EXPORT(void) ap_MD5Final(unsigned char digest[16], AP_MD5_CTX * context);
  
  #ifdef __cplusplus
  }
  #endif
  
  #endif	/* !APACHE_MD5_H */
  
  
  
  1.28      +3 -3      apache-1.3/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Makefile.tmpl	1998/05/10 13:04:30	1.27
  +++ Makefile.tmpl	1998/05/29 18:20:54	1.28
  @@ -82,7 +82,7 @@
    $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
    $(INCDIR)/http_conf_globals.h $(INCDIR)/http_vhost.h \
    $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \
  - $(INCDIR)/util_md5.h $(INCDIR)/md5.h $(INCDIR)/scoreboard.h \
  + $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h $(INCDIR)/scoreboard.h \
    $(INCDIR)/fnmatch.h
   http_log.o: http_log.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
    $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  @@ -114,7 +114,7 @@
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_conf_globals.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_vhost.h $(INCDIR)/http_protocol.h
  -md5c.o: md5c.c $(INCDIR)/conf.h $(OSDIR)/os.h $(INCDIR)/md5.h
  +md5c.o: md5c.c $(INCDIR)/conf.h $(OSDIR)/os.h $(INCDIR)/ap_md5.h
   rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
    $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \
  @@ -127,7 +127,7 @@
    $(INCDIR)/util_date.h
   util_md5.o: util_md5.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
    $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/util_md5.h $(INCDIR)/md5.h
  + $(INCDIR)/util_uri.h $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h
   util_script.o: util_script.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
    $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  
  
  
  1.15      +1 -1      apache-1.3/src/main/md5c.c
  
  Index: md5c.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/md5c.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- md5c.c	1998/05/13 15:31:02	1.14
  +++ md5c.c	1998/05/29 18:20:54	1.15
  @@ -91,7 +91,7 @@
   #include <string.h>
   
   #include "conf.h"
  -#include "md5.h"
  +#include "ap_md5.h"
   #ifdef CHARSET_EBCDIC
   #include "ebcdic.h"
   #endif /*CHARSET_EBCDIC*/
  
  
  
  1.12      +4 -4      apache-1.3/src/modules/proxy/ApacheModuleProxy.mak
  
  Index: ApacheModuleProxy.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/ApacheModuleProxy.mak,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ApacheModuleProxy.mak	1998/04/09 08:20:27	1.11
  +++ ApacheModuleProxy.mak	1998/05/29 18:20:58	1.12
  @@ -269,7 +269,7 @@
   	"..\..\include\http_main.h"\
   	"..\..\include\http_protocol.h"\
   	"..\..\include\httpd.h"\
  -	"..\..\include\md5.h"\
  +	"..\..\include\ap_md5.h"\
   	"..\..\include\multithread.h"\
   	"..\..\include\util_date.h"\
   	"..\..\include\util_uri.h"\
  @@ -303,7 +303,7 @@
   	"..\..\include\http_main.h"\
   	"..\..\include\http_protocol.h"\
   	"..\..\include\httpd.h"\
  -	"..\..\include\md5.h"\
  +	"..\..\include\ap_md5.h"\
   	"..\..\include\multithread.h"\
   	"..\..\include\util_date.h"\
   	"..\..\include\util_uri.h"\
  @@ -507,7 +507,7 @@
   	"..\..\include\http_main.h"\
   	"..\..\include\http_protocol.h"\
   	"..\..\include\httpd.h"\
  -	"..\..\include\md5.h"\
  +	"..\..\include\ap_md5.h"\
   	"..\..\include\multithread.h"\
   	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
  @@ -539,7 +539,7 @@
   	"..\..\include\http_main.h"\
   	"..\..\include\http_protocol.h"\
   	"..\..\include\httpd.h"\
  -	"..\..\include\md5.h"\
  +	"..\..\include\ap_md5.h"\
   	"..\..\include\multithread.h"\
   	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
  
  
  
  1.18      +2 -2      apache-1.3/src/modules/proxy/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/Makefile.tmpl,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Makefile.tmpl	1998/05/12 12:13:53	1.17
  +++ Makefile.tmpl	1998/05/29 18:20:58	1.18
  @@ -64,7 +64,7 @@
    $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
    $(INCDIR)/explain.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_main.h $(INCDIR)/util_date.h \
  - $(INCDIR)/multithread.h $(INCDIR)/md5.h
  + $(INCDIR)/multithread.h $(INCDIR)/ap_md5.h
   proxy_connect.o: proxy_connect.c mod_proxy.h $(INCDIR)/httpd.h \
    $(INCDIR)/conf.h $(OSDIR)/os.h $(INCDIR)/alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  @@ -87,5 +87,5 @@
    $(INCDIR)/conf.h $(OSDIR)/os.h $(INCDIR)/alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
  - $(INCDIR)/explain.h $(INCDIR)/http_main.h $(INCDIR)/md5.h \
  + $(INCDIR)/explain.h $(INCDIR)/http_main.h $(INCDIR)/ap_md5.h \
    $(INCDIR)/multithread.h $(INCDIR)/http_log.h
  
  
  
  1.41      +1 -1      apache-1.3/src/modules/proxy/proxy_cache.c
  
  Index: proxy_cache.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- proxy_cache.c	1998/05/27 22:56:04	1.40
  +++ proxy_cache.c	1998/05/29 18:20:58	1.41
  @@ -67,7 +67,7 @@
   #include <utime.h>
   #endif /* WIN32 */
   #include "multithread.h"
  -#include "md5.h"
  +#include "ap_md5.h"
   
   DEF_Explain
   
  
  
  
  1.62      +1 -1      apache-1.3/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- proxy_util.c	1998/05/27 22:56:05	1.61
  +++ proxy_util.c	1998/05/29 18:20:59	1.62
  @@ -58,7 +58,7 @@
   /* Utility routines for Apache proxy */
   #include "mod_proxy.h"
   #include "http_main.h"
  -#include "md5.h"
  +#include "ap_md5.h"
   #include "multithread.h"
   #include "http_log.h"
   #include "util_uri.h"
  
  
  
  1.12      +2 -2      apache-1.3/src/os/win32/ApacheModuleDigest.mak
  
  Index: ApacheModuleDigest.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleDigest.mak,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ApacheModuleDigest.mak	1998/04/09 08:20:31	1.11
  +++ ApacheModuleDigest.mak	1998/05/29 18:21:03	1.12
  @@ -191,7 +191,7 @@
   	"..\..\include\http_log.h"\
   	"..\..\include\http_protocol.h"\
   	"..\..\include\httpd.h"\
  -	"..\..\include\md5.h"\
  +	"..\..\include\ap_md5.h"\
   	"..\..\include\util_md5.h"\
   	"..\..\include\util_uri.h"\
   	".\os.h"\
  @@ -222,7 +222,7 @@
   	"..\..\include\http_log.h"\
   	"..\..\include\http_protocol.h"\
   	"..\..\include\httpd.h"\
  -	"..\..\include\md5.h"\
  +	"..\..\include\ap_md5.h"\
   	"..\..\include\util_md5.h"\
   	"..\..\include\util_uri.h"\
   	".\os.h"\
  
  
  
  1.8       +1 -1      apache-1.3/src/os/win32/installer/apache.iwz
  
  Index: apache.iwz
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/installer/apache.iwz,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apache.iwz	1998/05/23 17:16:28	1.7
  +++ apache.iwz	1998/05/29 18:21:09	1.8
  @@ -360,7 +360,7 @@
   Group12File14=C:\Apache\src\include\http_protocol.h
   Group12File15=C:\Apache\src\include\http_request.h
   Group12File16=C:\Apache\src\include\http_vhost.h
  -Group12File17=C:\Apache\src\include\md5.h
  +Group12File17=C:\Apache\src\include\ap_md5.h
   Group12File18=C:\Apache\src\include\multithread.h
   Group12File19=C:\Apache\src\include\rfc1413.h
   Group12File20=C:\Apache\src\include\scoreboard.h
  
  
  
  1.22      +1 -1      apache-1.3/src/support/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/support/Makefile.tmpl,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Makefile.tmpl	1998/05/24 11:02:46	1.21
  +++ Makefile.tmpl	1998/05/29 18:21:15	1.22
  @@ -64,7 +64,7 @@
   # DO NOT REMOVE
   ab.o: ab.c $(INCDIR)/conf.h $(OSDIR)/os.h
   htdigest.o: htdigest.c $(INCDIR)/conf.h $(OSDIR)/os.h \
  - ../main/md5c.c $(INCDIR)/md5.h
  + ../main/md5c.c $(INCDIR)/ap_md5.h
   htpasswd.o: htpasswd.c $(INCDIR)/conf.h $(OSDIR)/os.h
   logresolve.o: logresolve.c $(INCDIR)/conf.h $(OSDIR)/os.h
   rotatelogs.o: rotatelogs.c $(INCDIR)/conf.h $(OSDIR)/os.h
  
  
  

Mime
View raw message