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/os/unix Makefile.tmpl
Date Wed, 17 Nov 1999 21:39:51 GMT
rbb         99/11/17 13:39:48

  Modified:    .        STATUS
               src      Makefile.tmpl
               src/ap   Makefile.tmpl
               src/include ap.h httpd.h
               src/lib/apr/mmap/unix Makefile.in
               src/main Makefile.tmpl http_vhost.c
               src/modules/experimental Makefile.tmpl
               src/modules/mpm/prefork Makefile.tmpl
               src/modules/standard Makefile.tmpl mod_auth.c
               src/os/unix Makefile.tmpl
  Removed:     src/include apr.h
  Log:
  Cleaned up the APRFile uses in Apache.  Also removed the apr.h header file
  because it is no longer used.  Finally, I updated the dependancies to
  compile cleanly.
  
  Revision  Changes    Path
  1.16      +1 -3      apache-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apache-2.0/STATUS,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- STATUS	1999/11/16 18:30:18	1.15
  +++ STATUS	1999/11/17 21:39:16	1.16
  @@ -1,5 +1,5 @@
   Apache 2.0 STATUS:
  -Last modified at [$Date: 1999/11/16 18:30:18 $]
  +Last modified at [$Date: 1999/11/17 21:39:16 $]
   
   Release:
   
  @@ -104,8 +104,6 @@
           Status: No one has come up with an efficient way to fix this
           behavior. Dean has suggested getting rid of regex containers
           completely.
  -
  -    * Areas where APRFile is being used need to be cleaned-up
   
       * SIGSEGV on Linux seems to only kill a thread, not a whole process;
         we need to work around this, probably by bouncing the signal to
  
  
  
  1.11      +2 -2      apache-2.0/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.tmpl,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.tmpl	1999/10/30 05:59:19	1.10
  +++ Makefile.tmpl	1999/11/17 21:39:17	1.11
  @@ -127,12 +127,12 @@
    lib/apr/include/apr_general.h lib/apr/include/apr_config.h \
    lib/apr/include/apr_errno.h lib/apr/include/apr_lib.h \
    lib/apr/include/apr_file_io.h include/buff.h include/ap_iol.h \
  - include/ap.h include/apr.h include/util_uri.h
  + include/ap.h include/util_uri.h
   modules.o: modules.c include/httpd.h include/ap_config.h \
    include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \
    os/unix/os-inline.c include/ap_ctype.h include/hsregex.h \
    lib/apr/include/apr_general.h lib/apr/include/apr_config.h \
    lib/apr/include/apr_errno.h lib/apr/include/apr_lib.h \
    lib/apr/include/apr_file_io.h include/buff.h include/ap_iol.h \
  - include/ap.h include/apr.h include/util_uri.h include/http_config.h \
  + include/ap.h include/util_uri.h include/http_config.h \
    include/ap_hooks.h
  
  
  
  1.9       +5 -62     apache-2.0/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/Makefile.tmpl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.tmpl	1999/10/30 05:59:20	1.8
  +++ Makefile.tmpl	1999/11/17 21:39:19	1.9
  @@ -40,78 +40,21 @@
   # DO NOT REMOVE
   ap_base64.o: ap_base64.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h
   ap_buf.o: ap_buf.c
  -ap_checkpass.o: ap_checkpass.c $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/ap_md5.h $(INCDIR)/ap_sha1.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h
  -ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
  - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h
  -ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
  - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h
  -ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
  -ap_getpass.o: ap_getpass.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h
   ap_hooks.o: ap_hooks.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/ap_hooks.h
  -ap_md5c.o: ap_md5c.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_md5.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/ap_hooks.h
   ap_sha1.o: ap_sha1.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/ap_sha1.h
  -ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
  - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h
  -ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
  - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_log.h
  -ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
  - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/ap_sha1.h
  
  
  
  1.6       +0 -2      apache-2.0/src/include/ap.h
  
  Index: ap.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ap.h	1999/11/17 15:28:31	1.5
  +++ ap.h	1999/11/17 21:39:21	1.6
  @@ -58,8 +58,6 @@
    * Tsirigotis <panos@alumni.cs.colorado.edu> for xinetd.
    */
   
  -#include "apr.h"
  -
   #ifndef APACHE_AP_H
   #define APACHE_AP_H
   
  
  
  
  1.13      +3 -1      apache-2.0/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- httpd.h	1999/11/02 15:15:04	1.12
  +++ httpd.h	1999/11/17 21:39:23	1.13
  @@ -73,7 +73,6 @@
   #include "apr_lib.h"
   #include "buff.h"
   #include "ap.h"
  -#include "apr.h"
   
   /* ----------------------------- config dir ------------------------------ */
   
  @@ -1081,6 +1080,8 @@
   #endif
   /* #define HIGH_SLACK_LINE      255 */
   
  +#if 0
  +/*  Moved to APR now.*/
   /*
    * The ap_slack() function takes a fd, and tries to move it above the indicated
    * line.  It returns an fd which may or may not have moved above the line, and
  @@ -1093,6 +1094,7 @@
   APRFile ap_slack(APRFile fd, int line);
   #define AP_SLACK_LOW	1
   #define AP_SLACK_HIGH	2
  +#endif
   #endif
   
   API_EXPORT(char *) ap_escape_quotes(ap_context_t *p, const char *instr);
  
  
  
  1.5       +14 -1     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	1999/11/03 12:30:58	1.4
  +++ Makefile.in	1999/11/17 21:39:24	1.5
  @@ -50,4 +50,17 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -mmap.o: mmap.c
  +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 \
  + ../../include/apr_lock.h ../../include/apr_time.h \
  + ../../file_io/unix/fileio.h ../../include/apr_lib.h
  
  
  
  1.8       +44 -50    apache-2.0/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/Makefile.tmpl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.tmpl	1999/10/30 05:59:26	1.7
  +++ Makefile.tmpl	1999/11/17 21:39:25	1.8
  @@ -64,8 +64,8 @@
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_main.h $(INCDIR)/http_log.h
   gen_test_char.o: gen_test_char.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  @@ -73,8 +73,7 @@
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h
   gen_uri_delims.o: gen_uri_delims.c
   http_config.o: http_config.c ../lib/apr/include/apr_portable.h \
    ../lib/apr/include/apr_config.h ../lib/apr/include/apr_general.h \
  @@ -86,10 +85,10 @@
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
    ../lib/apr/include/apr_lib.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_log.h $(INCDIR)/http_request.h \
  - $(INCDIR)/http_main.h $(INCDIR)/http_vhost.h $(INCDIR)/explain.h
  + $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_main.h \
  + $(INCDIR)/http_vhost.h $(INCDIR)/explain.h
   http_connection.o: http_connection.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  @@ -97,11 +96,10 @@
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_connection.h \
  - $(INCDIR)/ap_hooks.h ../lib/apr/include/apr_network_io.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
  - ../lib/apr/include/apr_portable.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_connection.h $(INCDIR)/ap_hooks.h \
  + ../lib/apr/include/apr_network_io.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
    ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
    ../lib/apr/include/apr_lock.h ../lib/apr/include/apr_time.h \
    $(INCDIR)/ap_mpm.h $(INCDIR)/mpm_status.h $(INCDIR)/http_config.h \
  @@ -112,10 +110,9 @@
    $(INCDIR)/httpd.h $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  - ../lib/apr/include/apr_portable.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
    ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
    ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
    ../lib/apr/include/apr_time.h $(INCDIR)/http_request.h \
  @@ -132,19 +129,18 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_main.h
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_main.h
   http_main.o: http_main.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_main.h $(INCDIR)/http_config.h \
  - $(INCDIR)/ap_hooks.h $(INCDIR)/ap_mpm.h \
  - ../lib/expat-lite/xmlparse.h
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_main.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  + $(INCDIR)/ap_mpm.h ../lib/expat-lite/xmlparse.h
   http_protocol.o: http_protocol.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  @@ -152,10 +148,9 @@
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  - ../lib/apr/include/apr_portable.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
    ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
    ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
    ../lib/apr/include/apr_time.h $(INCDIR)/http_main.h \
  @@ -168,8 +163,8 @@
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
    ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
  @@ -182,10 +177,10 @@
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_log.h $(INCDIR)/http_vhost.h \
  - $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_vhost.h $(INCDIR)/http_protocol.h \
  + ../lib/apr/include/apr_portable.h \
    ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
    ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
    ../lib/apr/include/apr_time.h $(INCDIR)/http_core.h
  @@ -195,8 +190,7 @@
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h
   listen.o: listen.c ../lib/apr/include/apr_network_io.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h $(INCDIR)/httpd.h \
  @@ -205,25 +199,25 @@
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
    ../lib/apr/include/apr_lib.h ../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/ap_hooks.h $(INCDIR)/ap_listen.h $(INCDIR)/http_log.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  + $(INCDIR)/ap_listen.h $(INCDIR)/http_log.h
   rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \
  - $(INCDIR)/http_main.h ../lib/apr/include/apr_network_io.h
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h $(INCDIR)/http_main.h \
  + ../lib/apr/include/apr_network_io.h
   util.o: util.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/ap_hooks.h \
    ../lib/apr/include/apr_portable.h \
    ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
  @@ -242,17 +236,17 @@
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
    ../lib/apr/include/apr_lib.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h
  + $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/util_md5.h \
  + $(INCDIR)/ap_md5.h
   util_script.o: util_script.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/http_core.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_main.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
    ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
    ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
  @@ -264,5 +258,5 @@
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_log.h uri_delims.h
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_log.h uri_delims.h
  
  
  
  1.8       +16 -14    apache-2.0/src/main/http_vhost.c
  
  Index: http_vhost.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_vhost.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- http_vhost.c	1999/11/16 18:30:46	1.7
  +++ http_vhost.c	1999/11/17 21:39:26	1.8
  @@ -409,16 +409,14 @@
       return NULL;
   }
   
  -
  -static void dump_vhost_config(APRFile fd)
  +static void dump_vhost_config(ap_file_t *f)
   {
       int i;
       ipaddr_chain *ic;
       name_chain *nc;
       char buf[MAX_STRING_LEN];
  -    FILE * f = fdopen(fd, "w");
   
  -    fprintf(f, "VirtualHost configuration:\n");
  +    ap_fprintf(f, "VirtualHost configuration:\n");
       for (i = 0; i < IPHASH_TABLE_SIZE; ++i) {
   	for (ic = iphash_table[i]; ic; ic = ic->next) {
   	    if (ic->sar->host_port == 0) {
  @@ -429,23 +427,23 @@
   		    ic->sar->host_port);
   	    }
   	    if (ic->names == NULL) {
  -		fprintf(f, "%-22s %s (%s:%u)\n", buf,
  +		ap_fprintf(f, "%-22s %s (%s:%u)\n", buf,
   		    ic->server->server_hostname, ic->server->defn_name,
   		    ic->server->defn_line_number);
   		continue;
   	    }
  -	    fprintf(f, "%-22s is a NameVirtualHost\n"
  +	    ap_fprintf(f, "%-22s is a NameVirtualHost\n"
   	               "%22s default server %s (%s:%u)\n",
   		       buf, "", ic->server->server_hostname,
   		       ic->server->defn_name, ic->server->defn_line_number);
   	    for (nc = ic->names; nc; nc = nc->next) {
   		if (nc->sar->host_port) {
  -		    fprintf(f, "%22s port %u ", "", nc->sar->host_port);
  +		    ap_fprintf(f, "%22s port %u ", "", nc->sar->host_port);
   		}
   		else {
  -		    fprintf(f, "%22s port * ", "");
  +		    ap_fprintf(f, "%22s port * ", "");
   		}
  -		fprintf(f, "namevhost %s (%s:%u)\n",
  +		ap_fprintf(f, "namevhost %s (%s:%u)\n",
   			nc->server->server_hostname,
   			nc->server->defn_name,
   			nc->server->defn_line_number);
  @@ -453,15 +451,15 @@
   	}
       }
       if (default_list) {
  -	fprintf(f, "_default_ servers:\n");
  +	ap_fprintf(f, "_default_ servers:\n");
   	for (ic = default_list; ic; ic = ic->next) {
   	    if (ic->sar->host_port == 0) {
  -		fprintf(f, "port * ");
  +		ap_fprintf(f, "port * ");
   	    }
   	    else {
  -		fprintf(f, "port %u ", ic->sar->host_port);
  +		ap_fprintf(f, "port %u ", ic->sar->host_port);
   	    }
  -	    fprintf(f, "server %s (%s:%u)\n",
  +	    ap_fprintf(f, "server %s (%s:%u)\n",
   		ic->server->server_hostname, ic->server->defn_name,
   		ic->server->defn_line_number);
   	}
  @@ -649,7 +647,11 @@
       dump_iphash_statistics(main_s);
   #endif
       if (getenv("DUMP_VHOSTS")) {
  -	dump_vhost_config(STDERR_FILENO);
  +        int errfileno = STDERR_FILENO;
  +        ap_file_t *thefile = NULL;
  +
  +        ap_put_os_file(&thefile, &errfileno, p);
  +	dump_vhost_config(thefile);
       }
   }
   
  
  
  
  1.3       +12 -3     apache-2.0/src/modules/experimental/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/experimental/Makefile.tmpl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.tmpl	1999/09/01 22:48:14	1.2
  +++ Makefile.tmpl	1999/11/17 21:39:30	1.3
  @@ -7,8 +7,17 @@
   mod_mmap_static.o: mod_mmap_static.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  + $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
  + ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
  + ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
    $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
  + ../../lib/apr/include/apr_thread_proc.h \
  + ../../lib/apr/include/apr_win.h \
  + ../../lib/apr/include/apr_network_io.h \
  + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h
  
  
  
  1.13      +1 -2      apache-2.0/src/modules/mpm/prefork/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/Makefile.tmpl,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Makefile.tmpl	1999/10/30 05:59:29	1.12
  +++ Makefile.tmpl	1999/11/17 21:39:37	1.13
  @@ -70,8 +70,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    $(INCDIR)/hsregex.h ../../../lib/apr/include/apr_lib.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h mpm_default.h \
  + $(INCDIR)/ap.h $(INCDIR)/util_uri.h mpm_default.h \
    $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \
  
  
  
  1.8       +118 -135  apache-2.0/src/modules/standard/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/Makefile.tmpl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.tmpl	1999/10/30 05:59:29	1.7
  +++ Makefile.tmpl	1999/11/17 21:39:41	1.8
  @@ -12,10 +12,9 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_config.h \
  - $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_request.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_request.h
   mod_actions.o: mod_actions.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  @@ -24,10 +23,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -42,9 +41,8 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_request.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h
   mod_asis.o: mod_asis.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  @@ -52,23 +50,24 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
    ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
    $(INCDIR)/http_log.h $(INCDIR)/util_script.h \
    $(INCDIR)/http_main.h $(INCDIR)/http_request.h
  -mod_auth.o: mod_auth.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
  - $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
  +mod_auth.o: mod_auth.c ../../lib/apr/include/apr_md5.h \
  + ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
  - ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + ../../lib/apr/include/apr_file_io.h $(INCDIR)/httpd.h \
  + $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  + $(INCDIR)/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  @@ -85,10 +84,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -102,10 +101,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -118,10 +117,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -134,11 +133,11 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_conf_globals.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_conf_globals.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -153,10 +152,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_request.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -171,10 +170,9 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/util_script.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_request.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/util_script.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_request.h
   mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  @@ -182,10 +180,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -200,10 +198,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -216,10 +214,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_request.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -233,9 +231,8 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_connection.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_connection.h \
    ../../lib/apr/include/apr_network_io.h
   mod_env.o: mod_env.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
  @@ -244,9 +241,8 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_request.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h
   mod_expires.o: mod_expires.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  @@ -255,9 +251,8 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_log.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h
   mod_headers.o: mod_headers.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  @@ -266,8 +261,8 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h
   mod_imap.o: mod_imap.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  @@ -275,10 +270,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -293,10 +288,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -310,11 +305,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_main.h $(INCDIR)/http_protocol.h \
  - ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
  + $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -328,9 +322,8 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_log.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h
   mod_log_config.o: mod_log_config.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  @@ -339,10 +332,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -355,9 +348,8 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_log.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h
   mod_mime.o: mod_mime.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  @@ -365,9 +357,9 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_log.h $(INCDIR)/http_request.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_request.h
   mod_mime_magic.o: mod_mime_magic.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  @@ -376,11 +368,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  - ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -393,10 +384,9 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
  - ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -411,11 +401,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_conf_globals.h $(INCDIR)/http_request.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_vhost.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_conf_globals.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_vhost.h
   mod_setenvif.o: mod_setenvif.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  @@ -424,10 +413,10 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -439,9 +428,8 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_log.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h
   mod_speling.o: mod_speling.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  @@ -450,9 +438,9 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_config.h \
  - $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  + $(INCDIR)/http_log.h
   mod_status.o: mod_status.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  @@ -461,10 +449,9 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  - ../../lib/apr/include/apr_portable.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
    ../../lib/apr/include/apr_thread_proc.h \
    ../../lib/apr/include/apr_win.h \
    ../../lib/apr/include/apr_network_io.h \
  @@ -478,9 +465,8 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_log.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h
   mod_userdir.o: mod_userdir.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  @@ -489,9 +475,8 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_request.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h
   mod_usertrack.o: mod_usertrack.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  @@ -500,9 +485,8 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h
   mod_vhost_alias.o: mod_vhost_alias.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  @@ -511,6 +495,5 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h
  
  
  
  1.11      +1 -0      apache-2.0/src/modules/standard/mod_auth.c
  
  Index: mod_auth.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_auth.c	1999/11/02 15:15:08	1.10
  +++ mod_auth.c	1999/11/17 21:39:42	1.11
  @@ -69,6 +69,7 @@
    *         no control is passed along.
    */
   
  +#include "apr_md5.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_core.h"
  
  
  
  1.7       +5 -4      apache-2.0/src/os/unix/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/unix/Makefile.tmpl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.tmpl	1999/10/30 05:59:32	1.6
  +++ Makefile.tmpl	1999/11/17 21:39:46	1.7
  @@ -46,7 +46,8 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h iol_socket.h
  + $(INCDIR)/util_uri.h ../../lib/apr/include/apr_network_io.h \
  + iol_socket.h
   os-aix-dso.o: os-aix-dso.c
   os-inline.o: os-inline.c $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
  @@ -62,6 +63,6 @@
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_main.h $(INCDIR)/http_log.h unixd.h
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_hooks.h $(INCDIR)/http_main.h \
  + $(INCDIR)/http_log.h unixd.h
  
  
  

Mime
View raw message