cvs commit: apache-apr/pthreads/src/main buff.c

1999-06-04 Thread manoj
manoj   99/06/03 16:37:45

  Modified:pthreads/src/main buff.c
  Log:
  Now, {send,recv}withtimeout can handle both non-blocking I/O (timeout =
  0), and fully blocking I/O (timeout = -1). This makes these routines
  look more like the APR functions.
  
  Revision  ChangesPath
  1.10  +6 -6  apache-apr/pthreads/src/main/buff.c
  
  Index: buff.c
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/main/buff.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- buff.c1999/06/01 21:36:03 1.9
  +++ buff.c1999/06/03 23:37:44 1.10
  @@ -126,18 +126,18 @@
   int err = EAGAIN;
   int rv;
   
  -tv.tv_sec = sec;
  -if (tv.tv_sec == 0) {
  +if (sec == -1) {
   return (write(sock, buf, len));
   }
   ap_bnonblock(sock);
   rv = write(sock, buf, len);
   
  -if (rv == -1) {
  +if (rv == -1  sec != 0) {
   err = errno;
if (err == EAGAIN || errno == EINTR) {
FD_ZERO(fdset);
FD_SET(sock, fdset);
  +tv.tv_sec = sec;
tv.tv_usec = 0;
   do {
rv = select(FD_SETSIZE, NULL, fdset, NULL, tv);
  @@ -161,17 +161,17 @@
   int err = EAGAIN;
   int rv;
   
  -tv.tv_sec = sec;
  -if (tv.tv_sec == 0) {
  +if (sec == -1) {
return (read(sock, buf, len));
   }
   ap_bnonblock(sock);
   rv = read(sock, buf, len);
  -if (rv == -1) {
  +if (rv == -1  sec != 0) {
err = errno;
if (err == EAGAIN || errno == EINTR) {
FD_ZERO(fdset);
FD_SET(sock, fdset);
  +tv.tv_sec = sec;
tv.tv_usec = 0;
do {
   rv = select(FD_SETSIZE, fdset, NULL, NULL, tv);
  
  
  


cvs commit: apache-apr/pthreads/src/modules/standard mod_cgi.c mod_mime_magic.c

1999-06-04 Thread manoj
manoj   99/06/03 16:46:28

  Modified:pthreads/src CHANGES
   pthreads/src/include buff.h http_main.h
   pthreads/src/main buff.c http_main.c http_protocol.c
util_script.c
   pthreads/src/modules/proxy proxy_cache.c proxy_ftp.c
proxy_http.c proxy_util.c
   pthreads/src/modules/standard mod_cgi.c mod_mime_magic.c
  Log:
  Replace the existing timeout-setting mechanism. Now, instead of passing
  a timeout interval to every buff call, we set the timeout value for each
  buff once using bsetopt().
  
  Revision  ChangesPath
  1.7   +4 -7  apache-apr/pthreads/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/CHANGES,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- CHANGES   1999/04/12 15:06:23 1.6
  +++ CHANGES   1999/06/03 23:46:19 1.7
  @@ -1,4 +1,8 @@
   Changes with Apache apr
  +  *) New buff option added: BO_TIMEOUT. It describes the timeout for
  + buff operations (generally over a network). [Dean Gaudet, Ryan
  + Bloom, Manoj Kasichainula]
  +
 *) Created http_accept abstraction. Added 4 new functions (not exported):
init_accept(), begin_accepting_requests(), get_request(), 
stop_accepting_requests() [Bill Stoddard [EMAIL PROTECTED]
  @@ -8,13 +12,6 @@
   
 *) user and ap_auth_type fields were moved from connection_rec to 
request_rec. [Ryan Bloom [EMAIL PROTECTED] 
  -
  -  *) Argument added to ap_bgets, ap_bwrite, buff_read, buff_write, saferead,
  - read_with_errors, write_it_all, write_with_errors, bcwrite.  This 
argument
  - is the seconds argument, if zero the call blocks and trys to read or 
write
  - the data until an error occurs, or until it is successful.  If non-zero,
  - the call reads or writes for n seconds, or until it is successful. [Ryan
  - Bloom [EMAIL PROTECTED]
   
 *) Sendwithtimeout and recvwithtimeout calls added to non-Windows 
platforms.
This brings the code path closer together for all platforms. [Ryan Bloom
  
  
  
  1.5   +3 -2  apache-apr/pthreads/src/include/buff.h
  
  Index: buff.h
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/include/buff.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- buff.h1999/04/09 04:10:35 1.4
  +++ buff.h1999/06/03 23:46:21 1.5
  @@ -120,6 +120,7 @@
   #ifdef WIN32
   HANDLE hFH;  /* Windows filehandle */
   #endif
  +time_t timeout;  /* timeout for B_SOCKET operations */
   
   /* transport handle, for RPC binding handle or some such */
   void *t_handle;
  @@ -165,10 +166,10 @@
   
   /* I/O */
   API_EXPORT(int) ap_bread(BUFF *fb, void *buf, int nbyte);
  -API_EXPORT(int) ap_bgets(char *s, int n, BUFF *fb, time_t sec);
  +API_EXPORT(int) ap_bgets(char *s, int n, BUFF *fb);
   API_EXPORT(int) ap_blookc(char *buff, BUFF *fb);
   API_EXPORT(int) ap_bskiplf(BUFF *fb);
  -API_EXPORT(int) ap_bwrite(BUFF *fb, const void *buf, int nbyte, time_t sec);
  +API_EXPORT(int) ap_bwrite(BUFF *fb, const void *buf, int nbyte);
   API_EXPORT(int) ap_bflush(BUFF *fb);
   API_EXPORT(int) ap_bputs(const char *x, BUFF *fb);
   API_EXPORT(int) ap_bvputs(BUFF *fb,...);
  
  
  
  1.7   +0 -1  apache-apr/pthreads/src/include/http_main.h
  
  Index: http_main.h
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/include/http_main.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- http_main.h   1999/05/24 02:10:25 1.6
  +++ http_main.h   1999/06/03 23:46:21 1.7
  @@ -120,7 +120,6 @@
   void ap_start_shutdown(void);
   void ap_start_restart(int);
   void ap_keepalive_timeout(char *, request_rec *);
  -int ap_get_timeout(request_rec *r);
   
   API_EXPORT(void) ap_child_terminate(request_rec *r);
   int ap_update_child_status(int child_num, int thread_num, int status, 
request_rec *r);
  
  
  
  1.11  +48 -39apache-apr/pthreads/src/main/buff.c
  
  Index: buff.c
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/main/buff.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -u -r1.10 -r1.11
  --- buff.c1999/06/03 23:37:44 1.10
  +++ buff.c1999/06/03 23:46:22 1.11
  @@ -236,10 +236,11 @@
   fb-outcnt = 0;
   fb-outchunk = -1;
   fb-error = NULL;
  -fb-bytes_sent = 0L;
  +fb-bytes_sent = 0;
   
   fb-fd = -1;
   fb-fd_in = -1;
  +fb-timeout = -1;
   
   #ifdef B_SFIO
   fb-sf_in = NULL;
  @@ -264,29 +265,37 @@
   
   API_EXPORT(int) ap_bsetopt(BUFF *fb, int optname, const void *optval)
   {
  -if (optname == 

cvs commit: apache-1.3/src CHANGES

1999-06-04 Thread jim
jim 99/06/03 17:21:39

  Modified:src  CHANGES
  Log:
  Hmmm... forgot to add this
  
  Revision  ChangesPath
  1.1368+6 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1367
  retrieving revision 1.1368
  diff -u -r1.1367 -r1.1368
  --- CHANGES   1999/06/03 15:42:33 1.1367
  +++ CHANGES   1999/06/04 00:21:36 1.1368
  @@ -1,5 +1,11 @@
   Changes with Apache 1.3.7
   
  +  *) The source is now quad (long long) aware as needed. Specifically,
  + the Configure process determines the correct size of off_t and
  + *void. When the OS/platform/compiler supports quads, ap_snprintf()
  + provides for the 'q' format qualifier (if quads are not available,
  + 'q' is silently demoted to long). [Jim Jagielski]
  +
 *) When the username or password fed to htpasswd is too long, include the
size limit in the error message.  Also report illegal characters
(currently only ':') in the username.  Add the size restrictions
  
  
  


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

1999-06-04 Thread bjh
bjh 99/06/03 21:43:49

  Modified:src/main http_main.c
  Log:
  Code to force linking of Expat shouldn't be in the shared core loader.
  
  Revision  ChangesPath
  1.443 +1 -1  apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.442
  retrieving revision 1.443
  diff -u -r1.442 -r1.443
  --- http_main.c   1999/06/02 18:26:10 1.442
  +++ http_main.c   1999/06/04 04:43:45 1.443
  @@ -6520,7 +6520,7 @@
   #endif /* ndef SHARED_CORE_BOOTSTRAP */
   
   /* force Expat to be linked into the server executable */
  -#ifdef USE_EXPAT
  +#if defined(USE_EXPAT)  !defined(SHARED_CORE_BOOTSTRAP)
   #include xmlparse.h
   const XML_LChar *suck_in_expat(void);
   const XML_LChar *suck_in_expat(void)
  
  
  


cvs commit: apache-apr/apr/misc/os2 - New directory

1999-06-04 Thread bjh
bjh 99/06/04 05:47:34

  apache-apr/apr/misc/os2 - New directory


cvs commit: apache-apr/apr/locks/os2 - New directory

1999-06-04 Thread bjh
bjh 99/06/04 05:49:16

  apache-apr/apr/locks/os2 - New directory


cvs commit: apache-apr/apr/network_io/os2 - New directory

1999-06-04 Thread bjh
bjh 99/06/04 05:52:00

  apache-apr/apr/network_io/os2 - New directory


cvs commit: apache-apr/apr/threadproc/os2 - New directory

1999-06-04 Thread bjh
bjh 99/06/04 05:55:17

  apache-apr/apr/threadproc/os2 - New directory


cvs commit: apache-apr/apr/time/os2 - New directory

1999-06-04 Thread bjh
bjh 99/06/04 06:03:14

  apache-apr/apr/time/os2 - New directory


cvs commit: apache-apr/apr/file_io/os2 dir.c fileacc.c pipe.c fileio.h filedup.c filestat.c maperrorcode.c open.c readwrite.c seek.c

1999-06-04 Thread bjh
bjh 99/06/04 06:13:21

  Modified:apr/file_io/os2 filedup.c filestat.c maperrorcode.c open.c
readwrite.c seek.c
  Added:   apr/file_io/os2 dir.c fileacc.c pipe.c fileio.h
  Log:
  Update file_io lib for OS/2 to current spec.
  
  Revision  ChangesPath
  1.3   +14 -20apache-apr/apr/file_io/os2/filedup.c
  
  Index: filedup.c
  ===
  RCS file: /home/cvs/apache-apr/apr/file_io/os2/filedup.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- filedup.c 1999/05/10 14:36:22 1.2
  +++ filedup.c 1999/06/04 13:13:16 1.3
  @@ -53,39 +53,33 @@
*
*/
   
  +#include fileio.h
   #include apr_file_io.h
  -#include apr_general.h
  +#include apr_lib.h
   #include string.h
   
   #define INCL_DOS
   #include os2.h
   
  -ap_file_t *ap_dupfile(ap_file_t *old_file)
  +ap_status_t ap_dupfile(struct file_t *old_file, struct file_t **new_file)
   {
   int rv;
  -ap_file_t * new_file = (ap_file_t *)malloc(sizeof(ap_file_t));
  +struct file_t *dup_file = (struct file_t *)ap_palloc(old_file-cntxt, 
sizeof(struct file_t));
   
   if (new_file == NULL) {
  -errno = ENOMEM;
  -return NULL;
  +return APR_ENOMEM;
   } 
   
  -rv = DosDupHandle(old_file-filedes, (ULONG *)new_file-filedes);
  +rv = DosDupHandle(old_file-filedes, dup_file-filedes);
   
  -if ( rv ) {
  -errno = os2errno(rv);
  -free(new_file);
  -return NULL;
  +if (rv) {
  +return os2errno(rv);
   }
   
  -old_file-filedes = new_file-filedes; 
  -old_file-fname = strdup(new_file-fname);
  -old_file-buffered = new_file-buffered;
  -old_file-protection = new_file-protection;
  -old_file-user = new_file-user;
  -old_file-group = new_file-group;
  -old_file-size = new_file-size;
  -old_file-atime = new_file-atime;
  -old_file-mtime = new_file-mtime;
  -old_file-ctime = new_file-ctime;
  +dup_file-cntxt = old_file-cntxt;
  +dup_file-fname = ap_pstrdup(dup_file-cntxt, old_file-fname);
  +dup_file-buffered = old_file-buffered;
  +dup_file-status = old_file-status;
  +*new_file = dup_file;
  +return APR_SUCCESS;
   }
  
  
  
  1.3   +23 -36apache-apr/apr/file_io/os2/filestat.c
  
  Index: filestat.c
  ===
  RCS file: /home/cvs/apache-apr/apr/file_io/os2/filestat.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- filestat.c1999/05/10 14:36:22 1.2
  +++ filestat.c1999/06/04 13:13:17 1.3
  @@ -53,9 +53,10 @@
*
*/
   
  +#include fileio.h
   #include apr_file_io.h
  -#include apr_general.h
  -#include apr_errno.h
  +#include apr_lib.h
  +#include sys/time.h
   
   #define INCL_DOS
   #include os2.h
  @@ -90,47 +91,33 @@
 return mktime( tmpdate );
   }
   
  -ap_status_t ap_getfileinfo(char * fname, ap_file_t *thefile)
  -{
  -FILESTATUS3 info;
  -int rv = DosQueryPathInfo(fname, FIL_STANDARD, info, sizeof(info));
  +
   
  -if (rv == 0) {
  -thefile-protection = (info.attrFile  FILE_READONLY) ? 0555 : 0777;
  -thefile-user = 0;
  -thefile-group = 0;
  -thefile-size = info.cbFile;
  -thefile-atime = os2date2unix(info.fdateLastAccess, 
info.ftimeLastAccess);
  -thefile-mtime = os2date2unix(info.fdateLastWrite, 
info.ftimeLastWrite);
  -thefile-ctime = os2date2unix(info.fdateCreation, 
info.ftimeCreation);
  +ap_status_t ap_getfileinfo(struct file_t *thefile)
  +{
  +ULONG rc = DosQueryPathInfo(thefile-fname, FIL_STANDARD, 
thefile-status, sizeof(thefile-status));
  +
  +if (rc == 0) {
  +thefile-validstatus = TRUE;
   return APR_SUCCESS;
   }
  -else {
  -errno = ENOSTAT;
  -return APR_FAILURE;
  -}
  +
  +thefile-validstatus = FALSE;
  +return os2errno(rc);
   }
   
  -ap_status_t ap_updatefileinfo(ap_file_t *thefile)
  -{
  -FILESTATUS3 info;
  -int rv = DosQueryFileInfo(thefile-filedes, FIL_STANDARD, info, 
sizeof(info));
   
  -if (rv == 0) {
  -thefile-protection = (info.attrFile  FILE_READONLY) ? 0555 : 0777;
  -thefile-user = 0;
  -thefile-group = 0;
  -thefile-size = info.cbFile;
  -thefile-atime = os2date2unix(info.fdateLastAccess, 
info.ftimeLastAccess);
  -thefile-mtime = os2date2unix(info.fdateLastWrite, 
info.ftimeLastWrite);
  -thefile-ctime = os2date2unix(info.fdateCreation, 
info.ftimeCreation);
  +
  +ap_status_t ap_updatefileinfo(struct file_t *thefile)
  +{
  +ULONG rc = DosQueryFileInfo(thefile-filedes, FIL_STANDARD, 
thefile-status, sizeof(thefile-status));
  +
  +if (rc == 0) {
  +thefile-validstatus = TRUE;
   return APR_SUCCESS;
  -}
  -else {
  - 

cvs commit: apache-site/contributors index.html

1999-06-04 Thread mjc
mjc 99/06/04 06:34:53

  Modified:contributors index.html
  Log:
  Minor fixes
  
  Revision  ChangesPath
  1.72  +3 -3  apache-site/contributors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/contributors/index.html,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- index.html1999/05/07 17:42:16 1.71
  +++ index.html1999/06/04 13:34:52 1.72
  @@ -190,14 +190,14 @@
   P
   STRONGName:/STRONG A NAME=coxMark Cox/ABR
   STRONGemail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL 
PROTECTED]/ABR
  -STRONGURL:/STRONG A 
HREF=http://www.awe.com/~mark/;http://www.awe.com/~mark//ABR
  +STRONGURL:/STRONG A 
HREF=http://www.awe.com/mark/;http://www.awe.com/mark//ABR
   STRONGOrganization:/STRONG C2Net Europe, Ltd.BR
   STRONGOccupation:/STRONG Managing DirectorBR
  -STRONGLocation:/STRONG Leeds, EnglandBR
  +STRONGLocation:/STRONG Newbury, EnglandBR
   STRONGContributions:/STRONG Various patches, bug fixes, and DBM code 
alterations bringing
Apache in line with what we were using on www.telescope.org.  Cookie
module.  Server Status module.
  - Contributor to A HREF=http://www.apacheweek.com/;Apache Week/ABR
  + Editor of A HREF=http://www.apacheweek.com/;Apache Week/ABR
   
   P
   STRONGName:/STRONG A NAME=larsLars Eilebrecht/ABR
  
  
  


cvs commit: apache-apr/apr/time/os2 Makefile.in access.c atime.h time.c

1999-06-04 Thread bjh
bjh 99/06/04 07:57:46

  Added:   apr/time/os2 Makefile.in access.c atime.h time.c
  Log:
  OS/2 version of time library. Right now it's identical to the unix version.
  
  Revision  ChangesPath
  1.1  apache-apr/apr/time/os2/Makefile.in
  
  Index: Makefile.in
  ===
  #CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  #LIBS=$(EXTRA_LIBS) $(LIBS1)
  #INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  #LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ $(LDLIBS)
  INCDIR=../../include
  INCDIR1=../../../include
  INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
  
  LIB=../time.a
  
  OBJS=time.o \
access.o
  
  .c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $
  
  all: $(LIB)
  
  clean:
$(RM) -f *.o *.a *.so
  
  distclean: clean
-$(RM) -f Makefile
  
  $(OBJS): Makefile
  
  $(LIB): $(OBJS)
$(RM) -f $@
$(AR) cr $@ $(OBJS)
$(RANLIB) $@
  
  #
  # We really don't expect end users to use this rule.  It works only with
  # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
  # using it.
  #
  depend:
cp Makefile.in Makefile.in.bak \
 sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in  Makefile.new \
 gcc -MM $(INCLUDES) $(CFLAGS) *.c  Makefile.new \
 sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
   -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
 Makefile.in \
 rm Makefile.new
  
  # DO NOT REMOVE
  access.o: access.c atime.h ../../../include/apr_time.h \
   ../../../include/apr_general.h ../../../include/apr_errno.h \
   $(INCDIR)/apr_lib.h $(INCDIR)/apr_config.h \
   $(INCDIR)/hsregex.h
  time.o: time.c atime.h ../../../include/apr_time.h \
   ../../../include/apr_general.h ../../../include/apr_errno.h \
   $(INCDIR)/apr_lib.h $(INCDIR)/apr_config.h \
   $(INCDIR)/hsregex.h
  
  
  
  1.1  apache-apr/apr/time/os2/access.c
  
  Index: access.c
  ===
  /* 
   * Copyright (c) 1999 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
   *[EMAIL PROTECTED]
   *
   * 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.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see http://www.apache.org/.
   *
   */
  
  #include atime.h
  

cvs commit: apache-1.3/src/support log_server_status

1999-06-04 Thread coar
coar99/06/04 08:54:20

  Modified:src/support log_server_status
  Log:
{Sigh} %Y isn't universally accepted, so hack around it with
%y and some Y2K math.
  
  Revision  ChangesPath
  1.12  +5 -2  apache-1.3/src/support/log_server_status
  
  Index: log_server_status
  ===
  RCS file: /home/cvs/apache-1.3/src/support/log_server_status,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- log_server_status 1999/06/03 17:38:24 1.11
  +++ log_server_status 1999/06/04 15:54:19 1.12
  @@ -93,8 +93,11 @@
   ### Main
   
   {
  - $date=`date +%Y%m%d:%H%M%S`;
  - chop($date);
  +$year=`date +%y`;
  + chomp($year);
  + $year += ($year  70) ? 2000 : 1900;
  + $date = $year . `date +%m%d:%H%M%S`;
  + chomp($date);
($day,$time)=split(/:/,$date);
$res=tcp_connect($server,$port);
open(OUT,$wherelog$day);
  
  
  


cvs commit: apache-1.3 STATUS

1999-06-04 Thread coar
coar99/06/04 09:01:51

  Modified:.STATUS
  Log:
Update the patch list.
  
  Revision  ChangesPath
  1.696 +9 -1  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.695
  retrieving revision 1.696
  diff -u -r1.695 -r1.696
  --- STATUS1999/06/04 15:17:48 1.695
  +++ STATUS1999/06/04 16:01:47 1.696
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/04 15:17:48 $]
  +  Last modified at [$Date: 1999/06/04 16:01:47 $]
   
   Release:
   
  @@ -92,6 +92,14 @@
   
   
   Available Patches:
  +
  +* Ralf's [PATCH] to add EAPI to the base package
  + Message-ID: [EMAIL PROTECTED]
  + Status: Jim +1, Mark +1, Dean -0, BenH +1
  +
  +* Ralf's [PATCH] to add MM (shared memory API) to the base package
  + Message-ID: [EMAIL PROTECTED]
  + Status: 
   
   * Tony Finch's patch to support mass virtual hosting
Message-ID: [EMAIL PROTECTED]
  
  
  


cvs commit: apache-apr/apr/network_io/os2 Makefile.in networkio.h poll.c sendrecv.c sockets.c sockopt.c

1999-06-04 Thread bjh
bjh 99/06/04 09:15:59

  Added:   apr/network_io/os2 Makefile.in networkio.h poll.c sendrecv.c
sockets.c sockopt.c
  Log:
  OS/2 network_io library. Same as unix except for ap_poll. As OS/2 doesn't have
  a poll function it's implemented using select().
  
  Revision  ChangesPath
  1.1  apache-apr/apr/network_io/os2/Makefile.in
  
  Index: Makefile.in
  ===
  #CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  #LIBS=$(EXTRA_LIBS) $(LIBS1)
  #INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  #LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ $(LDLIBS)
  INCDIR=../../include
  INCDIR1=../../../include
  INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
  
  LIB=../network.a
  
  OBJS=poll.o \
sendrecv.o \
sockets.o \
sockopt.o \
  
  .c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $
  
  all: $(LIB)
  
  clean:
$(RM) -f *.o *.a *.so
  
  distclean: clean
-$(RM) -f Makefile
  
  $(OBJS): Makefile
  
  $(LIB): $(OBJS)
$(RM) -f $@
$(AR) cr $@ $(OBJS)
$(RANLIB) $@
  
  #
  # We really don't expect end users to use this rule.  It works only with
  # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
  # using it.
  #
  depend:
cp Makefile.in Makefile.in.bak \
 sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in  Makefile.new \
 gcc -MM $(INCLUDES) $(CFLAGS) *.c  Makefile.new \
 sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
   -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
 Makefile.in \
 rm Makefile.new
  
  # DO NOT REMOVE
  poll.o: poll.c ../../../include/apr_network_io.h \
   ../../../include/apr_general.h ../../../include/apr_errno.h \
   networkio.h
  sendrecv.o: sendrecv.c ../../../include/apr_errno.h \
   ../../../include/apr_general.h ../../../include/apr_network_io.h \
   networkio.h
  sockets.o: sockets.c ../../../include/apr_network_io.h \
   ../../../include/apr_general.h ../../../include/apr_errno.h \
   networkio.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_config.h \
   $(INCDIR)/hsregex.h
  sockopt.o: sockopt.c ../../../include/apr_network_io.h \
   ../../../include/apr_general.h ../../../include/apr_errno.h \
   networkio.h
  
  
  
  1.1  apache-apr/apr/network_io/os2/networkio.h
  
  Index: networkio.h
  ===
  /* 
   * Copyright (c) 1999 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
   *[EMAIL PROTECTED]
   *
   * 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, 

cvs commit: apache-apr/apr/file_io/os2 Makefile

1999-06-04 Thread bjh
bjh 99/06/04 09:28:32

  Removed: apr/file_io/os2 Makefile
  Log:
  Get rid of manually created Makefile


cvs commit: apache-apr/apr/file_io/os2 Makefile.in

1999-06-04 Thread bjh
bjh 99/06/04 09:37:48

  Added:   apr/file_io/os2 Makefile.in
  Log:
  Add Makefile template for OS/2 file_io
  
  Revision  ChangesPath
  1.1  apache-apr/apr/file_io/os2/Makefile.in
  
  Index: Makefile.in
  ===
  #CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  #LIBS=$(EXTRA_LIBS) $(LIBS1)
  #INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  #LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ $(LDLIBS)
  INCDIR=../../include
  INCDIR1=../../../include
  INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
  
  LIB=../file.a
  
  OBJS=dir.o \
fileacc.o \
filedup.o \
filestat.o \
open.o \
pipe.o \
readwrite.o \
seek.o \
maperrorcode.o
  
  .c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $
  
  all: $(LIB)
  
  clean:
$(RM) -f *.o *.a *.so
  
  distclean: clean
-$(RM) -f Makefile
  
  $(OBJS): Makefile
  
  $(LIB): $(OBJS)
$(RM) -f $@
$(AR) cr $@ $(OBJS)
$(RANLIB) $@
  
  #
  # We really don't expect end users to use this rule.  It works only with
  # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
  # using it.
  #
  depend:
cp Makefile.in Makefile.in.bak \
 sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in  Makefile.new \
 gcc -MM $(INCLUDES) $(CFLAGS) *.c  Makefile.new \
 sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
   -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
 Makefile.in \
 rm Makefile.new
  
  # DO NOT REMOVE
  dir.o: dir.c ../../../include/apr_file_io.h fileio.h \
   ../../../include/apr_errno.h ../../../include/apr_general.h
  fileacc.o: fileacc.c ../../../include/apr_file_io.h fileio.h \
   ../../../include/apr_errno.h ../../../include/apr_general.h
  filedup.o: filedup.c ../../../include/apr_file_io.h fileio.h \
   ../../../include/apr_errno.h ../../../include/apr_general.h
  filestat.o: filestat.c ../../../include/apr_file_io.h fileio.h \
   ../../../include/apr_errno.h ../../../include/apr_general.h
  open.o: open.c ../../../include/apr_file_io.h fileio.h \
   ../../../include/apr_errno.h ../../../include/apr_general.h \
   ../../include/apr_lib.h ../../include/apr_config.h \
   ../../include/hsregex.h
  pipe.o: pipe.c ../../../include/apr_file_io.h fileio.h \
   ../../../include/apr_errno.h ../../../include/apr_general.h
  readwrite.o: readwrite.c ../../../include/apr_file_io.h fileio.h \
   ../../../include/apr_errno.h ../../../include/apr_general.h
  seek.o: seek.c ../../../include/apr_file_io.h fileio.h \
   ../../../include/apr_errno.h ../../../include/apr_general.h
  
  
  


cvs commit: apache-1.3 STATUS

1999-06-04 Thread rse
rse 99/06/04 09:38:04

  Modified:.STATUS
  Log:
  The old stand-alone MM patch is obsolete. The MM glue code is now part of
  EAPI. And whether we include the MM source tree into src/lib/mm/ is a question
  which has to be voted on seperately...
  
  Revision  ChangesPath
  1.697 +2 -6  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.696
  retrieving revision 1.697
  diff -u -r1.696 -r1.697
  --- STATUS1999/06/04 16:01:47 1.696
  +++ STATUS1999/06/04 16:37:58 1.697
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/04 16:01:47 $]
  +  Last modified at [$Date: 1999/06/04 16:37:58 $]
   
   Release:
   
  @@ -93,13 +93,9 @@
   
   Available Patches:
   
  -* Ralf's [PATCH] to add EAPI to the base package
  +* Ralf's [PATCH] to add EAPI (ctx, hook, mm, etc.) to the base package
Message-ID: [EMAIL PROTECTED]
Status: Jim +1, Mark +1, Dean -0, BenH +1
  -
  -* Ralf's [PATCH] to add MM (shared memory API) to the base package
  - Message-ID: [EMAIL PROTECTED]
  - Status: 
   
   * Tony Finch's patch to support mass virtual hosting
Message-ID: [EMAIL PROTECTED]
  
  
  


cvs commit: apache-apr/apr/locks/os2 Makefile.in locks.c locks.h

1999-06-04 Thread bjh
bjh 99/06/04 09:40:23

  Added:   apr/locks/os2 Makefile.in locks.c locks.h
  Log:
  OS/2 locks library.
  
  Revision  ChangesPath
  1.1  apache-apr/apr/locks/os2/Makefile.in
  
  Index: Makefile.in
  ===
  #CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  #LIBS=$(EXTRA_LIBS) $(LIBS1)
  #INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  #LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ $(LDLIBS)
  INCDIR=../../include
  INCDIR1=../../../include
  INCDIR2=../../file_io/unix
  INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
  
  LIB=../lock.a
  
  OBJS=locks.o
  
  .c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $
  
  all: $(LIB)
  
  clean:
$(RM) -f *.o *.a *.so
  
  distclean: clean
-$(RM) -f Makefile
  
  $(OBJS): Makefile
  
  $(LIB): $(OBJS)
$(RM) -f $@
$(AR) cr $@ $(OBJS)
$(RANLIB) $@
  
  #
  # We really don't expect end users to use this rule.  It works only with
  # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
  # using it.
  #
  depend:
cp Makefile.in Makefile.in.bak \
 sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in  Makefile.new \
 gcc -MM $(INCLUDES) $(CFLAGS) *.c  Makefile.new \
 sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
   -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
 Makefile.in \
 rm Makefile.new
  
  # DO NOT REMOVE
  crossproc.o: crossproc.c ../../../include/apr_lock.h \
   ../../../include/apr_general.h ../../../include/apr_errno.h locks.h \
   ../../../include/apr_file_io.h ../../file_io/unix/fileio.h
  intraproc.o: intraproc.c ../../../include/apr_lock.h \
   ../../../include/apr_general.h ../../../include/apr_errno.h locks.h \
   ../../../include/apr_file_io.h ../../file_io/unix/fileio.h
  locks.o: locks.c ../../../include/apr_lock.h \
   ../../../include/apr_general.h ../../../include/apr_errno.h locks.h \
   ../../../include/apr_file_io.h ../../file_io/unix/fileio.h
  
  
  
  1.1  apache-apr/apr/locks/os2/locks.c
  
  Index: locks.c
  ===
  /* 
   * Copyright (c) 1999 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
   *[EMAIL PROTECTED]
   *
   * 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.
   * For more 

cvs commit: apache-apr/apr/misc/os2 Makefile.in misc.h start.c

1999-06-04 Thread bjh
bjh 99/06/04 09:43:06

  Added:   apr/misc/os2 Makefile.in misc.h start.c
  Log:
  Initial OS/2 misc library, same as unix version.
  
  Revision  ChangesPath
  1.1  apache-apr/apr/misc/os2/Makefile.in
  
  Index: Makefile.in
  ===
  #CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  #LIBS=$(EXTRA_LIBS) $(LIBS1)
  #INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  #LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ $(LDLIBS)
  INCDIR=../../include
  INCDIR1=../../../include
  INCDIR2=../../file_io/os2
  INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
  
  LIB=../misc.a
  
  OBJS=start.o \
  
  .c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $
  
  all: $(LIB)
  
  clean:
$(RM) -f *.o *.a *.so
  
  distclean: clean
-$(RM) -f Makefile
  
  $(OBJS): Makefile
  
  $(LIB): $(OBJS)
$(RM) -f $@
$(AR) cr $@ $(OBJS)
$(RANLIB) $@
  
  #
  # We really don't expect end users to use this rule.  It works only with
  # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
  # using it.
  #
  depend:
cp Makefile.in Makefile.in.bak \
 sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in  Makefile.new \
 gcc -MM $(INCLUDES) $(CFLAGS) *.c  Makefile.new \
 sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
   -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
 Makefile.in \
 rm Makefile.new
  
  # DO NOT REMOVE
  start.o: start.c ../../../include/apr_general.h \
   ../../../include/apr_errno.h ../../include/apr_pools.h \
   ../../include/apr_lib.h ../../include/apr_config.h \
   ../../include/hsregex.h
  
  
  
  1.1  apache-apr/apr/misc/os2/misc.h
  
  Index: misc.h
  ===
  /* 
   * Copyright (c) 1999 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
   *[EMAIL PROTECTED]
   *
   * 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.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see http://www.apache.org/.
   *
   */
  
  #ifndef MISC_H
  #define MISC_H
  
  #include apr_general.h
  #include apr_file_io.h
  #include apr_errno.h
  
  struct context_t {
  struct ap_pool_t *pool;
  ap_int16_t signal_safe;
  ap_int16_t cancel_safe;
  

cvs commit: apache-1.3 STATUS

1999-06-04 Thread dgaudet
dgaudet 99/06/04 09:49:14

  Modified:.STATUS
  Log:
  a sunny day here
  
  Revision  ChangesPath
  1.698 +5 -15 apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.697
  retrieving revision 1.698
  diff -u -r1.697 -r1.698
  --- STATUS1999/06/04 16:37:58 1.697
  +++ STATUS1999/06/04 16:49:10 1.698
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/04 16:37:58 $]
  +  Last modified at [$Date: 1999/06/04 16:49:10 $]
   
   Release:
   
  @@ -95,7 +95,7 @@
   
   * Ralf's [PATCH] to add EAPI (ctx, hook, mm, etc.) to the base package
Message-ID: [EMAIL PROTECTED]
  - Status: Jim +1, Mark +1, Dean -0, BenH +1
  + Status: Jim +1, Mark +1, Dean +1, BenH +1
   
   * Tony Finch's patch to support mass virtual hosting
Message-ID: [EMAIL PROTECTED]
  @@ -115,11 +115,11 @@
   * Aidan Cully's patch to allow assignment of 'ownership' of resources
 to either the server UID or the file's owner.
Message-ID: [EMAIL PROTECTED]
  - Status: Ken +1
  + Status: Ken +1, Dean +1
   
   * John Giannadrea's patch for ceiling on file size for mmap (PR#4122)
Message-ID: [EMAIL PROTECTED]
  - Status: Ken +1
  + Status: Ken +1, Dean +1
   
   * Keith Wannamaker's NT multiple services patch
Message-ID: [EMAIL PROTECTED]
  @@ -175,6 +175,7 @@
 please review the shared memory deep-level code.
   Doug: +1 on concept (untested)
   Lars: +1 on concept
  + Dean: isn't this superceded by EAPI?
   
   * Mark Bixby's freshening up the MPE/iX port (mostly APACI)
Message-ID: [EMAIL PROTECTED]
  @@ -251,17 +252,6 @@
   
   * general/3787: SERVER_PORT is always 80 if client comes to any port
 = needs review by the protocol guys, I think.
  -
  -* Someone other than Dean has to do a security/correctness review on
  -  psprintf(), bprintf(), and ap_snprintf().  In particular these routines
  -  do lots of fun pointer manipulations and such and possibly have 
overflow
  -  errors.  The respective flush_funcs also need to be exercised.
  -   o Jim's looked over the ap_snprintf() stuff (the changes that Dean
  - did to make thread-safe) and they look fine.
  -   o Laura La Gassa's looked over ap_vformatter  other related code
  -   o Martin did a source review as well.
  -   o Could still use 1 or 2 more sets of eyeballs.
  -   Status: Is this still valid??
   
   * Paul would like to see a 'gdbm' option because he uses
 it a lot.
  
  
  


cvs commit: apache-1.3 STATUS

1999-06-04 Thread dgaudet
dgaudet 99/06/04 10:00:27

  Modified:.STATUS
  Log:
  still sunny
  
  Revision  ChangesPath
  1.699 +6 -2  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.698
  retrieving revision 1.699
  diff -u -r1.698 -r1.699
  --- STATUS1999/06/04 16:49:10 1.698
  +++ STATUS1999/06/04 17:00:25 1.699
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/04 16:49:10 $]
  +  Last modified at [$Date: 1999/06/04 17:00:25 $]
   
   Release:
   
  @@ -69,7 +69,11 @@
 libraries are detected, but the ndbm include file was moved to
 /usr/include/db1
 Status: Ralf is looking at it
  -
  +
  +- graham legget has found that if he uses the 1.3.7-dev core, and
  +  the 1.3.6 proxy code (plus a small patch of his) he doesn't get
  +  the hangs he was reporting.  Something is broken in the 1.3.7-dev
  +  proxy.
   
   RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
   
  
  
  


cvs commit: apache-apr/apr Makefile.in

1999-06-04 Thread bjh
bjh 99/06/04 10:04:11

  Modified:apr  Makefile.in
  Log:
  Fix top level rule for 'clean'. It currently complains it doesn't know how
  to make 'rm'.
  
  Revision  ChangesPath
  1.8   +1 -1  apache-apr/apr/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/apache-apr/apr/Makefile.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.in   1999/05/21 13:02:27 1.7
  +++ Makefile.in   1999/06/04 17:04:10 1.8
  @@ -38,7 +38,7 @@
   all: Makefile $(MODULES) subdirs
@echo APR built.
   
  -clean: subdirs_clean \
  +clean: subdirs_clean
$(RM) -f *.o *.a *.so
   
   distclean: clean
  
  
  


cvs commit: apache-1.3/src/modules/standard mod_negotiation.c

1999-06-04 Thread dgaudet
dgaudet 99/06/04 10:15:53

  Modified:htdocs/manual content-negotiation.html
   src  CHANGES
   src/modules/standard mod_negotiation.c
  Log:
  This patch removes the processing of `mxb' parameters in Accept
  headers in mod_negotiation.  A second patch updates the manual to
  reflect this (mxb is not documented directly in the manual but support
  for it is implied in one place).
  
  Reasons for removing this feature:
  
  1) As currently implemented, the 'mxb' feature makes possible certain
  denial-of-service attacks on negotiated content.  These attacks are
  posssible for user communities which access an Apache server from
  behind a HTTP/1.1 proxy which implements `Vary' related optimisations.
  Plugging this denial of service hole without removing `mxb' is fairly
  expensive in terms of degrading caching efficiency.
  
  2) `mxb' is not in HTTP/1.0 or HTTP/1.1 or any other standard
  
  3) Nobody seems to make use of 'mxb'.  (Balachander Krishnamurthy
  kindly offered to grep some of his web traffic traces -- he did not
  find a single Accept with mxb in a whole day of recent traffic, nor in
  older traces)
  
  4) Removing a feature makes a nice change from adding features.
  
  Submitted by: Koen Holtman [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.22  +3 -4  apache-1.3/htdocs/manual/content-negotiation.html
  
  Index: content-negotiation.html
  ===
  RCS file: /home/cvs/apache-1.3/htdocs/manual/content-negotiation.html,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- content-negotiation.html  1999/03/19 21:23:19 1.21
  +++ content-negotiation.html  1999/06/04 17:15:48 1.22
  @@ -196,10 +196,9 @@
  for compress'd files, and CODEx-gzip/CODE for gzip'd files.
  The CODEx-/CODE prefix is ignored for encoding comparisons.
 DT CODEContent-Length:/CODE
  -  DD The size of the file.  Clients can ask to receive a given media
  -   type only if the variant isn't too big; specifying a content
  -   length in the map allows the server to compare against these
  -   thresholds without checking the actual file.
  +  DD The size of the file.  Specifying content
  +   lengths in the type-map allows the server to compare file sizes
  +   without checking the actual files.
 DT CODEDescription:/CODE
 DD A human-readable textual description of the variant.  If Apache cannot
  find any appropriate variant to return, it will return an error 
  
  
  
  1.1369+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1368
  retrieving revision 1.1369
  diff -u -r1.1368 -r1.1369
  --- CHANGES   1999/06/04 00:21:36 1.1368
  +++ CHANGES   1999/06/04 17:15:49 1.1369
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.7
   
  +  *) Remove mxb support from mod_negotiation -- it was a draft feature
  + never accepted into any standard, and it opens up certain DoS
  + attacks.  [Koen Holtman [EMAIL PROTECTED]]
  +
 *) The source is now quad (long long) aware as needed. Specifically,
the Configure process determines the correct size of off_t and
*void. When the OS/platform/compiler supports quads, ap_snprintf()
  
  
  
  1.99  +0 -23 apache-1.3/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- mod_negotiation.c 1999/03/19 21:23:24 1.98
  +++ mod_negotiation.c 1999/06/04 17:15:51 1.99
  @@ -140,7 +140,6 @@
   typedef struct accept_rec {
   char *name; /* MUST be lowercase */
   float quality;
  -float max_bytes;
   float level;
   char *charset;  /* for content-type only */
   } accept_rec;
  @@ -315,7 +314,6 @@
const char *accept_line)
   {
   result-quality = 1.0f;
  -result-max_bytes = 0.0f;
   result-level = 0.0f;
   result-charset = ;
   
  @@ -392,10 +390,6 @@
(parm[1] == '\0' || (parm[1] == 's'  parm[2] == '\0'))) {
   result-quality = atof(cp);
   }
  -else if (parm[0] == 'm'  parm[1] == 'x' 
  - parm[2] == 'b'  parm[3] == '\0') {
  -result-max_bytes = atof(cp);
  -}
   else if (parm[0] == 'l'  !strcmp(parm[1], evel)) {
   result-level = atof(cp);
   }
  @@ -613,7 +607,6 @@
   new_accept-name = */*;
   new_accept-quality = 1.0f;
   new_accept-level = 0.0f;
  -new_accept-max_bytes = 0.0f;
   }
   
   new_accept = (accept_rec *) 

cvs commit: apache-1.3/src/modules/standard mod_autoindex.c

1999-06-04 Thread coar
coar99/06/04 11:30:37

  Modified:.STATUS
   src  CHANGES
   src/include ap_mmn.h httpd.h
   src/main util.c
   src/modules/standard mod_autoindex.c
  Log:
mod_autoindex was only checking for exact matches of text/html
for ScanHTMLTitles, which meant that text/html;charset=foo
documents wouldn't be scanned.  As a side effect of this patch,
add ap_field_noparam(), which returns the unparameterised value
for any HTTP field that can use '*( ; parameter)'.
  
  PR:   4524
  
  Revision  ChangesPath
  1.701 +1 -7  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.700
  retrieving revision 1.701
  diff -u -r1.700 -r1.701
  --- STATUS1999/06/04 17:40:04 1.700
  +++ STATUS1999/06/04 18:30:07 1.701
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/04 17:40:04 $]
  +  Last modified at [$Date: 1999/06/04 18:30:07 $]
   
   Release:
   
  @@ -105,12 +105,6 @@
   * Tony Finch's patch to support mass virtual hosting
Message-ID: [EMAIL PROTECTED]
Status: Dean +1
  -
  -* Ken's patch to work around exact matches of content-types (PR#4524)
  -  (Long-term fix should involve breaking this [and other fields with
  -  parameters] into pieces.)
  - Message-ID: [EMAIL PROTECTED]
  - Status: Ken +1
   
   * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth.
 (PR#2598)
  
  
  
  1.1370+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1369
  retrieving revision 1.1370
  diff -u -r1.1369 -r1.1370
  --- CHANGES   1999/06/04 17:15:49 1.1369
  +++ CHANGES   1999/06/04 18:30:16 1.1370
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.7
   
  +  *) Fix mod_autoindex's handling of ScanHTMLTitles when file
  + content-types are text/html;parameters.  PR#4524  [Ken Coar]
  +
 *) Remove mxb support from mod_negotiation -- it was a draft feature
never accepted into any standard, and it opens up certain DoS
attacks.  [Koen Holtman [EMAIL PROTECTED]]
  
  
  
  1.37  +2 -1  apache-1.3/src/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- ap_mmn.h  1999/05/21 15:38:49 1.36
  +++ ap_mmn.h  1999/06/04 18:30:22 1.37
  @@ -218,6 +218,7 @@
* 19990320.2   - add cmd_parms.context, ap_set_config_vectors, 
*export ap_add_file_conf
* 19990320.3   - add ap_regexec()
  + * 19990604.4   - add ap_field_noparam()
*/
   
   #define MODULE_MAGIC_COOKIE 0x41503133UL /* AP13 */
  @@ -225,7 +226,7 @@
   #ifndef MODULE_MAGIC_NUMBER_MAJOR
   #define MODULE_MAGIC_NUMBER_MAJOR 19990320
   #endif
  -#define MODULE_MAGIC_NUMBER_MINOR 3 /* 0...n */
  +#define MODULE_MAGIC_NUMBER_MINOR 4 /* 0...n */
   #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward 
compat */
   
   /* Useful for testing for features. */
  
  
  
  1.280 +1 -0  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.279
  retrieving revision 1.280
  diff -u -r1.279 -r1.280
  --- httpd.h   1999/06/02 07:08:18 1.279
  +++ httpd.h   1999/06/04 18:30:24 1.280
  @@ -920,6 +920,7 @@
   
   API_EXPORT(struct tm *) ap_get_gmtoff(int *tz);
   API_EXPORT(char *) ap_get_time(void);
  +API_EXPORT(char *) ap_field_noparam(pool *p, const char *intype);
   API_EXPORT(char *) ap_ht_time(pool *p, time_t t, const char *fmt, int gmt);
   API_EXPORT(char *) ap_gm_timestr_822(pool *p, time_t t);
   
  
  
  
  1.163 +17 -0 apache-1.3/src/main/util.c
  
  Index: util.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/util.c,v
  retrieving revision 1.162
  retrieving revision 1.163
  diff -u -r1.162 -r1.163
  --- util.c1999/05/25 15:24:01 1.162
  +++ util.c1999/06/04 18:30:31 1.163
  @@ -119,6 +119,23 @@
   return (time_string);
   }
   
  +/*
  + * Examine a field value (such as a media-/content-type) string and return
  + * it sans any parameters; e.g., strip off any ';charset=foo' and the like.
  + */
  +API_EXPORT(char *) ap_field_noparam(pool *p, const char *intype)
  +{
  +const char *semi;
  +
  +semi = strchr(intype, ';');
  +if (semi != NULL) {
  + while ((semi  intype)  

cvs commit: apache-1.3/src/modules/standard mod_setenvif.c

1999-06-04 Thread coar
coar99/06/04 11:40:01

  Modified:src  CHANGES
   htdocs/manual/mod mod_setenvif.html
   src/modules/standard mod_setenvif.c
  Log:
A minor enhancement to SetEnvIf*: allow it to test envariables
as well as request attributes.
  
  Revision  ChangesPath
  1.1371+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1370
  retrieving revision 1.1371
  diff -u -r1.1370 -r1.1371
  --- CHANGES   1999/06/04 18:30:16 1.1370
  +++ CHANGES   1999/06/04 18:39:57 1.1371
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.7
   
  +  *) Allow SetEnvIf[NoCase] to test environment variables as well
  + as header fields and request attributes.  [Ken Coar]
  +
 *) Fix mod_autoindex's handling of ScanHTMLTitles when file
content-types are text/html;parameters.  PR#4524  [Ken Coar]
   
  
  
  
  1.7   +24 -4 apache-1.3/htdocs/manual/mod/mod_setenvif.html
  
  Index: mod_setenvif.html
  ===
  RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_setenvif.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_setenvif.html 1999/05/19 13:26:06 1.6
  +++ mod_setenvif.html 1999/06/04 18:40:00 1.7
  @@ -261,7 +261,8 @@
  HREF=directive-dict.html#Compatibility
  REL=Help
 STRONGCompatibility:/STRONG/A Apache 1.3 and above; the
  -  Request_Protocol keyword is only available with 1.3.7 and later
  +  Request_Protocol keyword and environment-variable matching are only
  +  available with 1.3.7 and later
 /P
 P
 The SAMPSetEnvIf/SAMP directive defines environment variables
  @@ -299,15 +300,34 @@
 SAMPHost/SAMP, SAMPUser-Agent/SAMP, and SAMPReferer/SAMP.
 /P
 P
  +  If the EMattribute/EM name doesn't match any of the special keywords,
  +  nor any of the request's header field names, it is tested as the name
  +  of an environment variable in the list of those associated with the 
request.
  +  This allows CODESetEnvIf/CODE directives to test against the result
  +  of prior matches.
  +  /P
  +  BLOCKQUOTE
  +   STRONGOnly those environment variables defined by earlier
  +   CODESetEnvIf[NoCase]/CODE directives are available for testing in
  +   this manner.  'Earlier' means that they were defined at a broader scope
  +   (such as server-wide) or previously in the current directive's
  +   scope./STRONG
  +  /BLOCKQUOTE
  +  P
 Example:
 /P
 PRE
  -   SetEnvIf Request_URI \.(gif)|(jpg)|(xbm)$ object_is_image
  +   SetEnvIf Request_URI \.gif$ object_is_image=gif
  +   SetEnvIf Request_URI \.jpg$ object_is_image=jpg
  +   SetEnvIf Request_URI \.xbm$ object_is_image=xbm
  +:
  SetEnvIf Referer www\.mydomain\.com intra_site_referral
  +:
  +   SetEnvIf object_is_image xbm XBIT_PROCESSING=1
 /PRE
 P
  -  The first will set the envariable SAMPobject_is_image/SAMP if the
  -  request was for an image file, and the second sets
  +  The first three will set the envariable SAMPobject_is_image/SAMP if the
  +  request was for an image file, and the fourth sets
 SAMPintra_site_referral/SAMP if the referring page was somewhere
 on the SAMPwww.mydomain.com/SAMP Web site.
 /P
  
  
  
  1.29  +3 -0  apache-1.3/src/modules/standard/mod_setenvif.c
  
  Index: mod_setenvif.c
  ===
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_setenvif.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- mod_setenvif.c1999/05/21 12:16:24 1.28
  +++ mod_setenvif.c1999/06/04 18:40:00 1.29
  @@ -364,6 +364,9 @@
break;
case SPECIAL_NOT:
val = ap_table_get(r-headers_in, b-name);
  + if (val == NULL) {
  + val = ap_table_get(r-subprocess_env, b-name);
  + }
break;
}
   }
  
  
  


cvs commit: apache-site/mirrors mirrors.list index.html

1999-06-04 Thread brian
brian   99/06/04 13:05:12

  Modified:mirrors  mirrors.list index.html
  Log:
  New adds, some changes.
  
  Revision  ChangesPath
  1.78  +4 -2  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- mirrors.list  1999/06/02 10:12:20 1.77
  +++ mirrors.list  1999/06/04 20:05:11 1.78
  @@ -117,7 +117,7 @@
   http us  http://apache.compuex.com/  [EMAIL PROTECTED]
   http us  http://ftp.epix.net/apache/ archive@epix.net
   http us  http://apache.missouri.edu/ [EMAIL PROTECTED]
  -http us  http://www.ameth.org/apache/[EMAIL PROTECTED]
  +http us  http://apache.ameth.org/[EMAIL PROTECTED]
   http us  http://apache.technomancer.com/ [EMAIL PROTECTED]
   http us  http://apache.plinet.com/   [EMAIL PROTECTED]
   http us  http://apache.raver.net/[EMAIL PROTECTED]
  @@ -131,6 +131,7 @@
   http us  http://us-mirror.www.ai.net/pub/apache/ [EMAIL PROTECTED]
   http us  http://www.communitech.net/apache/  [EMAIL PROTECTED]
   http us  http://www.phoenicis.com/ftp/pub/mirrors/apache/[EMAIL 
PROTECTED]
  +http us  http://www.tux.org/pub/net/apache/  [EMAIL PROTECTED]
   http yu  http://www.fon.bg.ac.yu/mirror/apache/  [EMAIL PROTECTED]
   http za  http://apache.is.co.za/ [EMAIL PROTECTED]
   ftp  ar  ftp://ftp.infoap.com.ar/pub/apache/dist/
  @@ -218,7 +219,7 @@
   ftp  us  ftp://apache.compuex.com/pub/apache/dist/
   ftp  us  ftp://apache.arctic.org/pub/apache/dist/
   ftp  us  ftp://ftp.epix.net/pub/apache/dist/
  -ftp  us  ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/
  +ftp  us  ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/dist/
   ftp  us  ftp://ftp.connectnet.com/pub/www/apache/
   ftp  us  ftp://apache.technomancer.com/mirrors/apache/dist/
   ftp  us  ftp://ftp.raver.net/pub/ftp.apache.org/
  @@ -233,6 +234,7 @@
   ftp  us  ftp://ftp.digex.net/pub/packages/network/apache/[EMAIL 
PROTECTED]
   ftp  us  ftp://ftp.av8.com/pub/mirrors/apache/dist/  [EMAIL 
PROTECTED]
   ftp  us  ftp://ftp.phoenicis.com/pub/mirrors/apache/dist/
  +ftp  us  ftp://ftp.tux.org/pub/net/apache/
   ftp  za  ftp://ftp.is.co.za/internet/www/servers/apache/
   ftp  za  ftp://ftpza.co.za/mirrors/apache/
   ftp  za  ftp://ftp.saix.net/pub/apache/
  
  
  
  1.66  +6 -2  apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- index.html1999/06/02 10:12:20 1.65
  +++ index.html1999/06/04 20:05:11 1.66
  @@ -261,7 +261,7 @@
   !-- archive@epix.net --
   A HREF=http://apache.missouri.edu/;us/A -
   !-- [EMAIL PROTECTED] --
  -A HREF=http://www.ameth.org/apache/;us/A -
  +A HREF=http://apache.ameth.org/;us/A -
   !-- [EMAIL PROTECTED] --
   A HREF=http://apache.technomancer.com/;us/A -
   !-- [EMAIL PROTECTED] --
  @@ -289,6 +289,8 @@
   !-- [EMAIL PROTECTED] --
   A HREF=http://www.phoenicis.com/ftp/pub/mirrors/apache/;us/A -
   !-- [EMAIL PROTECTED] --
  +A HREF=http://www.tux.org/pub/net/apache/;us/A -
  +!-- [EMAIL PROTECTED] --
   A HREF=http://www.fon.bg.ac.yu/mirror/apache/;yu/A -
   !-- [EMAIL PROTECTED] --
   A HREF=http://apache.is.co.za/;za/A -
  @@ -468,7 +470,7 @@
   !--  --
   A HREF=ftp://ftp.epix.net/pub/apache/dist/;us/A -
   !--  --
  -A HREF=ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/;us/A 
-
  +A HREF=ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/dist/;us/A -
   !--  --
   A HREF=ftp://ftp.connectnet.com/pub/www/apache/;us/A -
   !--  --
  @@ -497,6 +499,8 @@
   A HREF=ftp://ftp.av8.com/pub/mirrors/apache/dist/;us/A -
   !-- [EMAIL PROTECTED] --
   A HREF=ftp://ftp.phoenicis.com/pub/mirrors/apache/dist/;us/A -
  +!--  --
  +A HREF=ftp://ftp.tux.org/pub/net/apache/;us/A -
   !--  --
   A HREF=ftp://ftp.is.co.za/internet/www/servers/apache/;za/A -
   !--  --