cvs commit: apache-1.3 STATUS

[lars]

lars99/06/05 18:07:50

  Modified:.STATUS
  Log:
  Looks like this was already fixed by Randys last binbuild patch.
  
  Revision  ChangesPath
  1.704 +1 -6  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.703
  retrieving revision 1.704
  diff -u -r1.703 -r1.704
  --- STATUS1999/06/05 15:38:28 1.703
  +++ STATUS1999/06/06 01:07:48 1.704
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/05 15:38:28 $]
  +  Last modified at [$Date: 1999/06/06 01:07:48 $]
   
   Release:
   
  @@ -101,11 +101,6 @@
 to refer to URIs for non-static resources.
Message-ID: [EMAIL PROTECTED]
Status: Ken +1 (on concept)
  -
  -* Eli Marmor [EMAIL PROTECTED]'s patch to include apxs in ./configure's
  -  and binbuild.sh's filesystem path editing.
  - Message-ID: PR#4526
  - Status: 
   
   * Ralf's [PATCH] to add EAPI (ctx, hook, mm, etc.) to the base package
Message-ID: [EMAIL PROTECTED]
  
  
  

cvs commit: apache-1.3 STATUS

[lars]

lars99/06/05 18:17:42

  Modified:.STATUS
  Log:
  no vetos today ;-)
  
  Revision  ChangesPath
  1.705 +7 -7  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.704
  retrieving revision 1.705
  diff -u -r1.704 -r1.705
  --- STATUS1999/06/06 01:07:48 1.704
  +++ STATUS1999/06/06 01:17:41 1.705
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/06 01:07:48 $]
  +  Last modified at [$Date: 1999/06/06 01:17:41 $]
   
   Release:
   
  @@ -100,7 +100,7 @@
   * Salvador Ortiz Garcia [EMAIL PROTECTED]' patch to allow 
DirectoryIndex
 to refer to URIs for non-static resources.
Message-ID: [EMAIL PROTECTED]
  - Status: Ken +1 (on concept)
  + Status: Ken +1 (on concept), Lars +1 (on concept)
   
   * Ralf's [PATCH] to add EAPI (ctx, hook, mm, etc.) to the base package
Message-ID: [EMAIL PROTECTED]
  @@ -109,25 +109,25 @@
   
   * Tony Finch's patch to support mass virtual hosting
Message-ID: [EMAIL PROTECTED]
  - Status: Dean +1, Randy +1
  + Status: Dean +1, Randy +1, Lars +1 (if someone writes the docs)
   
   * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth.
 (PR#2598)
Message-ID: [EMAIL PROTECTED]
  - Status:
  + Status: Lars +1 (on concept)
   
   * 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, Dean +1, Randy +1
  + Status: Ken +1, Dean +1, Randy +1, Lars +0
   
   * John Giannadrea's patch for ceiling on file size for mmap (PR#4122)
Message-ID: [EMAIL PROTECTED]
  - Status: Ken +1, Dean +1, Randy +1
  + Status: Ken +1, Dean +1, Randy +1, Lars +1
   
   * Keith Wannamaker's NT multiple services patch
Message-ID: [EMAIL PROTECTED]
  - Status: Bill +1 (on concept)
  + Status: Bill +1 (on concept), Lars +1 (on concept)
   
   * Jun-ichiro itojun Hagino's [PATCH] IPv6 enable patch
 ftp://ftp.kame.net/pub/kame/misc/apache-134-v6-19990118.diff.gz
  
  
  

cvs commit: apache-apr/apr/threadproc/os2 Makefile.in proc.c signals.c thread.c threadcancel.c threadpriv.c threadproc.h

[bjh]

bjh 99/06/06 00:15:24

  Added:   apr/threadproc/os2 Makefile.in proc.c signals.c thread.c
threadcancel.c threadpriv.c threadproc.h
  Log:
  Initial OS/2 thread/process library.
  
  Revision  ChangesPath
  1.1  apache-apr/apr/threadproc/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=../threadproc.a
  
  OBJS=proc.o \
thread.o \
threadcancel.o \
threadpriv.o \
signals.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
  proc.o: proc.c threadproc.h ../../../include/apr_thread_proc.h \
   ../../../include/apr_file_io.h ../../../include/apr_general.h \
   ../../../include/apr_errno.h ../../file_io/unix/fileio.h
  signals.o: signals.c threadproc.h ../../../include/apr_thread_proc.h \
   ../../../include/apr_file_io.h ../../../include/apr_general.h \
   ../../../include/apr_errno.h ../../file_io/unix/fileio.h
  thread.o: thread.c threadproc.h ../../../include/apr_thread_proc.h \
   ../../../include/apr_file_io.h ../../../include/apr_general.h \
   ../../../include/apr_errno.h
  threadcancel.o: threadcancel.c threadproc.h \
   ../../../include/apr_thread_proc.h ../../../include/apr_file_io.h \
   ../../../include/apr_general.h ../../../include/apr_errno.h
  threadpriv.o: threadpriv.c threadproc.h \
   ../../../include/apr_thread_proc.h ../../../include/apr_file_io.h \
   ../../../include/apr_general.h ../../../include/apr_errno.h
  
  
  
  1.1  apache-apr/apr/threadproc/os2/proc.c
  
  Index: proc.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 

cvs commit: apache-apr/apr/file_io/os2 filestat.c

[bjh]

bjh 99/06/06 00:29:55

  Modified:apr/file_io/os2 filestat.c
  Log:
  Remove ap_updatefileinfo().
  
  Revision  ChangesPath
  1.4   +5 -16 apache-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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- filestat.c1999/06/04 13:13:17 1.3
  +++ filestat.c1999/06/06 07:29:54 1.4
  @@ -95,22 +95,12 @@
   
   ap_status_t ap_getfileinfo(struct file_t *thefile)
   {
  -ULONG rc = DosQueryPathInfo(thefile-fname, FIL_STANDARD, 
thefile-status, sizeof(thefile-status));
  +ULONG rc; 
   
  -if (rc == 0) {
  -thefile-validstatus = TRUE;
  -return APR_SUCCESS;
  -}
  -
  -thefile-validstatus = FALSE;
  -return os2errno(rc);
  -}
  -
  -
  -
  -ap_status_t ap_updatefileinfo(struct file_t *thefile)
  -{
  -ULONG rc = DosQueryFileInfo(thefile-filedes, FIL_STANDARD, 
thefile-status, sizeof(thefile-status));
  +if (thefile-isopen)
  +rc = DosQueryFileInfo(thefile-filedes, FIL_STANDARD, 
thefile-status, sizeof(thefile-status));
  +else
  +rc = DosQueryPathInfo(thefile-fname, FIL_STANDARD, 
thefile-status, sizeof(thefile-status));
   
   if (rc == 0) {
   thefile-validstatus = TRUE;
  @@ -120,4 +110,3 @@
   thefile-validstatus = FALSE;
   return os2errno(rc);
   }
  -
  
  
  

cvs commit: apache-apr/apr/file_io/os2 open.c

[bjh]

bjh 99/06/06 00:32:07

  Modified:apr/file_io/os2 open.c
  Log:
  apr_open() should register a cleanup.
  Return success from ap_close() if file wasn't open.
  
  Revision  ChangesPath
  1.4   +3 -0  apache-apr/apr/file_io/os2/open.c
  
  Index: open.c
  ===
  RCS file: /home/cvs/apache-apr/apr/file_io/os2/open.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- open.c1999/06/04 13:13:17 1.3
  +++ open.c1999/06/06 07:32:06 1.4
  @@ -127,6 +127,7 @@
   
   dafile-isopen = TRUE;
   dafile-fname = ap_pstrdup(cntxt, fname);
  +ap_register_cleanup(dafile-cntxt, dafile, file_cleanup, NULL);
   return APR_SUCCESS;
   }
   
  @@ -146,6 +147,8 @@
   return os2errno(rc);
   }
   }
  +
  +return APR_SUCCESS;
   }
   
   
  
  
  

cvs commit: apache-apr/apr/file_io/os2 pipe.c

[bjh]

bjh 99/06/06 00:33:57

  Modified:apr/file_io/os2 pipe.c
  Log:
  Cleanups need to be registered for both handles to a pipe.
  
  Revision  ChangesPath
  1.2   +4 -0  apache-apr/apr/file_io/os2/pipe.c
  
  Index: pipe.c
  ===
  RCS file: /home/cvs/apache-apr/apr/file_io/os2/pipe.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pipe.c1999/06/04 13:13:18 1.1
  +++ pipe.c1999/06/06 07:33:56 1.2
  @@ -74,11 +74,15 @@
   (*in)-cntxt = cont;
   (*in)-filedes = filedes[0];
   (*in)-fname = ap_pstrdup(cont, PIPE);
  +(*in)-isopen = TRUE;
  +ap_register_cleanup(cont, *in, file_cleanup, NULL);
   
   (*out) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
   (*out)-cntxt = cont;
   (*out)-filedes = filedes[1];
   (*out)-fname = ap_pstrdup(cont, PIPE);
  +(*out)-isopen = TRUE;
  +ap_register_cleanup(cont, *out, file_cleanup, NULL);
   
   return APR_SUCCESS;
   }
  
  
  

cvs commit: apache-apr/apr/locks/os2 locks.c

[bjh]

bjh 99/06/06 00:51:13

  Modified:apr/locks/os2 locks.c
  Log:
  Register cleanup for a lock.
  Improve logic of lock/unlock.
  
  Revision  ChangesPath
  1.2   +40 -16apache-apr/apr/locks/os2/locks.c
  
  Index: locks.c
  ===
  RCS file: /home/cvs/apache-apr/apr/locks/os2/locks.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- locks.c   1999/06/04 16:40:09 1.1
  +++ locks.c   1999/06/06 07:51:12 1.2
  @@ -56,10 +56,20 @@
   #include apr_general.h
   #include apr_lib.h
   #include locks.h
  +#include fileio.h
   #include string.h
   #define INCL_DOS
   #include os2.h
   
  +
  +ap_status_t lock_cleanup(void *thelock)
  +{
  +struct lock_t *lock = thelock;
  +return ap_destroy_lock(lock);
  +}
  +
  +
  +
   ap_status_t ap_create_lock(ap_context_t *cont, ap_locktype_e type, char 
*fname, struct lock_t **lock)
   {
   struct lock_t *new;
  @@ -82,12 +92,17 @@
   ap_status_t ap_lock(struct lock_t *lock)
   {
   ULONG rc;
  -rc = DosRequestMutexSem(lock-hMutex, SEM_INDEFINITE_WAIT);
  +
  +if (!lock-curr_locked) {
  +rc = DosRequestMutexSem(lock-hMutex, SEM_INDEFINITE_WAIT);
   
  -if (rc == 0)
  -lock-curr_locked = TRUE;
  +if (rc == 0)
  +lock-curr_locked = TRUE;
   
  -return os2errno(rc);
  +return os2errno(rc);
  +}
  +
  +return APR_SUCCESS;
   }
   
   
  @@ -95,12 +110,17 @@
   ap_status_t ap_unlock(struct lock_t *lock)
   {
   ULONG rc;
  -rc = DosReleaseMutexSem(lock-hMutex);
  +
  +if (lock-curr_locked) {
  +rc = DosReleaseMutexSem(lock-hMutex);
   
  -if (rc == 0)
  -lock-curr_locked = FALSE;
  +if (rc == 0)
  +lock-curr_locked = FALSE;
   
  -return os2errno(rc);
  +return os2errno(rc);
  +}
  +
  +return APR_SUCCESS;
   }
   
   
  @@ -108,16 +128,20 @@
   ap_status_t ap_destroy_lock(struct lock_t *lock)
   {
   ULONG rc;
  +ap_status_t stat;
   
  -if (lock-curr_locked) {
  -rc = DosReleaseMutexSem(lock-hMutex);
  +stat = ap_unlock(lock);
  +
  +if (stat != APR_SUCCESS)
  +return stat;
  +
  +if (lock-hMutex == 0)
  +return APR_SUCCESS;
   
  -if (rc)
  -return os2errno(rc);
  -}
  -
   rc = DosCloseMutexSem(lock-hMutex);
  +
  +if (!rc)
  +lock-hMutex = 0;
  +
   return os2errno(rc);
   }
  -
  -
  
  
  

cvs commit: apache-apr/apr/test Makefile.in

[bjh]

bjh 99/06/06 01:57:58

  Modified:apr  configure.in
   apr/include apr_config.h.in
   apr/lib  Makefile.in
   apr/test Makefile.in
  Log:
  Get autoconf to take care of some peculiarities of the OS/2 emx environment.
  - executables have .exe extension
  - libraries don't have a 'lib' prefix.
  - has stricmp instead of strcasecmp
  
  Revision  ChangesPath
  1.17  +8 -0  apache-apr/apr/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/apache-apr/apr/configure.in,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- configure.in  1999/05/27 19:02:19 1.16
  +++ configure.in  1999/06/06 08:57:55 1.17
  @@ -6,6 +6,9 @@
   AC_ARG_WITH(optim,[  --with-optim=FLAGS  compiler optimisation flags],
[OPTIM=$withval])
   
  +# Most platforms use a prefix of 'lib' on their library files.
  +LIBPREFIX='lib'
  +
   dnl Checks for programs.
   AC_PROG_CC
   AC_PROG_RANLIB
  @@ -71,6 +74,8 @@
   if (test $SYS_SW = OS/2); then
   PLATFORM=-DOS2
   OSDIR=os2
  +LDLIBS=$LDLIBS -lsocket
  +LIBPREFIX=''
   fi
   
   if (test $SYS_SW = BeOS); then
  @@ -144,6 +149,7 @@
   AC_FUNC_SETPGRP
   
   dnl Checks for library functions.
  +AC_CHECK_FUNCS(strcasecmp stricmp)
   
   dnl Start building stuff from our information
   AC_SUBST(LDLIBS)
  @@ -151,6 +157,8 @@
   AC_SUBST(RANLIB)
   AC_SUBST(PLATFORM)
   AC_SUBST(OSDIR)
  +AC_SUBST(LIBPREFIX)
  +AC_SUBST(EXEEXT)
   AC_OUTPUT(Makefile lib/Makefile file_io/$OSDIR/Makefile 
 network_io/$OSDIR/Makefile threadproc/$OSDIR/Makefile 
 locks/$OSDIR/Makefile misc/$OSDIR/Makefile 
  
  
  
  1.6   +6 -0  apache-apr/apr/include/apr_config.h.in
  
  Index: apr_config.h.in
  ===
  RCS file: /home/cvs/apache-apr/apr/include/apr_config.h.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_config.h.in   1999/05/26 20:22:32 1.5
  +++ apr_config.h.in   1999/06/06 08:57:57 1.6
  @@ -71,6 +71,8 @@
* they're compatible.
*/
   #undef HAVE_MMAP
  +#undef HAVE_STRCASECMP
  +#undef HAVE_STRICMP
   
   /*
* Known problems with system header files that we can fix.
  @@ -484,6 +486,10 @@
} while (0)
   #else
   #define RAISE_SIGSTOP(x)
  +#endif
  +
  +#if !defined(HAVE_STRCASECMP)  defined(HAVE_STRICMP)
  +#define strcasecmp stricmp
   #endif
   
   /*
  
  
  
  1.9   +1 -1  apache-apr/apr/lib/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/apache-apr/apr/lib/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in   1999/06/02 18:44:37 1.8
  +++ Makefile.in   1999/06/06 08:57:57 1.9
  @@ -13,7 +13,7 @@
   INCDIR2=../misc/@OSDIR@
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2)
   
  -LIB=libapr.a
  [EMAIL PROTECTED]@apr.a
   
   OBJS=apr_cpystrn.o \
apr_fnmatch.o \
  
  
  
  1.9   +21 -21apache-apr/apr/test/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/apache-apr/apr/test/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in   1999/05/27 19:02:37 1.8
  +++ Makefile.in   1999/06/06 08:57:58 1.9
  @@ -7,18 +7,18 @@
   [EMAIL PROTECTED]@
   [EMAIL PROTECTED]@
   [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ 
  [EMAIL PROTECTED]@ -L../network_io -lnetwork -L../threadproc -lthreadproc 
-L../file_io -lfile -L../misc -lmisc -L../lib -lapr -L../time -ltime -L../locks 
-llock
  +LDLIBS=-L../network_io -lnetwork -L../threadproc -lthreadproc -L../file_io 
-lfile -L../misc -lmisc -L../lib -lapr -L../time -ltime -L../locks -llock 
@LDLIBS@ 
   [EMAIL PROTECTED]@ $(LDLIBS)
   INCDIR=../include
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) 
   
  -TARGETS= testfile \
  - testproc \
  - testsock \
  - testthread \
  - ab \
  - testtime
  +TARGETS= [EMAIL PROTECTED]@ \
  + [EMAIL PROTECTED]@ \
  + [EMAIL PROTECTED]@ \
  + [EMAIL PROTECTED]@ \
  + [EMAIL PROTECTED]@ \
  + [EMAIL PROTECTED]@
   
   OBJS= testfile.o \
testproc.o \
  @@ -32,25 +32,25 @@
   
   all: $(TARGETS) 
   
  -testfile: testfile.o
  - $(CC) $(CFLAGS) testfile.o -o testfile $(LDFLAGS) 
  [EMAIL PROTECTED]@: testfile.o
  + $(CC) $(CFLAGS) testfile.o -o [EMAIL PROTECTED]@ $(LDFLAGS) 
   
  -ab: ab_apr.o
  - $(CC) $(CFLAGS) ab_apr.o -o ab $(LDFLAGS)
  [EMAIL PROTECTED]@: ab_apr.o
  + $(CC) $(CFLAGS) ab_apr.o -o [EMAIL PROTECTED]@ $(LDFLAGS)
   
  -testproc: testproc.o
  - $(CC) $(CFLAGS) testproc.o -o testproc $(LDFLAGS)
  [EMAIL PROTECTED]@: testproc.o
  + $(CC) $(CFLAGS) testproc.o -o [EMAIL 

cvs commit: apache-apr/apr/test testfile.c

[bjh]

bjh 99/06/06 02:17:52

  Modified:apr/test testfile.c
  Log:
  Modify testfile.c to take into account that in OS/2 and possibly other 
platforms:
  - An open file can't be deleted.
  - The directory entry for a file doesn't have it's size attribute updated 
until
the file is closed or flushed.
  
  I've also added an extra error check.
  
  Revision  ChangesPath
  1.26  +8 -5  apache-apr/apr/test/testfile.c
  
  Index: testfile.c
  ===
  RCS file: /home/cvs/apache-apr/apr/test/testfile.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- testfile.c1999/06/03 19:43:55 1.25
  +++ testfile.c1999/06/06 09:17:50 1.26
  @@ -55,6 +55,7 @@
   #include apr_file_io.h
   #include apr_errno.h
   #include apr_general.h
  +#include apr_lib.h
   #include errno.h
   #include stdio.h
   #ifdef BEOS
  @@ -193,11 +194,11 @@
return stat;
   }
   
  -if ((stat = ap_remove_file(context, testdel))  != APR_SUCCESS) {
  +if ((stat = ap_close(thefile))  != APR_SUCCESS) {
   return stat;
   }
   
  -if ((stat = ap_close(thefile))  != APR_SUCCESS) {
  +if ((stat = ap_remove_file(context, testdel))  != APR_SUCCESS) {
   return stat;
   }
   
  @@ -234,6 +235,7 @@
   
   bytes = strlen(Another test!!!);
   ap_write(file, Another test!!, bytes); 
  + ap_close(file);
   
   fprintf(stdout, \tOpening Directory...);
   if (ap_opendir(context, testdir, temp) != APR_SUCCESS) {
  @@ -259,7 +261,10 @@
   /* Because I want the file I created, I am skipping the . and ..
* files that are here. 
*/
  -ap_readdir(temp); 
  +if (ap_readdir(temp) != APR_SUCCESS) {
  +fprintf(stderr, Error reading directory testdir); 
  +return -1;
  +}
   ap_get_dir_filename(temp, fname);
   } while (fname[0] == '.');
   if (strcmp(fname, testfile)) {
  @@ -296,8 +301,6 @@
   else {
   fprintf(stdout, OK\n);
   }
  -
  - ap_close(file);
   
   fprintf(stdout, \tRemoving file from directory...);
   if (ap_remove_file(context, testdir/testfile)  != APR_SUCCESS) {
  
  
  

cvs commit: apache-1.3 STATUS

[lars]

lars99/06/06 06:20:10

  Modified:.STATUS
  Log:
  cygwin32 port
  
  Revision  ChangesPath
  1.706 +5 -1  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.705
  retrieving revision 1.706
  diff -u -r1.705 -r1.706
  --- STATUS1999/06/06 01:17:41 1.705
  +++ STATUS1999/06/06 13:20:09 1.706
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/06 01:17:41 $]
  +  Last modified at [$Date: 1999/06/06 13:20:09 $]
   
   Release:
   
  @@ -96,6 +96,10 @@
   
   
   Available Patches:
  +
  +* Stipe Tolj's Cygwin32 port
  +PR#: 2936
  +Status: Lars +1 (on concept)
   
   * Salvador Ortiz Garcia [EMAIL PROTECTED]' patch to allow 
DirectoryIndex
 to refer to URIs for non-static resources.
  
  
  

cvs commit: apache-1.3 STATUS

[lars]

lars99/06/06 06:45:51

  Modified:.STATUS
  Log:
  inetd mode sucks...
  
  Revision  ChangesPath
  1.707 +5 -1  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.706
  retrieving revision 1.707
  diff -u -r1.706 -r1.707
  --- STATUS1999/06/06 13:20:09 1.706
  +++ STATUS1999/06/06 13:45:50 1.707
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/06 13:20:09 $]
  +  Last modified at [$Date: 1999/06/06 13:45:50 $]
   
   Release:
   
  @@ -245,6 +245,10 @@
 See [EMAIL PROTECTED]
   
   Open issues:
  +
  +* there are still some PRs about inetd mode
  +  Should we deprecate ServerType inetd if the next release is 1.4.0?
  ++1: Lars
   
   * general/3787: SERVER_PORT is always 80 if client comes to any port
 = needs review by the protocol guys, I think.
  
  
  

cvs commit: apache-apr/apr/threadproc/os2 proc.c threadproc.h

[bjh]

bjh 99/06/06 06:54:56

  Modified:apr/threadproc/os2 proc.c threadproc.h
  Log:
  Add flag in proc_t to prevent errors waiting for children that never lived or
  have already been waited for. This can happen in testsock.c if client 
  server don't end at the same time, causing it to loop forever.
  
  Revision  ChangesPath
  1.2   +19 -3 apache-apr/apr/threadproc/os2/proc.c
  
  Index: proc.c
  ===
  RCS file: /home/cvs/apache-apr/apr/threadproc/os2/proc.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- proc.c1999/06/06 07:15:21 1.1
  +++ proc.c1999/06/06 13:54:54 1.2
  @@ -137,14 +137,16 @@
   
   if ((pid = fork())  0) {
   return errno;
  -}
  -else if (pid == 0) {
  +} else if (pid == 0) {
   (*proc)-pid = pid;
   (*proc)-attr = NULL;
  +(*proc)-running = TRUE;
   return APR_INCHILD;
   }
  +
   (*proc)-pid = pid;
   (*proc)-attr = NULL;
  +(*proc)-running = TRUE;
   return APR_INPARENT;
   }
   
  @@ -153,6 +155,7 @@
 struct procattr_t *attr, struct proc_t **new)
   {
   int i;
  +ap_status_t stat;
   char **newargs;
   char savedir[300];
   HFILE save_in, save_out, save_err, dup;
  @@ -165,6 +168,7 @@
   }
   
   (*new)-cntxt = cont;
  +(*new)-running = FALSE;
   
   /* Prevent other threads from running while these process-wide resources are 
modified */
   if (attr-child_in || attr-child_out || attr-child_err || 
attr-currdir) {
  @@ -229,6 +233,8 @@
   (*new)-pid = spawnve(P_NOWAIT, progname, args, env);
   }
   
  +stat = (*new)-pid  0 ? errno : APR_SUCCESS;
  +
   if (attr-currdir != NULL) {
   chdir(savedir);
   }
  @@ -239,12 +245,14 @@
   DosDupHandle(save_in, dup);
   DosClose(save_in);
   }
  +
   if (attr-child_out) {
   ap_close(attr-child_out);
   dup = STDOUT_FILENO;
   DosDupHandle(save_out, dup);
   DosClose(save_out);
   }
  +
   if (attr-child_err) {
   ap_close(attr-child_err);
   dup = STDERR_FILENO;
  @@ -256,9 +264,12 @@
   DosExitCritSec();
   
   (*new)-attr = attr;
  -return APR_SUCCESS;
  +(*new)-running = stat == APR_SUCCESS;
  +return stat;
   }
   
  +
  +
   ap_status_t ap_get_childin(struct proc_t *proc, ap_file_t **new)
   {
   (*new) = proc-attr-parent_in;
  @@ -285,8 +296,12 @@
   if (!proc)
   return APR_ENOPROC;
   
  +if (!proc-running)
  +return APR_CHILD_DONE;
  +
   if (wait == APR_WAIT) {
   if ((stat = waitpid(proc-pid, NULL, WUNTRACED))  0) {
  +proc-running = FALSE;
   return APR_CHILD_DONE;
   } else if (stat == 0) {
   return APR_CHILD_NOTDONE;
  @@ -295,6 +310,7 @@
   }
   
   if ((stat = waitpid(proc-pid, NULL, WUNTRACED | WNOHANG))  0) {
  +proc-running = FALSE;
   return APR_CHILD_DONE;
   } else if (stat == 0) {
   return APR_CHILD_NOTDONE;
  
  
  
  1.2   +1 -0  apache-apr/apr/threadproc/os2/threadproc.h
  
  Index: threadproc.h
  ===
  RCS file: /home/cvs/apache-apr/apr/threadproc/os2/threadproc.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- threadproc.h  1999/06/06 07:15:23 1.1
  +++ threadproc.h  1999/06/06 13:54:55 1.2
  @@ -99,6 +99,7 @@
   ap_context_t *cntxt;
   pid_t pid;
   struct procattr_t *attr;
  +int running;
   };
   
   typedef void (*os2_thread_start_t)(void *);
  
  
  

cvs commit: apache-1.3 STATUS

[jim]

jim 99/06/06 07:20:51

  Modified:.STATUS
  Log:
  Some votes
  
  Revision  ChangesPath
  1.708 +4 -3  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.707
  retrieving revision 1.708
  diff -u -r1.707 -r1.708
  --- STATUS1999/06/06 13:45:50 1.707
  +++ STATUS1999/06/06 14:20:49 1.708
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/06 13:45:50 $]
  +  Last modified at [$Date: 1999/06/06 14:20:49 $]
   
   Release:
   
  @@ -114,6 +114,7 @@
   * Tony Finch's patch to support mass virtual hosting
Message-ID: [EMAIL PROTECTED]
Status: Dean +1, Randy +1, Lars +1 (if someone writes the docs)
  +Jim +1
   
   * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth.
 (PR#2598)
  @@ -123,11 +124,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, Dean +1, Randy +1, Lars +0
  + Status: Ken +1, Dean +1, Randy +1, Lars +0, Jim +1
   
   * John Giannadrea's patch for ceiling on file size for mmap (PR#4122)
Message-ID: [EMAIL PROTECTED]
  - Status: Ken +1, Dean +1, Randy +1, Lars +1
  + Status: Ken +1, Dean +1, Randy +1, Lars +1, Jim +1
   
   * Keith Wannamaker's NT multiple services patch
Message-ID: [EMAIL PROTECTED]