date:19980906

cvs commit: apache-1.3/src/main util.c

1998-09-06 Thread marc

marc98/09/06 13:03:36

  Modified:src/main util.c
  Log:
  fix typo hidden behind DEFINE.
  
  PR: 2945
  Submitted by: Larry Lipsmeyer <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.132 +2 -1  apache-1.3/src/main/util.c
  
  Index: util.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- util.c1998/09/03 17:09:30 1.131
  +++ util.c1998/09/06 20:03:35 1.132
  @@ -701,7 +701,8 @@
   API_EXPORT(int) ap_cfg_closefile(configfile_t *cfp)
   {
   #ifdef DEBUG
  -ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, "Done with 
config file %s", fp->name);
  +ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, 
  +"Done with config file %s", cfp->name);
   #endif
   return (cfp->close == NULL) ? 0 : cfp->close(cfp->param);
   }

cvs commit: apache-1.3/src/os/unix Makefile.tmpl

1998-09-06 Thread ben

ben 98/09/06 12:24:28

  Modified:src  Makefile.tmpl
   src/ap   Makefile.tmpl
   src/main Makefile.tmpl
   src/modules/standard Makefile.tmpl
   src/os/unix Makefile.tmpl
  Log:
  Update dependencies.
  
  Revision  ChangesPath
  1.104 +6 -5  apache-1.3/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- Makefile.tmpl 1998/07/25 11:30:18 1.103
  +++ Makefile.tmpl 1998/09/06 19:24:25 1.104
  @@ -111,10 +111,11 @@
   $(OBJS): Makefile subdirs
   
   # DO NOT REMOVE
  -buildmark.o: buildmark.c include/ap_config.h include/ap_config_auto.h \
  - os/unix/os.h include/ap_ctype.h include/hsregex.h include/httpd.h \
  - include/alloc.h include/buff.h include/ap.h include/util_uri.h
  -modules.o: modules.c include/httpd.h include/ap_config.h \
  +buildmark.o: buildmark.c include/ap_config.h include/ap_mmn.h \
include/ap_config_auto.h os/unix/os.h include/ap_ctype.h \
  - include/hsregex.h include/alloc.h include/buff.h include/ap.h \
  + include/httpd.h include/alloc.h include/buff.h include/ap.h \
  + include/util_uri.h
  +modules.o: modules.c include/httpd.h include/ap_config.h \
  + include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \
  + include/ap_ctype.h include/alloc.h include/buff.h include/ap.h \
include/util_uri.h include/http_config.h
  
  
  
  1.29  +13 -13apache-1.3/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Makefile.tmpl 1998/08/04 13:32:19 1.28
  +++ Makefile.tmpl 1998/09/06 19:24:26 1.29
  @@ -40,25 +40,25 @@
   
   # DO NOT REMOVE
   ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h
   ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h
  -ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  +ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/fnmatch.h
  +ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h
   ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h
   ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h
  -ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
  
  
  
  1.33  +42 -40apache-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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Makefile.tmpl 1998/08/04 13:32:20 1.32
  +++ Makefile.tmpl 1998/09/06 19:24:27 1.33
  @@ -59,30 +59,31 @@
   
   # DO NOT REMOVE
   alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(IN

cvs commit: apache-1.3/src/include ap_mmn.h

1998-09-06 Thread ben

ben 98/09/06 12:23:52

  Modified:src/include ap_mmn.h
  Log:
  Bump MMN for binary MD5.
  
  Revision  ChangesPath
  1.7   +3 -2  apache-1.3/src/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ap_mmn.h  1998/08/31 19:51:58 1.6
  +++ ap_mmn.h  1998/09/06 19:23:51 1.7
  @@ -176,12 +176,13 @@
*ap_proxy_read_headers() and rdcache() to use a
*request_rec* instead of pool*
*(for implementing better error reporting).
  + * 19980906 (1.3.2-dev) - added ap_md5_binary()
*/
   
   #ifndef MODULE_MAGIC_NUMBER_MAJOR
  -#define MODULE_MAGIC_NUMBER_MAJOR 19980825
  +#define MODULE_MAGIC_NUMBER_MAJOR 19980906
   #endif
  -#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
  +#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
   #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward 
compat */
   
   /* Useful for testing for features. */

cvs commit: apache-1.3/htdocs/manual/mod mod_status.html

1998-09-06 Thread marc

marc98/09/06 12:00:41

  Modified:htdocs/manual/mod mod_status.html
  Log:
  ExtendedStatus is first in 1.3.2, _NOT_ 1.3.  Please be careful when
  noting such things to avoid confused users.
  
  Revision  ChangesPath
  1.15  +1 -1  apache-1.3/htdocs/manual/mod/mod_status.html
  
  Index: mod_status.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_status.html,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_status.html   1998/08/11 17:33:48 1.14
  +++ mod_status.html   1998/09/06 19:00:41 1.15
  @@ -73,7 +73,7 @@
HREF="directive-dict.html#Compatibility"
REL="Help"
   >Compatibility: ExtendedStatus is only available
  - in Apache 1.3 and later
  + in Apache 1.3.2 and later
   
   
   This directive controls whether the server keeps track of extended

cvs commit: apache-1.3/src/main util_md5.c

1998-09-06 Thread ben

ben 98/09/06 10:12:19

  Modified:src/include util_md5.h
   src/main util_md5.c
  Log:
  Add binary MD5.
  Reviewed by:  Martin Kraemer
  
  Revision  ChangesPath
  1.16  +2 -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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- util_md5.h1998/05/29 18:20:49 1.15
  +++ util_md5.h1998/09/06 17:12:18 1.16
  @@ -64,7 +64,8 @@
   
   #include "ap_md5.h"
   
  -API_EXPORT(char *) ap_md5(pool *a, unsigned char *string);
  +API_EXPORT(char *) ap_md5(pool *a, const unsigned char *string);
  +API_EXPORT(char *) ap_md5_binary(pool *a, const unsigned char *buf, int len);
   API_EXPORT(char *) ap_md5contextTo64(pool *p, AP_MD5_CTX * context);
   API_EXPORT(char *) ap_md5digest(pool *p, FILE *infile);
   
  
  
  
  1.15  +7 -2  apache-1.3/src/main/util_md5.c
  
  Index: util_md5.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/util_md5.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- util_md5.c1998/04/11 12:00:32 1.14
  +++ util_md5.c1998/09/06 17:12:18 1.15
  @@ -87,7 +87,7 @@
   #include "httpd.h"
   #include "util_md5.h"
   
  -API_EXPORT(char *) ap_md5(pool *p, unsigned char *string)
  +API_EXPORT(char *) ap_md5_binary(pool *p, const unsigned char *buf, int 
length)
   {
   AP_MD5_CTX my_md5;
   unsigned char hash[16];
  @@ -99,7 +99,7 @@
*/
   
   ap_MD5Init(&my_md5);
  -ap_MD5Update(&my_md5, string, strlen((const char *) string));
  +ap_MD5Update(&my_md5, buf, length);
   ap_MD5Final(hash, &my_md5);
   
   for (i = 0, r = result; i < 16; i++, r += 2)
  @@ -107,6 +107,11 @@
   *r = '\0';
   
   return ap_pstrdup(p, result);
  +}
  +
  +API_EXPORT(char *) ap_md5(pool *p, const unsigned char *string)
  +{
  +return ap_md5_binary(p, string, strlen(string));
   }
   
   /* these portions extracted from mpack, John G. Myers - [EMAIL PROTECTED] */

cvs commit: apache-1.3/src/main util.c

cvs commit: apache-1.3/src/os/unix Makefile.tmpl

cvs commit: apache-1.3/src/include ap_mmn.h

cvs commit: apache-1.3/htdocs/manual/mod mod_status.html

cvs commit: apache-1.3/src/main util_md5.c

5 matches

Site Navigation

Mail list logo

Footer information