httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/lib/apr/time/unix Makefile.in access.c atime.h time.c
Date Fri, 03 Dec 1999 15:18:54 GMT
rbb         99/12/03 07:18:52

  Modified:    src/lib/apr/file_io/unix Makefile.in dir.c fileacc.c
                        filedup.c fileio.h open.c pipe.c readwrite.c seek.c
               src/lib/apr/lib Makefile.in
               src/lib/apr/locks/unix Makefile.in crossproc.c intraproc.c
                        locks.c locks.h
               src/lib/apr/misc/unix Makefile.in getopt.c misc.h start.c
               src/lib/apr/mmap/unix Makefile.in common.c mmap.c mmap_h.h
               src/lib/apr/network_io/unix Makefile.in networkio.h poll.c
                        sendrecv.c sockaddr.c sockets.c sockopt.c
               src/lib/apr/test testargs.c testmmap.c testproc.c
               src/lib/apr/threadproc/unix Makefile.in proc.c procsup.c
                        signals.c thread.c threadcancel.c threadpriv.c
                        threadproc.h
               src/lib/apr/time/unix Makefile.in access.c atime.h time.c
  Log:
  Fix the logic in blocking vs non-blocking pipes to children.  It only
  makes sense to change the blocking attributes of a pipe if we actually
  are successful in creating the pipe.
  
  Revision  Changes    Path
  1.6       +35 -29    apache-2.0/src/lib/apr/file_io/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in	1999/09/23 18:19:02	1.5
  +++ Makefile.in	1999/12/03 15:18:22	1.6
  @@ -57,33 +57,39 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -dir.o: dir.c fileio.h ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h ../../include/apr_lib.h \
  - ../../include/apr_portable.h ../../include/apr_thread_proc.h \
  - ../../include/apr_win.h ../../include/apr_network_io.h \
  +dir.o: dir.c fileio.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_file_io.h \
  + ../../include/apr_lib.h ../../include/apr_portable.h \
  + ../../include/apr_thread_proc.h ../../include/apr_network_io.h \
    ../../include/apr_lock.h ../../include/apr_time.h
  -fileacc.o: fileacc.c fileio.h ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h ../../include/apr_lib.h
  -filedup.o: filedup.c fileio.h ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h ../../include/apr_lib.h
  -filestat.o: filestat.c fileio.h ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h
  -open.o: open.c fileio.h ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h ../../include/apr_portable.h \
  - ../../include/apr_thread_proc.h ../../include/apr_win.h \
  - ../../include/apr_network_io.h ../../include/apr_lock.h \
  - ../../include/apr_time.h ../../include/apr_lib.h
  -pipe.o: pipe.c fileio.h ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h ../../include/apr_lib.h
  -readwrite.o: readwrite.c fileio.h ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h ../../include/apr_lib.h
  -seek.o: seek.c fileio.h ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h
  +fileacc.o: fileacc.c fileio.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_file_io.h \
  + ../../include/apr_lib.h
  +filedup.o: filedup.c fileio.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_file_io.h \
  + ../../include/apr_lib.h
  +filestat.o: filestat.c fileio.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_file_io.h \
  + ../../include/apr_lib.h
  +open.o: open.c fileio.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_file_io.h \
  + ../../include/apr_lib.h ../../include/apr_portable.h \
  + ../../include/apr_thread_proc.h ../../include/apr_network_io.h \
  + ../../include/apr_lock.h ../../include/apr_time.h
  +pipe.o: pipe.c fileio.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_file_io.h \
  + ../../include/apr_lib.h
  +readwrite.o: readwrite.c fileio.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_file_io.h \
  + ../../include/apr_lib.h
  +seek.o: seek.c fileio.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_file_io.h \
  + ../../include/apr_lib.h
  
  
  
  1.18      +0 -8      apache-2.0/src/lib/apr/file_io/unix/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- dir.c	1999/12/02 17:05:33	1.17
  +++ dir.c	1999/12/03 15:18:22	1.18
  @@ -53,15 +53,7 @@
    *
    */
   
  -#include <sys/types.h>
  -#include <errno.h>
  -#include <string.h>
  -#include <dirent.h>
  -#include <sys/stat.h>
  -#include <unistd.h>
   #include "fileio.h"
  -#include "apr_file_io.h"
  -#include "apr_lib.h"
   #include "apr_portable.h"
   
   static ap_status_t dir_cleanup(void *thedir)
  
  
  
  1.12      +0 -6      apache-2.0/src/lib/apr/file_io/unix/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- fileacc.c	1999/11/10 16:47:03	1.11
  +++ fileacc.c	1999/12/03 15:18:22	1.12
  @@ -54,12 +54,6 @@
    */
   
   #include "fileio.h"
  -#include "apr_file_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
  -#include <errno.h>
  -#include <string.h>
  -#include <sys/types.h>
   
   /* A file to put ALL of the accessor functions for struct file_t types. */
   
  
  
  
  1.6       +0 -5      apache-2.0/src/lib/apr/file_io/unix/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filedup.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- filedup.c	1999/12/02 17:05:33	1.5
  +++ filedup.c	1999/12/03 15:18:22	1.6
  @@ -54,11 +54,6 @@
    */
   
   #include "fileio.h"
  -#include "apr_file_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
  -#include <string.h>
  -#include <unistd.h>
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_dupfile(ap_file_t **, ap_file_t *)
  
  
  
  1.6       +38 -7     apache-2.0/src/lib/apr/file_io/unix/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- fileio.h	1999/12/01 18:39:08	1.5
  +++ fileio.h	1999/12/03 15:18:23	1.6
  @@ -56,19 +56,50 @@
   #ifndef FILE_IO_H
   #define FILE_IO_H
   
  -#include <sys/stat.h>
  -#include <sys/types.h>
  -#include <fcntl.h>
  -#include <time.h>
  -#include <dirent.h>
  -#include <sys/uio.h>
  -#include <stdio.h>
  +#include "apr_config.h"
   #include "apr_general.h"
   #include "apr_file_io.h"
   #include "apr_errno.h"
  +#include "apr_lib.h"
  +
  +/* System headers the file I/O library needs */
  +#if HAVE_FCNTL_H
  +#include <fcntl.h>
  +#endif
  +#if HAVE_SYS_TYPES_H
  +#include <sys/types.h>
  +#endif
  +#if HAVE_ERRNO_H
  +#include <errno.h>
  +#endif
  +#if HAVE_STRING_H
  +#include <string.h>
  +#endif
  +#if HAVE_DIRENT_H
  +#include <dirent.h>
  +#endif
  +#if HAVE_SYS_STAT_H
  +#include <sys/stat.h>
  +#endif
  +#if HAVE_UNISTD_H
  +#include <unistd.h>
  +#endif
  +#if HAVE_STDIO_H
  +#include <stdio.h>
  +#endif
  +#if HAVE_STDLIB_H
  +#include <stdlib.h>
  +#endif
  +#if HAVE_SYS_UIO_H
  +#include <sys/uio.h>
  +#endif
  +#if HAVE_SYS_TIME_H
  +#include <sys/time.h>
  +#endif
   #ifdef BEOS
   #include <kernel/OS.h>
   #endif
  +/* End System headers */
   
   struct file_t {
       ap_context_t *cntxt;
  
  
  
  1.25      +0 -7      apache-2.0/src/lib/apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/open.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- open.c	1999/12/02 17:05:34	1.24
  +++ open.c	1999/12/03 15:18:23	1.25
  @@ -54,14 +54,7 @@
    */
   
   #include "fileio.h"
  -#include "apr_file_io.h"
  -#include "apr_general.h"
   #include "apr_portable.h"
  -#include "apr_lib.h"
  -#include <errno.h>
  -#include <string.h>
  -#include <stdio.h>
  -#include <unistd.h>
   
   ap_status_t file_cleanup(void *thefile)
   {
  
  
  
  1.8       +0 -9      apache-2.0/src/lib/apr/file_io/unix/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/pipe.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- pipe.c	1999/12/02 18:36:23	1.7
  +++ pipe.c	1999/12/03 15:18:23	1.8
  @@ -54,15 +54,6 @@
    */
   
   #include "fileio.h"
  -#include "apr_file_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
  -#include <errno.h>
  -#include <string.h>
  -#include <stdio.h>
  -#include <unistd.h>
  -#include <sys/types.h>
  -#include <sys/stat.h>
   
   static ap_status_t pipenonblock(struct file_t *thefile)
   {
  
  
  
  1.18      +0 -20     apache-2.0/src/lib/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- readwrite.c	1999/12/01 18:39:09	1.17
  +++ readwrite.c	1999/12/03 15:18:23	1.18
  @@ -54,26 +54,6 @@
    */
   
   #include "fileio.h"
  -#include "apr_config.h"
  -#include "apr_file_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
  -#include "apr_errno.h"
  -#ifdef HAVE_ERRNO_H
  -#include <errno.h>
  -#endif
  -#ifdef HAVE_UNISTD_H
  -#include <unistd.h>
  -#endif
  -#ifdef HAVE_STDLIB_H
  -#include <stdlib.h>
  -#endif
  -#ifdef HAVE_SYS_UIO_H
  -#include <sys/uio.h>
  -#endif
  -#ifdef HAVE_SYS_TIME_H
  -#include <sys/time.h>
  -#endif
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_read(ap_file_t *, void *, ap_ssize_t *)
  
  
  
  1.3       +0 -4      apache-2.0/src/lib/apr/file_io/unix/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/seek.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- seek.c	1999/12/02 17:05:35	1.2
  +++ seek.c	1999/12/03 15:18:23	1.3
  @@ -54,10 +54,6 @@
    */
   
   #include "fileio.h"
  -#include "apr_file_io.h"
  -#include <errno.h>
  -#include <string.h>
  -#include <unistd.h>
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_seek(ap_file_t *, ap_seek_where_t, ap_off_t *)
  
  
  
  1.7       +16 -15    apache-2.0/src/lib/apr/lib/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	1999/11/23 13:46:56	1.6
  +++ Makefile.in	1999/12/03 15:18:26	1.7
  @@ -62,32 +62,33 @@
   
   # DO NOT REMOVE
   apr_cpystrn.o: apr_cpystrn.c ../include/apr_config.h \
  - ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
  - ../include/apr_file_io.h
  + ../include/apr_lib.h ../include/apr_general.h ../include/apr.h \
  + ../include/apr_errno.h ../include/apr_file_io.h
   apr_execve.o: apr_execve.c ../include/apr_config.h
   apr_fnmatch.o: apr_fnmatch.c ../include/apr_config.h \
  - ../include/apr_fnmatch.h ../include/apr_errno.h ../include/apr_lib.h \
  - ../include/apr_general.h ../include/apr_file_io.h
  -apr_getpass.o: apr_getpass.c ../include/apr_config.h \
  - ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
  + ../include/apr_fnmatch.h ../include/apr_errno.h ../include/apr.h \
  + ../include/apr_lib.h ../include/apr_general.h \
    ../include/apr_file_io.h
  +apr_getpass.o: apr_getpass.c ../include/apr_config.h \
  + ../include/apr_lib.h ../include/apr_general.h ../include/apr.h \
  + ../include/apr_errno.h ../include/apr_file_io.h
   apr_md5.o: apr_md5.c ../include/apr_config.h ../include/apr_md5.h \
  - ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
  - ../include/apr_file_io.h
  + ../include/apr_lib.h ../include/apr_general.h ../include/apr.h \
  + ../include/apr_errno.h ../include/apr_file_io.h
   apr_pools.o: apr_pools.c ../include/apr_config.h \
  - ../include/apr_general.h ../include/apr_errno.h \
  + ../include/apr_general.h ../include/apr.h ../include/apr_errno.h \
    ../include/apr_pools.h ../include/apr_lib.h ../include/apr_file_io.h \
    ../include/apr_lock.h ../misc/unix/misc.h ../include/apr_getopt.h
   apr_signal.o: apr_signal.c ../include/apr_config.h \
  - ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
  - ../include/apr_file_io.h
  + ../include/apr_lib.h ../include/apr_general.h ../include/apr.h \
  + ../include/apr_errno.h ../include/apr_file_io.h
   apr_slack.o: apr_slack.c ../include/apr_config.h ../include/apr_lib.h \
  - ../include/apr_general.h ../include/apr_errno.h \
  + ../include/apr_general.h ../include/apr.h ../include/apr_errno.h \
    ../include/apr_file_io.h
   apr_snprintf.o: apr_snprintf.c ../include/apr_config.h \
  - ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
  - ../include/apr_file_io.h
  + ../include/apr_lib.h ../include/apr_general.h ../include/apr.h \
  + ../include/apr_errno.h ../include/apr_file_io.h
   apr_tables.o: apr_tables.c ../include/apr_config.h \
  - ../include/apr_general.h ../include/apr_errno.h \
  + ../include/apr_general.h ../include/apr.h ../include/apr_errno.h \
    ../include/apr_pools.h ../include/apr_lib.h ../include/apr_file_io.h \
    ../misc/unix/misc.h ../include/apr_getopt.h
  
  
  
  1.5       +11 -11    apache-2.0/src/lib/apr/locks/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	1999/10/30 05:59:23	1.4
  +++ Makefile.in	1999/12/03 15:18:26	1.5
  @@ -53,17 +53,17 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -crossproc.o: crossproc.c ../../include/apr_lock.h \
  - ../../include/apr_general.h ../../include/apr_config.h \
  +crossproc.o: crossproc.c locks.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_lib.h \
  - ../../include/apr_file_io.h locks.h
  -intraproc.o: intraproc.c ../../include/apr_config.h \
  - ../../include/apr_lock.h ../../include/apr_general.h \
  + ../../include/apr_file_io.h ../../include/apr_lock.h
  +intraproc.o: intraproc.c locks.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_lib.h \
  - ../../include/apr_file_io.h locks.h
  -locks.o: locks.c ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h \
  + ../../include/apr_file_io.h ../../include/apr_lock.h
  +locks.o: locks.c locks.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_lib.h \
  + ../../include/apr_file_io.h ../../include/apr_lock.h \
    ../../include/apr_portable.h ../../include/apr_thread_proc.h \
  - ../../include/apr_file_io.h ../../include/apr_win.h \
  - ../../include/apr_network_io.h ../../include/apr_lock.h \
  - ../../include/apr_time.h ../../include/apr_lib.h locks.h
  + ../../include/apr_network_io.h ../../include/apr_time.h
  
  
  
  1.10      +0 -6      apache-2.0/src/lib/apr/locks/unix/crossproc.c
  
  Index: crossproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/crossproc.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- crossproc.c	1999/12/01 20:49:54	1.9
  +++ crossproc.c	1999/12/03 15:18:27	1.10
  @@ -53,13 +53,7 @@
    *
    */
   
  -#include "apr_config.h"
  -#include "apr_lock.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
   #include "locks.h"
  -#include <unistd.h>
  -#include <sys/mman.h>
   
   #if defined (USE_SYSVSEM_SERIALIZE)  
   ap_status_t lock_cleanup(struct lock_t *lock)
  
  
  
  1.8       +0 -4      apache-2.0/src/lib/apr/locks/unix/intraproc.c
  
  Index: intraproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/intraproc.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- intraproc.c	1999/10/21 14:31:20	1.7
  +++ intraproc.c	1999/12/03 15:18:27	1.8
  @@ -52,10 +52,6 @@
    * project, please see <http://www.apache.org/>.
    *
    */
  -#include "apr_config.h"
  -#include "apr_lock.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
   #include "locks.h"
   
   #if APR_HAS_THREADS
  
  
  
  1.15      +1 -6      apache-2.0/src/lib/apr/locks/unix/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- locks.c	1999/12/02 17:05:45	1.14
  +++ locks.c	1999/12/03 15:18:27	1.15
  @@ -53,13 +53,8 @@
    *
    */
   
  -#include "apr_config.h"
  -#include "apr_general.h"
  -#include "apr_portable.h"
  -#include "apr_lib.h"
   #include "locks.h"
  -#include <string.h>
  -#include <unistd.h>
  +#include "apr_portable.h"
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_create_lock(ap_context_t *, ap_locktype_e, char *, 
  
  
  
  1.6       +28 -8     apache-2.0/src/lib/apr/locks/unix/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- locks.h	1999/10/21 14:31:21	1.5
  +++ locks.h	1999/12/03 15:18:27	1.6
  @@ -55,26 +55,46 @@
   #ifndef LOCKS_H
   #define LOCKS_H
   
  +#include "apr_config.h"
  +#include "apr_general.h"
  +#include "apr_lib.h"
   #include "apr_lock.h"
  -#include "apr_file_io.h"
   
  -#if defined (USE_USLOCK_SERIALIZE)
  +/* System headers required by Locks library */
  +#if HAVE_UNISTD_H
  +#include <unistd.h>
  +#endif
  +#if HAVE_STRING_H
  +#include <string.h>
  +#endif
  +#if HAVE_USLOCKS_H
   #include <uslocks.h>
  -#elif defined (USE_SYSVSEM_SERIALIZE)
  -#include <sys/file.h>
  +#endif
  +#if HAVE_SYS_TYPES_H
   #include <sys/types.h>
  +#endif
  +#if HAVE_SYS_IPC_H
   #include <sys/ipc.h>
  +#endif
  +#if HAVE_SYS_SEM_H
   #include <sys/sem.h>
  -#elif defined (USE_FLOCK_SERIALIZE)
  +#endif
  +#if HAVE_SYS_FILE_H
   #include <sys/file.h>
  -#include <stdio.h>
  -#elif defined (USE_FCNTL_SERIALIZE)
  +#endif
  +#if HAVE_STDIO_H
   #include <stdio.h>
  +#endif
  +#if HAVE_FCNTL_H
   #include <fcntl.h>
   #endif
  -#if APR_HAS_THREADS && HAVE_PTHREAD_H
  +
  +#if APR_HAS_THREADS
  +#if HAVE_PTHREAD_H
   #include <pthread.h>
   #endif
  +#endif
  +/* End System Headers */
   
   #ifndef HAVE_UNION_SEMUN
   /* it makes no sense, but this isn't defined on solaris */
  
  
  
  1.7       +10 -7     apache-2.0/src/lib/apr/misc/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	1999/11/23 13:46:57	1.6
  +++ Makefile.in	1999/12/03 15:18:29	1.7
  @@ -51,10 +51,13 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -getopt.o: getopt.c misc.h ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h ../../include/apr_getopt.h
  -start.o: start.c ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_pools.h ../../include/apr_lib.h \
  - ../../include/apr_file_io.h misc.h ../../include/apr_getopt.h
  +getopt.o: getopt.c misc.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_pools.h \
  + ../../include/apr_lib.h ../../include/apr_file_io.h \
  + ../../include/apr_getopt.h
  +start.o: start.c misc.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_pools.h \
  + ../../include/apr_lib.h ../../include/apr_file_io.h \
  + ../../include/apr_getopt.h
  
  
  
  1.3       +0 -3      apache-2.0/src/lib/apr/misc/unix/getopt.c
  
  Index: getopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/getopt.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- getopt.c	1999/11/22 14:52:15	1.2
  +++ getopt.c	1999/12/03 15:18:30	1.3
  @@ -31,9 +31,6 @@
    * SUCH DAMAGE.
    */
   
  -#include <stdio.h>
  -#include <stdlib.h>
  -#include <string.h>
   #include "misc.h"
   
   int ap_opterr = 1,                      /* if error message should be printed */
  
  
  
  1.6       +18 -3     apache-2.0/src/lib/apr/misc/unix/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/misc.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- misc.h	1999/11/24 22:30:09	1.5
  +++ misc.h	1999/12/03 15:18:30	1.6
  @@ -56,11 +56,26 @@
   #ifndef MISC_H
   #define MISC_H
   
  +#include "apr_config.h"
   #include "apr_general.h"
  -#include "apr_file_io.h"
  -#include "apr_errno.h"
  +#include "apr_pools.h"
   #include "apr_getopt.h"
  -
  +#ifdef HAVE_STDLIB_H
  +#include <stdlib.h>
  +#endif
  +#ifdef HAVE_STDIO_H
  +#include <stdio.h>
  +#endif
  +#ifdef HAVE_STRING_H
  +#include <string.h>
  +#endif
  +#ifdef HAVE_SIGNAL_H
  +#include <signal.h>
  +#endif
  +#ifdef HAVE_PTHREAD_H
  +#include <pthread.h>
  +#endif
  + 
   typedef struct datastruct {
       void *data;
       char *key;
  
  
  
  1.15      +0 -12     apache-2.0/src/lib/apr/misc/unix/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- start.c	1999/12/02 17:05:47	1.14
  +++ start.c	1999/12/03 15:18:30	1.15
  @@ -53,19 +53,7 @@
    *
    */
   
  -#include "apr_general.h"
  -#include "apr_errno.h"
  -#include "apr_pools.h"
   #include "misc.h"
  -#ifdef HAVE_PTHREAD_H
  -#include <pthread.h>
  -#endif
  -#include <signal.h>
  -#include <errno.h>
  -#include <string.h>
  -#ifdef HAVE_STDLIB_H
  -# include <stdlib.h>
  -#endif
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_create_context(ap_context_t **, ap_context_t *)
  
  
  
  1.6       +12 -12    apache-2.0/src/lib/apr/mmap/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in	1999/11/17 21:39:24	1.5
  +++ Makefile.in	1999/12/03 15:18:31	1.6
  @@ -50,17 +50,17 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -common.o: common.c ../../file_io/unix/fileio.h \
  - ../../include/apr_general.h ../../include/apr_config.h \
  - ../../include/apr_errno.h ../../include/apr_file_io.h \
  - ../../include/apr_mmap.h ../../include/apr_network_io.h \
  - ../../include/apr_portable.h ../../include/apr_thread_proc.h \
  - ../../include/apr_win.h ../../include/apr_lock.h \
  - ../../include/apr_time.h ../../include/apr_lib.h mmap_h.h
  -mmap.o: mmap.c mmap_h.h ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_mmap.h ../../include/apr_network_io.h \
  - ../../include/apr_portable.h ../../include/apr_thread_proc.h \
  - ../../include/apr_file_io.h ../../include/apr_win.h \
  +common.o: common.c mmap_h.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_mmap.h \
  + ../../include/apr_network_io.h ../../include/apr_portable.h \
  + ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
  + ../../include/apr_lock.h ../../include/apr_time.h \
  + ../../file_io/unix/fileio.h ../../include/apr_lib.h
  +mmap.o: mmap.c mmap_h.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../include/apr_mmap.h \
  + ../../include/apr_network_io.h ../../include/apr_portable.h \
  + ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
    ../../include/apr_lock.h ../../include/apr_time.h \
    ../../file_io/unix/fileio.h ../../include/apr_lib.h
  
  
  
  1.6       +0 -18     apache-2.0/src/lib/apr/mmap/unix/common.c
  
  Index: common.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/common.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- common.c	1999/12/01 20:50:00	1.5
  +++ common.c	1999/12/03 15:18:31	1.6
  @@ -62,28 +62,10 @@
    *
    */
   
  -#include "fileio.h"
  -#include "apr_config.h"
  -#include "apr_mmap.h"
  -#include "apr_general.h"
  -#include "apr_portable.h"
  -#include "apr_lib.h"
  -#include "apr_errno.h"
  -#ifdef HAVE_STRING_H
  -#include <string.h>
  -#endif
  -#ifdef HAVE_STDIO_H
  -#include <stdio.h>
  -#endif
  -
   #ifdef BEOS
   #include "../beos/mmap_h.h"
  -#include <kernel/OS.h>
   #else
   #include "mmap_h.h"
  -#ifdef HAVE_SYS_MMAN_H
  -#include <sys/mman.h>
  -#endif
   #endif
   
   #if HAVE_MMAP
  
  
  
  1.9       +5 -16     apache-2.0/src/lib/apr/mmap/unix/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mmap.c	1999/11/23 13:46:58	1.8
  +++ mmap.c	1999/12/03 15:18:31	1.9
  @@ -52,24 +52,13 @@
    * project, please see <http://www.apache.org/>.
    *
    */
  -
  +#ifdef BEOS
  +#include "../beos/mmap_h.h"
  +#else
   #include "mmap_h.h"
  -#include "fileio.h"
  -#include "apr_mmap.h"
  -#include "apr_general.h"
  -#include "apr_portable.h"
  -#include "apr_lib.h"
  -#include "apr_errno.h"
  -#include "apr_config.h"
  -#ifdef HAVE_SYS_MMAN_H
  -#include <sys/mman.h>
  -#endif
  -#ifdef HAVE_STRING_H
  -#include <string.h>
   #endif
  -#ifdef HAVE_STDIO_H
  -#include <stdio.h>
  -#endif
  +
  +#include "apr_portable.h"
   
   #if HAVE_MMAP
   
  
  
  
  1.5       +23 -1     apache-2.0/src/lib/apr/mmap/unix/mmap_h.h
  
  Index: mmap_h.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap_h.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mmap_h.h	1999/11/13 00:07:23	1.4
  +++ mmap_h.h	1999/12/03 15:18:32	1.5
  @@ -56,12 +56,34 @@
   #ifndef MMAP_H_H
   #define MMAP_H_H
   
  +#include "apr_config.h"
   #include "apr_general.h"
   #include "apr_mmap.h"
   #include "apr_errno.h"
  -#ifdef HAVE_SYS_STAT_H
  +#include "fileio.h"
  +#ifdef BEOS
  +#include "../beos/mmap_h.h"
  +#else
  +#include "mmap_h.h"
  +#endif
  +
  +/* System headers required for the mmap library */
  +#ifdef BEOS
  +#include <kernel/OS.h>
  +#endif
  +#if HAVE_STRING_H
  +#include <string.h>
  +#endif
  +#if HAVE_STDIO_H
  +#include <stdio.h>
  +#endif
  +#if HAVE_SYS_STAT_H
   #include <sys/stat.h>
   #endif
  +#if HAVE_SYS_MMAN_H
  +#include <sys/mman.h>
  +#endif
  +/* End System Headers */
   
   struct mmap_t {
       ap_context_t *cntxt;
  
  
  
  1.8       +22 -22    apache-2.0/src/lib/apr/network_io/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/Makefile.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.in	1999/10/30 05:59:24	1.7
  +++ Makefile.in	1999/12/03 15:18:33	1.8
  @@ -54,25 +54,25 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -poll.o: poll.c networkio.h ../../include/apr_network_io.h \
  - ../../include/apr_general.h ../../include/apr_config.h \
  - ../../include/apr_errno.h ../../include/apr_lock.h \
  - ../../include/apr_lib.h ../../include/apr_file_io.h
  -sendrecv.o: sendrecv.c networkio.h ../../include/apr_network_io.h \
  - ../../include/apr_general.h ../../include/apr_config.h \
  - ../../include/apr_errno.h ../../include/apr_lock.h \
  - ../../include/apr_lib.h ../../include/apr_file_io.h
  -sockaddr.o: sockaddr.c networkio.h ../../include/apr_network_io.h \
  - ../../include/apr_general.h ../../include/apr_config.h \
  - ../../include/apr_errno.h ../../include/apr_lock.h \
  - ../../include/apr_lib.h ../../include/apr_file_io.h
  -sockets.o: sockets.c networkio.h ../../include/apr_network_io.h \
  - ../../include/apr_general.h ../../include/apr_config.h \
  - ../../include/apr_errno.h ../../include/apr_lock.h \
  - ../../include/apr_portable.h ../../include/apr_thread_proc.h \
  - ../../include/apr_file_io.h ../../include/apr_win.h \
  - ../../include/apr_time.h ../../include/apr_lib.h
  -sockopt.o: sockopt.c networkio.h ../../include/apr_network_io.h \
  - ../../include/apr_general.h ../../include/apr_config.h \
  - ../../include/apr_errno.h ../../include/apr_lock.h \
  - ../../include/apr_lib.h ../../include/apr_file_io.h
  +poll.o: poll.c networkio.h ../../include/apr_config.h \
  + ../../include/apr_network_io.h ../../include/apr_general.h \
  + ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
  + ../../include/apr_file_io.h
  +sendrecv.o: sendrecv.c networkio.h ../../include/apr_config.h \
  + ../../include/apr_network_io.h ../../include/apr_general.h \
  + ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
  + ../../include/apr_file_io.h
  +sockaddr.o: sockaddr.c networkio.h ../../include/apr_config.h \
  + ../../include/apr_network_io.h ../../include/apr_general.h \
  + ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
  + ../../include/apr_file_io.h
  +sockets.o: sockets.c networkio.h ../../include/apr_config.h \
  + ../../include/apr_network_io.h ../../include/apr_general.h \
  + ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
  + ../../include/apr_file_io.h ../../include/apr_portable.h \
  + ../../include/apr_thread_proc.h ../../include/apr_lock.h \
  + ../../include/apr_time.h
  +sockopt.o: sockopt.c networkio.h ../../include/apr_config.h \
  + ../../include/apr_network_io.h ../../include/apr_general.h \
  + ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
  + ../../include/apr_file_io.h
  
  
  
  1.10      +35 -2     apache-2.0/src/lib/apr/network_io/unix/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- networkio.h	1999/12/01 18:39:42	1.9
  +++ networkio.h	1999/12/03 15:18:33	1.10
  @@ -59,10 +59,43 @@
   #include "apr_config.h"
   #include "apr_network_io.h"
   #include "apr_general.h"
  -#include "apr_lock.h"
  -#ifdef HAVE_POLL_H
  +#include "apr_lib.h"
  +
  +/* System headers the network I/O library needs */
  +#if HAVE_POLL_H
   #include <poll.h>
   #endif
  +#if HAVE_ERRNO_H
  +#include <errno.h>
  +#endif
  +#if HAVE_SYS_TIME_H
  +#include <sys/time.h>
  +#endif
  +#if HAVE_UNISTD_H
  +#include <unistd.h>
  +#endif
  +#if HAVE_STRING_H
  +#include <string.h>
  +#endif
  +#if HAVE_NETINET_TCP_H
  +#include <netinet/tcp.h>
  +#endif
  +#if HAVE_NETINET_IN_H
  +#include <netinet/in.h>
  +#endif
  +#if HAVE_ARPA_INET_H
  +#include <arpa/inet.h>
  +#endif
  +#if HAVE_SYS_SOCKET_H
  +#include <sys/socket.h>
  +#endif
  +#if HAVE_NETDB_H
  +#include <netdb.h>
  +#endif
  +#if HAVE_FCNTL_H
  +#include <fcntl.h>
  +#endif
  +/* End System Headers */
   
   struct socket_t {
       ap_context_t *cntxt;
  
  
  
  1.16      +0 -10     apache-2.0/src/lib/apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- poll.c	1999/12/01 18:39:42	1.15
  +++ poll.c	1999/12/03 15:18:33	1.16
  @@ -54,16 +54,6 @@
    */
   
   #include "networkio.h"
  -#include "apr_config.h"
  -#include "apr_network_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
  -#ifdef HAVE_ERRNO_H
  -#include <errno.h>
  -#endif
  -#ifdef HAVE_SYS_TIME_H
  -#include <sys/time.h>
  -#endif
   
   #ifdef HAVE_POLL    /* We can just use poll to do our socket polling. */
   
  
  
  
  1.7       +0 -6      apache-2.0/src/lib/apr/network_io/unix/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sendrecv.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- sendrecv.c	1999/12/02 17:05:48	1.6
  +++ sendrecv.c	1999/12/03 15:18:33	1.7
  @@ -56,12 +56,6 @@
    */
   
   #include "networkio.h"
  -#include "apr_errno.h"
  -#include "apr_general.h"
  -#include "apr_network_io.h"
  -#include "apr_lib.h"
  -#include <sys/time.h>
  -#include <unistd.h>
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_send(ap_socket_t *, const char *, ap_ssize_t *, time_t)
  
  
  
  1.2       +0 -11     apache-2.0/src/lib/apr/network_io/unix/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockaddr.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sockaddr.c	1999/10/24 05:59:15	1.1
  +++ sockaddr.c	1999/12/03 15:18:34	1.2
  @@ -54,17 +54,6 @@
    */
   
   #include "networkio.h"
  -#include "apr_network_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
  -#include <errno.h>
  -#include <string.h>
  -#include <sys/socket.h>
  -#include <netinet/tcp.h>
  -#include <netinet/in.h>
  -#include <arpa/inet.h>
  -
  -
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_set_local_port(ap_socket_t *socket, ap_uint32_t port)
  
  
  
  1.26      +0 -16     apache-2.0/src/lib/apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- sockets.c	1999/12/02 17:05:49	1.25
  +++ sockets.c	1999/12/03 15:18:34	1.26
  @@ -54,23 +54,7 @@
    */
   
   #include "networkio.h"
  -#include "apr_network_io.h"
  -#include "apr_general.h"
   #include "apr_portable.h"
  -#include "apr_lib.h"
  -#include <errno.h>
  -#include <string.h>
  -#include <unistd.h>
  -#include <sys/socket.h>
  -#include <netinet/tcp.h>
  -#include <netinet/in.h>
  -#include <arpa/inet.h>
  -#include <netdb.h>
  -
  -#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
  -ap_lock_t *lock_network = NULL;
  -ap_lock_t *lock_inet = NULL;
  -#endif
   
   static ap_status_t socket_cleanup(void *sock)
   {
  
  
  
  1.14      +0 -11     apache-2.0/src/lib/apr/network_io/unix/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockopt.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- sockopt.c	1999/11/15 19:49:54	1.13
  +++ sockopt.c	1999/12/03 15:18:34	1.14
  @@ -54,17 +54,6 @@
    */
   
   #include "networkio.h"
  -#include "apr_network_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
  -#include <errno.h>
  -#include <string.h>
  -#include <sys/socket.h>
  -#include <netinet/tcp.h>
  -#include <netinet/in.h>
  -#include <unistd.h>
  -#include <fcntl.h>
  -#include <netdb.h>
   
   static ap_status_t soblock(int sd)
   {
  
  
  
  1.7       +1 -1      apache-2.0/src/lib/apr/test/testargs.c
  
  Index: testargs.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testargs.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- testargs.c	1999/11/22 14:52:16	1.6
  +++ testargs.c	1999/12/03 15:18:36	1.7
  @@ -81,7 +81,7 @@
                   break;
               case 'd':
                   printf("option %c", data);
  -                if (optarg) {
  +                if (ap_optarg) {
                       printf(" with %s\n", ap_optarg);
                   }
                   else {
  
  
  
  1.3       +2 -9      apache-2.0/src/lib/apr/test/testmmap.c
  
  Index: testmmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testmmap.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testmmap.c	1999/10/21 21:13:38	1.2
  +++ testmmap.c	1999/12/03 15:18:36	1.3
  @@ -53,6 +53,7 @@
    *
    */
   #include <stdio.h>
  +#include <unistd.h>
   #include <string.h>
   #include "apr_mmap.h"
   #include "apr_errno.h"
  @@ -69,7 +70,6 @@
   {
       ap_context_t *context;
       ap_mmap_t *themmap = NULL;
  -    ap_status_t status = 0;
       ap_file_t *thefile;
       ap_int32_t flag = APR_READ;
       char *file1;
  @@ -87,13 +87,6 @@
       getcwd(file1, PATH_LEN);
       strncat(file1,"/testmmap.c",11);  
   
  -    fprintf(stdout,"Trying to mmap file.................");
  -    if (ap_mmap_create(&themmap, file1, context) != APR_SUCCESS) {
  -        fprintf(stderr,"Failed.\n");
  -        exit (-1);
  -    }
  -    fprintf(stdout,"OK\n");
  -    
       fprintf(stdout,"Trying to delete the mmap file......");
       if (ap_mmap_delete(themmap) != APR_SUCCESS) {
           fprintf(stderr,"Failed!\n");
  @@ -111,7 +104,7 @@
       }
   
       fprintf(stdout,"Trying to mmap the open file........");
  -    if (ap_mmap_open_create(&themmap, thefile, context) != APR_SUCCESS) {
  +    if (ap_mmap_create(&themmap, thefile, 0, 0, context) != APR_SUCCESS) {
           fprintf(stderr,"Failed!\n");
           exit(-1);
       }
  
  
  
  1.6       +19 -2     apache-2.0/src/lib/apr/test/testproc.c
  
  Index: testproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testproc.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- testproc.c	1999/10/11 17:52:01	1.5
  +++ testproc.c	1999/12/03 15:18:36	1.6
  @@ -81,12 +81,14 @@
   
       ap_create_context(&context, NULL);
   
  -    teststr = ap_pstrdup(context, "Whooo Hoooo\0");
   
       if (argc > 1) {
  +        teststr = ap_palloc(context, 256);
  +        teststr = fgets(teststr, 256, stdin);      
           fprintf(stdout, "%s", teststr);      
           exit(1);
       }
  +    teststr = ap_pstrdup(context, "Whooo Hoooo\0");
   
       fprintf(stdout, "Creating directory for later use.......");
       if (ap_make_dir("proctest", APR_UREAD | APR_UWRITE | APR_UEXECUTE, context) != APR_SUCCESS) {
  @@ -103,7 +105,8 @@
       fprintf(stdout, "OK.\n");
   
       fprintf(stdout, "Setting attr pipes, all three.......");
  -    if (ap_setprocattr_io(attr, 1, 1, 0) != APR_SUCCESS) {
  +    if (ap_setprocattr_io(attr, APR_FULL_BLOCK, 
  +                          APR_CHILD_BLOCK, APR_NO_PIPE) != APR_SUCCESS) {
           fprintf(stderr, "Could not set pipes attr\n");
           exit(-1);
       }
  @@ -133,6 +136,20 @@
           exit(-1);
       }
       fprintf(stdout, "OK.\n");
  +
  +    fprintf(stdout, "Grabbing child's stdin.......");
  +    if (ap_get_childin(&testfile, newproc) != APR_SUCCESS) {
  +        fprintf(stderr, "Could not get child's stdout\n");
  +        exit(-1);
  +    }
  +    fprintf(stdout, "OK.\n");
  +
  +    length = 256;
  +    fprintf(stdout, "Writing the data to child.......");
  +    if (ap_write(testfile, teststr, &length) == APR_SUCCESS) {
  +        fprintf(stdout,"OK\n");
  +    }
  +    else fprintf(stderr, "Write failed.\n");
   
       fprintf(stdout, "Grabbing child's stdout.......");
       if (ap_get_childout(&testfile, newproc) != APR_SUCCESS) {
  
  
  
  1.7       +22 -15    apache-2.0/src/lib/apr/threadproc/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	1999/10/30 05:59:25	1.6
  +++ Makefile.in	1999/12/03 15:18:37	1.7
  @@ -58,30 +58,37 @@
   # DO NOT REMOVE
   proc.o: proc.c threadproc.h ../../include/apr_config.h \
    ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
  - ../../include/apr_general.h ../../include/apr_errno.h \
  - ../../include/apr_win.h ../../file_io/unix/fileio.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../file_io/unix/fileio.h \
    ../../include/apr_lib.h ../../include/apr_portable.h \
    ../../include/apr_network_io.h ../../include/apr_lock.h \
    ../../include/apr_time.h
   procsup.o: procsup.c threadproc.h ../../include/apr_config.h \
    ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
  - ../../include/apr_general.h ../../include/apr_errno.h \
  - ../../include/apr_win.h ../../file_io/unix/fileio.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../file_io/unix/fileio.h \
    ../../include/apr_lib.h
   signals.o: signals.c threadproc.h ../../include/apr_config.h \
    ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
  - ../../include/apr_general.h ../../include/apr_errno.h \
  - ../../include/apr_win.h ../../file_io/unix/fileio.h
  -thread.o: thread.c ../../include/apr_config.h threadproc.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../file_io/unix/fileio.h \
  + ../../include/apr_lib.h
  +thread.o: thread.c threadproc.h ../../include/apr_config.h \
    ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
  - ../../include/apr_general.h ../../include/apr_errno.h \
  - ../../include/apr_win.h ../../include/apr_portable.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../file_io/unix/fileio.h \
  + ../../include/apr_lib.h ../../include/apr_portable.h \
    ../../include/apr_network_io.h ../../include/apr_lock.h \
  - ../../include/apr_time.h ../../include/apr_lib.h
  -threadcancel.o: threadcancel.c
  -threadpriv.o: threadpriv.c ../../include/apr_config.h threadproc.h \
  + ../../include/apr_time.h
  +threadcancel.o: threadcancel.c threadproc.h ../../include/apr_config.h \
    ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
  - ../../include/apr_general.h ../../include/apr_errno.h \
  - ../../include/apr_win.h ../../include/apr_portable.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../file_io/unix/fileio.h \
  + ../../include/apr_lib.h
  +threadpriv.o: threadpriv.c threadproc.h ../../include/apr_config.h \
  + ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
  + ../../include/apr_general.h ../../include/apr.h \
  + ../../include/apr_errno.h ../../file_io/unix/fileio.h \
  + ../../include/apr_lib.h ../../include/apr_portable.h \
    ../../include/apr_network_io.h ../../include/apr_lock.h \
  - ../../include/apr_time.h ../../include/apr_lib.h
  + ../../include/apr_time.h
  
  
  
  1.13      +27 -37    apache-2.0/src/lib/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- proc.c	1999/12/02 19:21:05	1.12
  +++ proc.c	1999/12/03 15:18:37	1.13
  @@ -54,17 +54,7 @@
    */
   
   #include "threadproc.h"
  -#include "fileio.h"
  -
  -#include "apr_thread_proc.h"
  -#include "apr_file_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
   #include "apr_portable.h"
  -#include <signal.h>
  -#include <string.h>
  -#include <sys/wait.h>
  -#include <unistd.h>
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_createprocattr_init(ap_procattr_t **, ap_context_t *)
  @@ -110,46 +100,46 @@
       if (in != 0) {
           if ((status = ap_create_pipe(&attr->child_in, &attr->parent_in, 
                                      attr->cntxt)) != APR_SUCCESS) {
  -            switch (in) {
  -            case APR_FULL_BLOCK:
  -                ap_block_pipe(attr->child_in);
  -                ap_block_pipe(attr->parent_in);
  -            case APR_PARENT_BLOCK:
  -                ap_block_pipe(attr->parent_in);
  -            case APR_CHILD_BLOCK:
  -                ap_block_pipe(attr->child_in);
  -            }
               return status;
           }
  +        switch (in) {
  +        case APR_FULL_BLOCK:
  +            ap_block_pipe(attr->child_in);
  +            ap_block_pipe(attr->parent_in);
  +        case APR_PARENT_BLOCK:
  +            ap_block_pipe(attr->parent_in);
  +        case APR_CHILD_BLOCK:
  +            ap_block_pipe(attr->child_in);
  +        }
       } 
       if (out) {
           if ((status = ap_create_pipe(&attr->parent_out, &attr->child_out, 
                                      attr->cntxt)) != APR_SUCCESS) {
  -            switch (out) {
  -            case APR_FULL_BLOCK:
  -                ap_block_pipe(attr->child_out);
  -                ap_block_pipe(attr->parent_out);
  -            case APR_PARENT_BLOCK:
  -                ap_block_pipe(attr->parent_out);
  -            case APR_CHILD_BLOCK:
  -                ap_block_pipe(attr->child_out);
  -            }
               return status;
           }
  +        switch (out) {
  +        case APR_FULL_BLOCK:
  +            ap_block_pipe(attr->child_out);
  +            ap_block_pipe(attr->parent_out);
  +        case APR_PARENT_BLOCK:
  +            ap_block_pipe(attr->parent_out);
  +        case APR_CHILD_BLOCK:
  +            ap_block_pipe(attr->child_out);
  +        }
       } 
       if (err) {
           if ((status = ap_create_pipe(&attr->parent_err, &attr->child_err, 
                                      attr->cntxt)) != APR_SUCCESS) {
  -            switch (err) {
  -            case APR_FULL_BLOCK:
  -                ap_block_pipe(attr->child_err);
  -                ap_block_pipe(attr->parent_err);
  -            case APR_PARENT_BLOCK:
  -                ap_block_pipe(attr->parent_err);
  -            case APR_CHILD_BLOCK:
  -                ap_block_pipe(attr->child_err);
  -            }
               return status;
  +        }
  +        switch (err) {
  +        case APR_FULL_BLOCK:
  +            ap_block_pipe(attr->child_err);
  +            ap_block_pipe(attr->parent_err);
  +        case APR_PARENT_BLOCK:
  +            ap_block_pipe(attr->parent_err);
  +        case APR_CHILD_BLOCK:
  +            ap_block_pipe(attr->child_err);
           }
       } 
       return APR_SUCCESS;
  
  
  
  1.9       +0 -8      apache-2.0/src/lib/apr/threadproc/unix/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/procsup.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- procsup.c	1999/12/02 17:05:51	1.8
  +++ procsup.c	1999/12/03 15:18:39	1.9
  @@ -54,14 +54,6 @@
    */
   
   #include "threadproc.h"
  -#include "fileio.h"
  -
  -#include "apr_config.h"
  -#include "apr_thread_proc.h"
  -#include "apr_file_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
  -#include <unistd.h>
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_detach(ap_context_t *, ap_proc_t *)
  
  
  
  1.3       +0 -7      apache-2.0/src/lib/apr/threadproc/unix/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/signals.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- signals.c	1999/10/01 16:18:37	1.2
  +++ signals.c	1999/12/03 15:18:41	1.3
  @@ -54,13 +54,6 @@
    */
   
   #include "threadproc.h"
  -#include "fileio.h"
  -#include "apr_thread_proc.h"
  -#include "apr_file_io.h"
  -#include "apr_general.h"
  -#include <signal.h>
  -#include <string.h>
  -#include <sys/wait.h>
   
   ap_status_t ap_kill(struct proc_t *proc, int sig)
   {
  
  
  
  1.9       +2 -7      apache-2.0/src/lib/apr/threadproc/unix/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- thread.c	1999/10/21 14:31:22	1.8
  +++ thread.c	1999/12/03 15:18:41	1.9
  @@ -53,15 +53,10 @@
    *
    */
   
  -#include "apr_config.h"
  -
  -#ifdef APR_HAS_THREADS
  -
   #include "threadproc.h"
  -#include "apr_thread_proc.h"
  -#include "apr_general.h"
   #include "apr_portable.h"
  -#include "apr_lib.h"
  +
  +#ifdef APR_HAS_THREADS
   
   #ifdef HAVE_PTHREAD_H
   /* ***APRDOC********************************************************
  
  
  
  1.5       +1 -4      apache-2.0/src/lib/apr/threadproc/unix/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadcancel.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- threadcancel.c	1999/10/21 14:31:22	1.4
  +++ threadcancel.c	1999/12/03 15:18:41	1.5
  @@ -53,11 +53,8 @@
    *
    */
   
  -#if APR_HAS_THREADS
  -
   #include "threadproc.h"
  -#include "apr_thread_proc.h"
  -#include "apr_general.h"
  +#if APR_HAS_THREADS
   
   #ifdef HAVE_PTHREAD_H
   
  
  
  
  1.9       +0 -5      apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- threadpriv.c	1999/10/21 14:31:23	1.8
  +++ threadpriv.c	1999/12/03 15:18:42	1.9
  @@ -53,13 +53,8 @@
    *
    */
   
  -#include "apr_config.h"
   #include "threadproc.h"
  -#include "apr_thread_proc.h"
  -#include "apr_general.h"
  -#include "apr_errno.h"
   #include "apr_portable.h"
  -#include "apr_lib.h"
   
   #if APR_HAS_THREADS
   
  
  
  
  1.5       +19 -0     apache-2.0/src/lib/apr/threadproc/unix/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadproc.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- threadproc.h	1999/10/21 14:31:26	1.4
  +++ threadproc.h	1999/12/03 15:18:42	1.5
  @@ -55,7 +55,26 @@
   #include "apr_config.h"
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
  +#include "fileio.h"
  +
  +/* System headers required for thread/process library */
  +#if HAVE_PTHREAD_H
   #include <pthread.h>
  +#endif
  +#if HAVE_SIGNAL_H
  +#include <signal.h>
  +#endif
  +#if HAVE_STRING_H
  +#include <string.h>
  +#endif
  +#if HAVE_SYS_WAIT_H
  +#include <sys/wait.h>
  +#endif
  +#if HAVE_STRING_H
  +#include <string.h>
  +#endif
  +/* End System Headers */
  +
   
   #ifndef THREAD_PROC_H
   #define THREAD_PROC_H
  
  
  
  1.6       +8 -8      apache-2.0/src/lib/apr/time/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in	1999/09/23 18:19:08	1.5
  +++ Makefile.in	1999/12/03 15:18:48	1.6
  @@ -51,13 +51,13 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -access.o: access.c atime.h ../../include/apr_time.h \
  - ../../include/apr_general.h ../../include/apr_config.h \
  - ../../include/apr_errno.h ../../include/apr_lib.h \
  +access.o: access.c atime.h ../../include/apr_config.h \
  + ../../include/apr_time.h ../../include/apr_general.h \
  + ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
    ../../include/apr_file_io.h
  -time.o: time.c atime.h ../../include/apr_time.h \
  - ../../include/apr_general.h ../../include/apr_config.h \
  - ../../include/apr_errno.h ../../include/apr_lib.h \
  +time.o: time.c atime.h ../../include/apr_config.h \
  + ../../include/apr_time.h ../../include/apr_general.h \
  + ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
    ../../include/apr_file_io.h ../../include/apr_portable.h \
  - ../../include/apr_thread_proc.h ../../include/apr_win.h \
  - ../../include/apr_network_io.h ../../include/apr_lock.h
  + ../../include/apr_thread_proc.h ../../include/apr_network_io.h \
  + ../../include/apr_lock.h
  
  
  
  1.7       +0 -5      apache-2.0/src/lib/apr/time/unix/access.c
  
  Index: access.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/access.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- access.c	1999/10/15 14:20:29	1.6
  +++ access.c	1999/12/03 15:18:48	1.7
  @@ -54,11 +54,6 @@
    */
   
   #include "atime.h"
  -#include "apr_time.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
  -#include <errno.h>
  -#include <string.h>
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_get_curtime(ap_time_t *, ap_int64_t *)
  
  
  
  1.2       +7 -0      apache-2.0/src/lib/apr/time/unix/atime.h
  
  Index: atime.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/atime.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- atime.h	1999/08/17 15:59:53	1.1
  +++ atime.h	1999/12/03 15:18:49	1.2
  @@ -56,8 +56,15 @@
   #ifndef ATIME_H
   #define ATIME_H
   
  +#include "apr_config.h"
   #include "apr_time.h"
  +#include "apr_lib.h"
  +
  +/* System Headers required for time library */
  +#if HAVE_SYS_TIME_H
   #include <sys/time.h>
  +#endif
  +/* End System Headers */
   
   struct atime_t {
       ap_context_t *cntxt;
  
  
  
  1.12      +0 -6      apache-2.0/src/lib/apr/time/unix/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/time.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- time.c	1999/10/31 16:18:35	1.11
  +++ time.c	1999/12/03 15:18:49	1.12
  @@ -54,13 +54,7 @@
    */
   
   #include "atime.h"
  -#include "apr_time.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
   #include "apr_portable.h"
  -#include <time.h>
  -#include <errno.h>
  -#include <string.h>
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_make_time(ap_context_t *, ap_time_t *)
  
  
  

Mime
View raw message