httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@hyperreal.org
Subject cvs commit: apache-2.0/mpm/src/os/unix Makefile.tmpl
Date Tue, 29 Jun 1999 09:00:33 GMT
ben         99/06/29 02:00:32

  Modified:    mpm/src  Makefile.tmpl
               mpm/src/ap Makefile.tmpl
               mpm/src/include http_config.h http_connection.h httpd.h
               mpm/src/main Makefile.tmpl http_config.c http_connection.c
               mpm/src/modules/mpm/prefork Makefile.tmpl prefork.c
               mpm/src/modules/standard Makefile.tmpl
               mpm/src/os/unix Makefile.tmpl
  Log:
  New API for I/O layering, and dependency updates.
  
  Revision  Changes    Path
  1.4       +5 -6      apache-2.0/mpm/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/Makefile.tmpl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.tmpl	1999/06/20 23:14:29	1.3
  +++ Makefile.tmpl	1999/06/29 09:00:04	1.4
  @@ -123,11 +123,10 @@
   # DO NOT REMOVE
   buildmark.o: buildmark.c 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 include/httpd.h include/alloc.h \
  - include/buff.h include/ap_iol.h include/ap.h include/apr.h \
  - include/util_uri.h
  + include/ap_ctype.h include/httpd.h include/alloc.h include/buff.h \
  + include/ap_iol.h include/ap.h include/apr.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 \
  - include/alloc.h include/buff.h include/ap_iol.h include/ap.h \
  - include/apr.h include/util_uri.h include/http_config.h
  + os/unix/os-inline.c include/ap_ctype.h include/alloc.h include/buff.h \
  + include/ap_iol.h include/ap.h include/apr.h include/util_uri.h \
  + include/http_config.h
  
  
  
  1.5       +20 -22    apache-2.0/mpm/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/ap/Makefile.tmpl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.tmpl	1999/06/20 23:14:30	1.4
  +++ Makefile.tmpl	1999/06/29 09:00:06	1.5
  @@ -41,41 +41,39 @@
   # DO NOT REMOVE
   ap_buf.o: ap_buf.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_buf.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/ap_buf.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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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
  + $(INCDIR)/ap_ctype.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
  + $(INCDIR)/ap_ctype.h $(INCDIR)/ap.h $(INCDIR)/apr.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_ctype.h $(INCDIR)/ap_md5.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_log.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h
  
  
  
  1.3       +6 -0      apache-2.0/mpm/src/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/include/http_config.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- http_config.h	1999/06/20 22:59:50	1.2
  +++ http_config.h	1999/06/29 09:00:08	1.3
  @@ -249,6 +249,7 @@
       int (*logger) (request_rec *);
       int (*header_parser) (request_rec *);
       int (*post_read_request) (request_rec *);
  +    int (*pre_connection) (conn_rec *);
   } module;
   
   /* Initializer for the first few module slots, which are only
  @@ -354,6 +355,10 @@
   CORE_EXPORT(void *) ap_create_per_dir_config(pool *p);
   void *ap_merge_per_dir_configs(pool *p, void *base, void *new);
   
  +/* For http_connection.c... */
  +
  +void *ap_create_conn_config(pool *p);
  +
   /* For http_core.c... (<Directory> command and virtual hosts) */
   
   int ap_parse_htaccess(void **result, request_rec *r, int override,
  @@ -375,6 +380,7 @@
   int ap_log_transaction(request_rec *r);
   int ap_header_parse(request_rec *);
   int ap_run_post_read_request(request_rec *);
  +int ap_run_pre_connection(conn_rec *c);
   
   /* for mod_perl */
   
  
  
  
  1.2       +4 -0      apache-2.0/mpm/src/include/http_connection.h
  
  Index: http_connection.h
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/include/http_connection.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- http_connection.h	1999/06/18 18:39:29	1.1
  +++ http_connection.h	1999/06/29 09:00:08	1.2
  @@ -62,6 +62,10 @@
   extern "C" {
   #endif
   
  +conn_rec *ap_new_connection(pool *p, server_rec *server, BUFF *inout,
  +			    const struct sockaddr_in *remaddr,
  +			    const struct sockaddr_in *saddr,
  +			    int child_num);
   CORE_EXPORT(void) ap_process_connection(conn_rec *);
   
   #ifdef __cplusplus
  
  
  
  1.4       +1 -0      apache-2.0/mpm/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/include/httpd.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- httpd.h	1999/06/25 01:25:06	1.3
  +++ httpd.h	1999/06/29 09:00:09	1.4
  @@ -862,6 +862,7 @@
       signed int double_reverse:2;/* have we done double-reverse DNS?
   				 * -1 yes/failure, 0 not yet, 1 yes/success */
       int keepalives;		/* How many times have we used it? */
  +    void *conn_config;		/* Notes on *this* connection */
   };
   
   /* Per-vhost config... */
  
  
  
  1.10      +77 -81    apache-2.0/mpm/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile.tmpl	1999/06/25 01:25:07	1.9
  +++ Makefile.tmpl	1999/06/29 09:00:13	1.10
  @@ -60,132 +60,128 @@
   # DO NOT REMOVE
   alloc.o: alloc.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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_log.h $(INCDIR)/ap_mpm.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \
  + $(INCDIR)/ap_mpm.h
   buff.o: buff.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 \
  - $(INCDIR)/alloc.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
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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
   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 \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  + $(INCDIR)/util_uri.h
   gen_uri_delims.o: gen_uri_delims.c
   http_config.o: http_config.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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.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 \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_connection.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_connection.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
    $(INCDIR)/ap_mpm.h $(INCDIR)/http_config.h $(INCDIR)/http_vhost.h
   http_core.o: http_core.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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
  - $(INCDIR)/http_vhost.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
  - $(INCDIR)/rfc1413.h $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
  - $(INCDIR)/fnmatch.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_vhost.h \
  + $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \
  + $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h $(INCDIR)/fnmatch.h
   http_log.o: http_log.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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_main.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.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 \
  - $(INCDIR)/alloc.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_mpm.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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_mpm.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 \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  - $(INCDIR)/http_main.h $(INCDIR)/http_request.h \
  - $(INCDIR)/http_vhost.h $(INCDIR)/http_log.h $(INCDIR)/util_date.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_vhost.h \
  + $(INCDIR)/http_log.h $(INCDIR)/util_date.h
   http_request.o: http_request.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 $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_main.h $(INCDIR)/fnmatch.h
   http_vhost.o: http_vhost.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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_vhost.h $(INCDIR)/http_protocol.h \
  - $(INCDIR)/http_core.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_vhost.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/http_core.h
   iol_file.o: iol_file.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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h
   listen.o: listen.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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_listen.h $(INCDIR)/http_log.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.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 \
  - $(INCDIR)/alloc.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
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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
   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 \
  - $(INCDIR)/alloc.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 test_char.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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 test_char.h
   util_date.o: util_date.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)/util_date.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/util_date.h
   util_md5.o: util_md5.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 \
  - $(INCDIR)/alloc.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
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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
   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 \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_config.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  - $(INCDIR)/http_request.h $(INCDIR)/util_script.h \
  - $(INCDIR)/util_date.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
  + $(INCDIR)/util_script.h $(INCDIR)/util_date.h
   util_uri.o: util_uri.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 \
  - $(INCDIR)/alloc.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
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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
  
  
  
  1.4       +14 -1     apache-2.0/mpm/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_config.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- http_config.c	1999/06/25 01:25:07	1.3
  +++ http_config.c	1999/06/29 09:00:16	1.4
  @@ -214,6 +214,11 @@
       return create_empty_config(p);
   }
   
  +void *ap_create_conn_config(pool *p)
  +{
  +    return create_empty_config(p);
  +}
  +
   CORE_EXPORT(void *) ap_create_per_dir_config(pool *p)
   {
       return create_empty_config(p);
  @@ -276,7 +281,8 @@
       XtOffsetOf(module, fixer_upper),
       XtOffsetOf(module, logger),
       XtOffsetOf(module, header_parser),
  -    XtOffsetOf(module, post_read_request)
  +    XtOffsetOf(module, post_read_request),
  +    XtOffsetOf(module, pre_connection)
   };
   #define NMETHODS	(sizeof (method_offsets)/sizeof (method_offsets[0]))
   
  @@ -290,6 +296,7 @@
       int logger;
       int header_parser;
       int post_read_request;
  +    int pre_connection;
   } offsets_into_method_ptrs;
   
   /*
  @@ -400,6 +407,12 @@
   int ap_run_post_read_request(request_rec *r)
   {
       return run_method(r, offsets_into_method_ptrs.post_read_request, 1);
  +}
  +
  +int ap_run_pre_connection(conn_rec *c)
  +{
  +/* FIXME: either make run_method take a void * or do something nicer */
  +    return run_method((request_rec *)c, offsets_into_method_ptrs.pre_connection, 1);
   }
   
   /* Auth stuff --- anything that defines one of these will presumably
  
  
  
  1.5       +33 -1     apache-2.0/mpm/src/main/http_connection.c
  
  Index: http_connection.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_connection.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- http_connection.c	1999/06/20 23:09:53	1.4
  +++ http_connection.c	1999/06/29 09:00:19	1.5
  @@ -182,13 +182,14 @@
   }
   #endif /* ndef NO_LINGCLOSE */
   
  -
   CORE_EXPORT(void) ap_process_connection(conn_rec *c)
   {
       request_rec *r;
   
       ap_update_vhost_given_ip(c);
   
  +    ap_run_pre_connection(c);
  +
       /*
        * Read and process each request found on our connection
        * until no requests are left or we decide to close.
  @@ -234,4 +235,35 @@
   	ap_bclose(c->client);
       }
   #endif
  +}
  +
  +/* Clearly some of this stuff doesn't belong in a generalised connection
  +   structure, but for now...
  +*/
  +
  +conn_rec *ap_new_connection(pool *p, server_rec *server, BUFF *inout,
  +			    const struct sockaddr_in *remaddr,
  +			    const struct sockaddr_in *saddr,
  +			    int child_num)
  +{
  +    conn_rec *conn = (conn_rec *) ap_pcalloc(p, sizeof(conn_rec));
  +
  +    /* Got a connection structure, so initialize what fields we can
  +     * (the rest are zeroed out by pcalloc).
  +     */
  +
  +    conn->conn_config=ap_create_conn_config(p);
  +
  +    conn->child_num = child_num;
  +
  +    conn->pool = p;
  +    conn->local_addr = *saddr;
  +    conn->base_server = server;
  +    conn->client = inout;
  +
  +    conn->remote_addr = *remaddr;
  +    conn->remote_ip = ap_pstrdup(conn->pool,
  +			      inet_ntoa(conn->remote_addr.sin_addr));
  +
  +    return conn;
   }
  
  
  
  1.4       +6 -6      apache-2.0/mpm/src/modules/mpm/prefork/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/mpm/prefork/Makefile.tmpl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.tmpl	1999/06/25 01:25:10	1.3
  +++ Makefile.tmpl	1999/06/29 09:00:25	1.4
  @@ -59,12 +59,12 @@
    $(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)/alloc.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)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \
  + $(INCDIR)/alloc.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)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_connection.h \
    $(INCDIR)/scoreboard_prefork.h $(INCDIR)/ap_mpm.h \
    $(OSDIR)/unixd.h $(OSDIR)/iol_socket.h \
    $(INCDIR)/ap_listen.h
  
  
  
  1.6       +4 -34     apache-2.0/mpm/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- prefork.c	1999/06/26 12:25:36	1.5
  +++ prefork.c	1999/06/29 09:00:25	1.6
  @@ -2000,36 +2000,6 @@
   #endif
   }
   
  -/*****************************************************************
  - * Connection structures and accounting...
  - */
  -
  -
  -static conn_rec *new_connection(pool *p, server_rec *server, BUFF *inout,
  -			     const struct sockaddr_in *remaddr,
  -			     const struct sockaddr_in *saddr,
  -			     int child_num)
  -{
  -    conn_rec *conn = (conn_rec *) ap_pcalloc(p, sizeof(conn_rec));
  -
  -    /* Got a connection structure, so initialize what fields we can
  -     * (the rest are zeroed out by pcalloc).
  -     */
  -
  -    conn->child_num = child_num;
  -
  -    conn->pool = p;
  -    conn->local_addr = *saddr;
  -    conn->base_server = server;
  -    conn->client = inout;
  -
  -    conn->remote_addr = *remaddr;
  -    conn->remote_ip = ap_pstrdup(conn->pool,
  -			      inet_ntoa(conn->remote_addr.sin_addr));
  -
  -    return conn;
  -}
  -
   #if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
   static void sock_disable_nagle(int s)
   {
  @@ -2353,10 +2323,10 @@
   
   	ap_bpush_iol(conn_io, iol);
   
  -	current_conn = new_connection(ptrans, server_conf, conn_io,
  -				          (struct sockaddr_in *) &sa_client,
  -				          (struct sockaddr_in *) &sa_server,
  -				          my_child_num);
  +	current_conn = ap_new_connection(ptrans, server_conf, conn_io,
  +					 (struct sockaddr_in *) &sa_client,
  +					 (struct sockaddr_in *) &sa_server,
  +					 my_child_num);
   
   	ap_process_connection(current_conn);
       }
  
  
  
  1.4       +147 -162  apache-2.0/mpm/src/modules/standard/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/Makefile.tmpl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.tmpl	1999/06/20 23:14:33	1.3
  +++ Makefile.tmpl	1999/06/29 09:00:28	1.4
  @@ -8,284 +8,269 @@
    $(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)/alloc.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)/http_log.h \
  - $(INCDIR)/http_request.h
  + $(INCDIR)/alloc.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)/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 \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
  - $(INCDIR)/http_log.h $(INCDIR)/util_script.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
  + $(INCDIR)/util_script.h
   mod_alias.o: mod_alias.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.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 \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
  - $(INCDIR)/util_script.h $(INCDIR)/http_main.h \
  - $(INCDIR)/http_request.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_protocol.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/ap_md5.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/ap_md5.h
   mod_auth_anon.o: mod_auth_anon.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_request.h
   mod_auth_db.o: mod_auth_db.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/ap_md5.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/ap_md5.h
   mod_auth_dbm.o: mod_auth_dbm.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/ap_md5.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/ap_md5.h
   mod_autoindex.o: mod_autoindex.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_request.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_main.h $(INCDIR)/util_script.h \
  - $(INCDIR)/fnmatch.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
  + $(INCDIR)/util_script.h $(INCDIR)/fnmatch.h
   mod_cern_meta.o: mod_cern_meta.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/util_script.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_request.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.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 \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
  - $(INCDIR)/http_log.h $(INCDIR)/util_script.h \
  - $(INCDIR)/http_conf_globals.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
  + $(INCDIR)/util_script.h $(INCDIR)/http_conf_globals.h
   mod_digest.o: mod_digest.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \
  - $(INCDIR)/ap_md5.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h
   mod_dir.o: mod_dir.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_request.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_main.h $(INCDIR)/util_script.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
  + $(INCDIR)/util_script.h
   mod_env.o: mod_env.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.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 \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_log.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.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 \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.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 \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
  - $(INCDIR)/http_log.h $(INCDIR)/util_script.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
  + $(INCDIR)/util_script.h
   mod_include.o: mod_include.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_main.h $(INCDIR)/util_script.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
  + $(INCDIR)/util_script.h
   mod_info.o: mod_info.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_main.h $(INCDIR)/http_protocol.h \
  - $(INCDIR)/util_script.h $(INCDIR)/http_conf_globals.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/util_script.h \
  + $(INCDIR)/http_conf_globals.h
   mod_log_agent.o: mod_log_agent.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_log.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.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 \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h
   mod_log_referer.o: mod_log_referer.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_log.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.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 \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_log.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_log.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 \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_protocol.h
   mod_negotiation.o: mod_negotiation.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/util_script.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/util_script.h
   mod_rewrite.o: mod_rewrite.c mod_rewrite.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)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_conf_globals.h $(INCDIR)/http_request.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_vhost.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.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 \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h
   mod_so.o: mod_so.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_log.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.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 \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.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)/http_log.h
  + $(INCDIR)/alloc.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)/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 \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  - $(INCDIR)/http_conf_globals.h $(INCDIR)/http_main.h \
  - $(INCDIR)/util_script.h $(INCDIR)/scoreboard.h \
  - /usr/include/pthread.h $(INCDIR)/http_log.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/http_conf_globals.h \
  + $(INCDIR)/http_main.h $(INCDIR)/util_script.h \
  + $(INCDIR)/scoreboard.h /usr/include/pthread.h \
  + $(INCDIR)/http_log.h
   mod_unique_id.o: mod_unique_id.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_log.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.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 \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.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 \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h
  
  
  
  1.7       +8 -10     apache-2.0/mpm/src/os/unix/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/os/unix/Makefile.tmpl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.tmpl	1999/06/24 08:58:59	1.6
  +++ Makefile.tmpl	1999/06/29 09:00:30	1.7
  @@ -42,21 +42,19 @@
    $(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)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.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 \
  - $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h
  + $(OSDIR)/os.h $(INCDIR)/ap_ctype.h
   os.o: os.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 os.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h os.h
   unixd.o: unixd.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 $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_main.h $(INCDIR)/http_log.h unixd.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_main.h \
  + $(INCDIR)/http_log.h unixd.h
  
  
  

Mime
View raw message