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, 06 Jul 1999 21:32:32 GMT
ben         99/07/06 14:32:31

  Modified:    mpm/src  Makefile.tmpl
               mpm/src/include ap_hooks.h http_config.h http_protocol.h
               mpm/src/main Makefile.tmpl alloc.c http_config.c
                        http_connection.c http_core.c http_protocol.c
                        http_request.c rfc1413.c
               mpm/src/modules/mpm/prefork Makefile.tmpl prefork.c
               mpm/src/modules/standard Makefile.tmpl mod_access.c
                        mod_alias.c mod_asis.c mod_auth.c mod_autoindex.c
                        mod_dir.c mod_env.c mod_imap.c mod_log_config.c
                        mod_mime.c mod_negotiation.c mod_setenvif.c
                        mod_userdir.c
               mpm/src/os/unix Makefile.tmpl
  Log:
  More hooky stuff.
  
  Revision  Changes    Path
  1.5       +1 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.tmpl	1999/06/29 09:00:04	1.4
  +++ Makefile.tmpl	1999/07/06 21:32:07	1.5
  @@ -129,4 +129,4 @@
    include/ap_mmn.h include/ap_config_auto.h os/unix/os.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
  + include/http_config.h include/ap_hooks.h
  
  
  
  1.2       +15 -9     apache-2.0/mpm/src/include/ap_hooks.h
  
  Index: ap_hooks.h
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/include/ap_hooks.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ap_hooks.h	1999/07/05 13:00:42	1.1
  +++ ap_hooks.h	1999/07/06 21:32:08	1.2
  @@ -1,6 +1,10 @@
  +#ifndef APACHE_AP_HOOKS_H
  +#define APACHE_AP_HOOKS_H
  +
   #define DECLARE_HOOK(ret,name,args) \
   typedef ret HOOK_##name args; \
  -void hook_##name(HOOK_##name *pf); \
  +void ap_hook_##name(HOOK_##name *pf); \
  +ret ap_run_##name args; \
   typedef struct _LINK_##name \
       { \
       HOOK_##name *pFunc; \
  @@ -13,15 +17,15 @@
   #define HOOK_LINK(name) \
       LINK_##name *link_##name;
   
  -#define IMPLEMENT_HOOK_BASE(ret,rv_decl,sv,rv,name,args,args2,run_all,terminate) \
  -void hook_##name(HOOK_##name *pf) \
  +#define IMPLEMENT_HOOK_BASE(ret,rv_decl,sv,rv,name,args,args2,run_all,term1,term2,rv_final) \
  +void ap_hook_##name(HOOK_##name *pf) \
       { \
       LINK_##name *pHook=ap_palloc(g_pHookPool,sizeof(LINK_##name)); \
       pHook->pNext=_hooks.link_##name; \
       pHook->pFunc=pf; \
       _hooks.link_##name=pHook; \
       } \
  -ret run_##name args \
  +ret ap_run_##name args \
       { \
       LINK_##name *pHook; \
       rv_decl \
  @@ -30,15 +34,17 @@
   	{ \
   	sv pHook->pFunc args2; \
   \
  -	if(!run_all terminate) \
  +	if(term1 && (!run_all || term2)) \
   	    return rv; \
   	} \
  -    return rv; \
  +    return rv_final; \
       }
   
  -#define IMPLEMENT_HOOK(ret,name,args,args2,run_all,finish) \
  -	IMPLEMENT_HOOK_BASE(ret,ret r;,r=,r,name,args,args2,run_all,&& r == finish)
  +#define IMPLEMENT_HOOK(ret,name,args,args2,run_all,ok,decline) \
  +	IMPLEMENT_HOOK_BASE(ret,ret r_;,r_=,r_,name,args,args2,run_all,r_ != decline,r_ != ok,run_all ? ok : decline)
   #define IMPLEMENT_VOID_HOOK(name,args,args2,run_all) \
  -	IMPLEMENT_HOOK_BASE(void,,,,name,args,args2,run_all,)
  +	IMPLEMENT_HOOK_BASE(void,,,,name,args,args2,run_all,1,0,)
   
   extern pool *g_pHookPool;
  +
  +#endif /* ndef(AP_HOOKS_H) */
  
  
  
  1.5       +5 -6      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- http_config.h	1999/07/05 13:00:42	1.4
  +++ http_config.h	1999/07/06 21:32:08	1.5
  @@ -58,6 +58,8 @@
   #ifndef APACHE_HTTP_CONFIG_H
   #define APACHE_HTTP_CONFIG_H
   
  +#include "ap_hooks.h"
  +
   #ifdef __cplusplus
   extern "C" {
   #endif
  @@ -236,8 +238,6 @@
        * type_checker --- Determine MIME type of the requested entity;
        *                  sets content_type, _encoding and _language fields.
        * logger --- log a transaction.
  -     * post_read_request --- run right after read_request or internal_redirect,
  -     *                  and not run during any subrequests.
        */
   
       int (*translate_handler) (request_rec *);
  @@ -247,8 +247,6 @@
       int (*type_checker) (request_rec *);
       int (*fixer_upper) (request_rec *);
       int (*logger) (request_rec *);
  -    int (*header_parser) (request_rec *);
  -    int (*post_read_request) (request_rec *);
       void (*register_hooks) (void);
   } module;
   
  @@ -378,9 +376,7 @@
   int ap_run_fixups(request_rec *);	/* poke around for other metainfo, etc.... */
   int ap_invoke_handler(request_rec *);
   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 */
   
  @@ -388,6 +384,9 @@
   CORE_EXPORT(const command_rec *) ap_find_command_in_modules(const char *cmd_name, module **mod);
   CORE_EXPORT(void *) ap_set_config_vectors(cmd_parms *parms, void *config, module *mod);
   CORE_EXPORT(const char *) ap_handle_command(cmd_parms *parms, void *config, const char *l);
  +
  +  /* Hooks */
  +DECLARE_HOOK(int,header_parser,(request_rec *))
   
   #endif
   
  
  
  
  1.2       +9 -0      apache-2.0/mpm/src/include/http_protocol.h
  
  Index: http_protocol.h
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/include/http_protocol.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- http_protocol.h	1999/06/18 18:39:28	1.1
  +++ http_protocol.h	1999/07/06 21:32:08	1.2
  @@ -58,6 +58,8 @@
   #ifndef APACHE_HTTP_PROTOCOL_H
   #define APACHE_HTTP_PROTOCOL_H
   
  +#include "ap_hooks.h"
  +
   #ifdef __cplusplus
   extern "C" {
   #endif
  @@ -215,6 +217,13 @@
    * contain an HTTP method.  Returns M_INVALID if not recognized.
    */
   API_EXPORT(int) ap_method_number_of(const char *method);
  +
  +  /* Hooks */
  +  /*
  +   * post_read_request --- run right after read_request or internal_redirect,
  +   *                  and not run during any subrequests.
  +   */
  +DECLARE_HOOK(int,post_read_request,(request_rec *))
   
   #ifdef __cplusplus
   }
  
  
  
  1.11      +24 -19    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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.tmpl	1999/06/29 09:00:13	1.10
  +++ Makefile.tmpl	1999/07/06 21:32:09	1.11
  @@ -64,6 +64,7 @@
    $(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
  +ap_hooks.o: ap_hooks.c
   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)/alloc.h \
  @@ -82,7 +83,7 @@
    $(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)/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 \
  @@ -91,44 +92,47 @@
    $(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
  + $(INCDIR)/ap_hooks.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)/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
  + $(INCDIR)/ap_hooks.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)/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)/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)/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
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.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)/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)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.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)/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_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_main.h $(INCDIR)/fnmatch.h
  @@ -137,7 +141,7 @@
    $(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)/ap_hooks.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 \
  @@ -149,7 +153,7 @@
    $(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
  + $(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)/alloc.h \
  @@ -176,9 +180,10 @@
    $(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
  + $(INCDIR)/ap_hooks.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)/alloc.h \
  
  
  
  1.6       +2 -2      apache-2.0/mpm/src/main/alloc.c
  
  Index: alloc.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/main/alloc.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- alloc.c	1999/06/24 08:58:00	1.5
  +++ alloc.c	1999/07/06 21:32:09	1.6
  @@ -434,7 +434,7 @@
   
   
   /* Accounting */
  -
  +/*
   static long bytes_in_block_list(union block_hdr *blok)
   {
       long size = 0;
  @@ -446,7 +446,7 @@
   
       return size;
   }
  -
  +*/
   
   /*****************************************************************
    *
  
  
  
  1.6       +6 -14     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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- http_config.c	1999/07/05 13:00:44	1.5
  +++ http_config.c	1999/07/06 21:32:10	1.6
  @@ -81,6 +81,10 @@
   #include "http_vhost.h"
   #include "explain.h"
   
  +HOOK_STRUCT(
  +	    HOOK_LINK(header_parser)
  +)
  +
   DEF_Explain
   
   /****************************************************************
  @@ -279,9 +283,7 @@
       XtOffsetOf(module, access_checker),
       XtOffsetOf(module, type_checker),
       XtOffsetOf(module, fixer_upper),
  -    XtOffsetOf(module, logger),
  -    XtOffsetOf(module, header_parser),
  -    XtOffsetOf(module, post_read_request)
  +    XtOffsetOf(module, logger)
   };
   #define NMETHODS	(sizeof (method_offsets)/sizeof (method_offsets[0]))
   
  @@ -293,8 +295,6 @@
       int type_checker;
       int fixer_upper;
       int logger;
  -    int header_parser;
  -    int post_read_request;
   } offsets_into_method_ptrs;
   
   /*
  @@ -396,16 +396,8 @@
   {
       return run_method(r, offsets_into_method_ptrs.logger, 1);
   }
  -
  -int ap_header_parse(request_rec *r)
  -{
  -    return run_method(r, offsets_into_method_ptrs.header_parser, 1);
  -}
   
  -int ap_run_post_read_request(request_rec *r)
  -{
  -    return run_method(r, offsets_into_method_ptrs.post_read_request, 1);
  -}
  +IMPLEMENT_HOOK(int,header_parser,(request_rec *r),(r),1,OK,DECLINED)
   
   /* Auth stuff --- anything that defines one of these will presumably
    * want to define something for the other.  Note that check_auth is
  
  
  
  1.8       +1 -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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- http_connection.c	1999/07/05 13:00:45	1.7
  +++ http_connection.c	1999/07/06 21:32:10	1.8
  @@ -194,7 +194,7 @@
   
       ap_update_vhost_given_ip(c);
   
  -    run_pre_connection(c);
  +    ap_run_pre_connection(c);
   
       /*
        * Read and process each request found on our connection
  
  
  
  1.3       +1 -2      apache-2.0/mpm/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_core.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- http_core.c	1999/06/25 01:25:08	1.2
  +++ http_core.c	1999/07/06 21:32:10	1.3
  @@ -2649,6 +2649,5 @@
       do_nothing,			/* type_checker */
       NULL,			/* pre-run fixups */
       NULL,			/* logger */
  -    NULL,			/* header parser */
  -    NULL			/* post_read_request */
  +    NULL			/* register hooks */
   };
  
  
  
  1.8       +6 -0      apache-2.0/mpm/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_protocol.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- http_protocol.c	1999/06/25 01:16:57	1.7
  +++ http_protocol.c	1999/07/06 21:32:10	1.8
  @@ -75,6 +75,10 @@
   #include "util_date.h"          /* For parseHTTPdate and BAD_DATE */
   #include <stdarg.h>
   
  +HOOK_STRUCT(
  +	    HOOK_LINK(post_read_request)
  +);
  +
   #define SET_BYTES_SENT(r) \
     do { if (r->sent_bodyct) \
             ap_bgetopt (r->connection->client, BO_BYTECT, &r->bytes_sent); \
  @@ -2683,3 +2687,5 @@
       }
       ap_finalize_request_protocol(r);
   }
  +
  +IMPLEMENT_HOOK(int,post_read_request,(request_rec *r),(r),1,OK,DECLINED)
  
  
  
  1.6       +1 -1      apache-2.0/mpm/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_request.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- http_request.c	1999/06/24 17:48:27	1.5
  +++ http_request.c	1999/07/06 21:32:11	1.6
  @@ -1157,7 +1157,7 @@
           return;
       }
   
  -    if ((access_status = ap_header_parse(r))) {
  +    if ((access_status = ap_run_header_parser(r))) {
           ap_die(access_status, r);
           return;
       }
  
  
  
  1.2       +0 -6      apache-2.0/mpm/src/main/rfc1413.c
  
  Index: rfc1413.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/main/rfc1413.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- rfc1413.c	1999/06/18 18:39:30	1.1
  +++ rfc1413.c	1999/07/06 21:32:11	1.2
  @@ -199,12 +199,6 @@
       return 0;
   }
   
  -/* ident_timeout - handle timeouts */
  -static void ident_timeout(int sig)
  -{
  -    ap_longjmp(timebuf, sig);
  -}
  -
   /* rfc1413 - return remote user name, given socket structures */
   char *ap_rfc1413(conn_rec *conn, server_rec *srv)
   {
  
  
  
  1.5       +2 -2      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.tmpl	1999/06/29 09:00:25	1.4
  +++ Makefile.tmpl	1999/07/06 21:32:14	1.5
  @@ -63,8 +63,8 @@
    $(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)/http_config.h $(INCDIR)/ap_hooks.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.8       +3 -4      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- prefork.c	1999/07/02 18:22:27	1.7
  +++ prefork.c	1999/07/06 21:32:15	1.8
  @@ -179,8 +179,6 @@
   
   static scoreboard *ap_scoreboard_image = NULL;
   
  -static int volatile exit_after_unblock = 0;
  -
   #ifdef GPROF
   /* 
    * change directory for gprof to plop the gmon.out file
  @@ -1490,6 +1488,7 @@
       put_scoreboard_info(child_num, ss);
   }
   
  +/*
   static void increment_counts(int child_num, request_rec *r)
   {
       long int bs = 0;
  @@ -1513,6 +1512,7 @@
   
       put_scoreboard_info(child_num, ss);
   }
  +*/
   
   static int find_child_by_pid(int pid)
   {
  @@ -3093,6 +3093,5 @@
       NULL,			/* type_checker */
       NULL,			/* pre-run fixups */
       NULL,			/* logger */
  -    NULL,			/* header parser */
  -    NULL			/* post_read_request */
  +    NULL			/* register hooks */
   };
  
  
  
  1.5       +95 -79    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.tmpl	1999/06/29 09:00:28	1.4
  +++ Makefile.tmpl	1999/07/06 21:32:18	1.5
  @@ -11,229 +11,243 @@
    $(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)/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 \
    $(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_request.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  - $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
  - $(INCDIR)/util_script.h
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.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)/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_config.h $(INCDIR)/ap_hooks.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)/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)/http_config.h $(INCDIR)/ap_hooks.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)/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)/http_config.h $(INCDIR)/ap_hooks.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)/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)/http_config.h $(INCDIR)/ap_hooks.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)/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)/http_config.h $(INCDIR)/ap_hooks.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)/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)/http_config.h $(INCDIR)/ap_hooks.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)/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)/http_config.h $(INCDIR)/ap_hooks.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)/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)/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 \
    $(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)/http_config.h $(INCDIR)/ap_hooks.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)/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)/http_config.h $(INCDIR)/ap_hooks.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)/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)/http_config.h $(INCDIR)/ap_hooks.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)/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_config.h $(INCDIR)/ap_hooks.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)/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_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 \
    $(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_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 \
    $(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_config.h $(INCDIR)/ap_hooks.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)/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)/http_config.h $(INCDIR)/ap_hooks.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)/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)/http_config.h $(INCDIR)/ap_hooks.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)/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_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 \
    $(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_config.h $(INCDIR)/ap_hooks.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)/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_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 \
    $(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_config.h $(INCDIR)/ap_hooks.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)/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)/http_config.h $(INCDIR)/ap_hooks.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)/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)/http_config.h $(INCDIR)/ap_hooks.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)/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)/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 \
    $(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_config.h $(INCDIR)/ap_hooks.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_protocol.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)/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_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 \
  @@ -241,36 +255,38 @@
    $(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)/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 \
    $(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_conf_globals.h \
  - $(INCDIR)/http_main.h $(INCDIR)/util_script.h \
  - $(INCDIR)/scoreboard.h /usr/include/pthread.h \
  - $(INCDIR)/http_log.h
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.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)/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_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 \
    $(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_config.h $(INCDIR)/ap_hooks.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)/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_config.h $(INCDIR)/ap_hooks.h \
  + $(INCDIR)/http_core.h
  
  
  
  1.3       +1 -2      apache-2.0/mpm/src/modules/standard/mod_access.c
  
  Index: mod_access.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_access.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_access.c	1999/06/19 18:10:04	1.2
  +++ mod_access.c	1999/07/06 21:32:18	1.3
  @@ -407,6 +407,5 @@
       NULL,			/* type_checker */
       NULL,			/* fixups */
       NULL,			/* logger */
  -    NULL,			/* header parser */
  -    NULL			/* post read-request */
  +    NULL			/* register hooks */
   };
  
  
  
  1.3       +1 -2      apache-2.0/mpm/src/modules/standard/mod_alias.c
  
  Index: mod_alias.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_alias.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_alias.c	1999/06/19 18:10:04	1.2
  +++ mod_alias.c	1999/07/06 21:32:19	1.3
  @@ -415,6 +415,5 @@
       NULL,			/* type_checker */
       fixup_redir,		/* fixups */
       NULL,			/* logger */
  -    NULL,			/* header parser */
  -    NULL			/* post read-request */
  +    NULL			/* register hooks */
   };
  
  
  
  1.3       +1 -2      apache-2.0/mpm/src/modules/standard/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_asis.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_asis.c	1999/06/19 18:10:04	1.2
  +++ mod_asis.c	1999/07/06 21:32:19	1.3
  @@ -144,6 +144,5 @@
       NULL,			/* type_checker */
       NULL,			/* pre-run fixups */
       NULL,			/* logger */
  -    NULL,			/* header parser */
  -    NULL			/* post read-request */
  +    NULL			/* register hooks */
   };
  
  
  
  1.3       +1 -2      apache-2.0/mpm/src/modules/standard/mod_auth.c
  
  Index: mod_auth.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_auth.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_auth.c	1999/06/19 18:10:05	1.2
  +++ mod_auth.c	1999/07/06 21:32:19	1.3
  @@ -330,6 +330,5 @@
       NULL,			/* type_checker */
       NULL,			/* fixups */
       NULL,			/* logger */
  -    NULL,			/* header parser */
  -    NULL			/* post read-request */
  +    NULL			/* register hooks */
   };
  
  
  
  1.3       +1 -2      apache-2.0/mpm/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_autoindex.c	1999/06/19 18:10:05	1.2
  +++ mod_autoindex.c	1999/07/06 21:32:20	1.3
  @@ -1668,6 +1668,5 @@
       NULL,			/* type_checker */
       NULL,			/* fixups */
       NULL,			/* logger */
  -    NULL,			/* header parser */
  -    NULL			/* post read-request */
  +    NULL			/* register hooks */
   };
  
  
  
  1.2       +1 -2      apache-2.0/mpm/src/modules/standard/mod_dir.c
  
  Index: mod_dir.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_dir.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mod_dir.c	1999/06/18 18:39:38	1.1
  +++ mod_dir.c	1999/07/06 21:32:20	1.2
  @@ -242,6 +242,5 @@
       NULL,			/* type_checker */
       NULL,			/* pre-run fixups */
       NULL,			/* logger */
  -    NULL,			/* header parser */
  -    NULL			/* post_read_request */
  +    NULL			/* register hooks */
   };
  
  
  
  1.4       +1 -2      apache-2.0/mpm/src/modules/standard/mod_env.c
  
  Index: mod_env.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_env.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_env.c	1999/06/19 22:04:39	1.3
  +++ mod_env.c	1999/07/06 21:32:21	1.4
  @@ -267,6 +267,5 @@
       NULL,                       /* type_checker */
       fixup_env_module,           /* fixups */
       NULL,                       /* logger */
  -    NULL,                       /* header parser */
  -    NULL                        /* post read-request */
  +    NULL                        /* register hooks */
   };
  
  
  
  1.3       +1 -2      apache-2.0/mpm/src/modules/standard/mod_imap.c
  
  Index: mod_imap.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_imap.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_imap.c	1999/06/19 18:10:06	1.2
  +++ mod_imap.c	1999/07/06 21:32:21	1.3
  @@ -915,6 +915,5 @@
       NULL,                       /* type_checker */
       NULL,                       /* fixups */
       NULL,                       /* logger */
  -    NULL,                       /* header parser */
  -    NULL                        /* post read-request */
  +    NULL                        /* register hooks */
   };
  
  
  
  1.3       +1 -2      apache-2.0/mpm/src/modules/standard/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_log_config.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_log_config.c	1999/06/19 18:10:08	1.2
  +++ mod_log_config.c	1999/07/06 21:32:22	1.3
  @@ -1125,6 +1125,5 @@
       NULL,                       /* type_checker */
       NULL,                       /* fixups */
       multi_log_transaction,      /* logger */
  -    NULL,                       /* header parser */
  -    NULL                        /* post read-request */
  +    NULL                        /* register hooks */
   };
  
  
  
  1.2       +1 -2      apache-2.0/mpm/src/modules/standard/mod_mime.c
  
  Index: mod_mime.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_mime.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mod_mime.c	1999/06/18 18:39:39	1.1
  +++ mod_mime.c	1999/07/06 21:32:22	1.2
  @@ -398,6 +398,5 @@
       find_ct,			/* type_checker */
       NULL,			/* pre-run fixups */
       NULL,			/* logger */
  -    NULL,			/* header parser */
  -    NULL			/* post_read_request */
  +    NULL			/* register hooks */
   };
  
  
  
  1.3       +1 -2      apache-2.0/mpm/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_negotiation.c	1999/06/19 18:10:08	1.2
  +++ mod_negotiation.c	1999/07/06 21:32:22	1.3
  @@ -2745,6 +2745,5 @@
       handle_multi,               /* type_checker */
       fix_encoding,               /* fixups */
       NULL,                       /* logger */
  -    NULL,                       /* header parser */
  -    NULL                        /* post read-request */
  +    NULL                        /* register hooks */
   };
  
  
  
  1.3       +8 -2      apache-2.0/mpm/src/modules/standard/mod_setenvif.c
  
  Index: mod_setenvif.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_setenvif.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_setenvif.c	1999/06/19 18:10:08	1.2
  +++ mod_setenvif.c	1999/07/06 21:32:23	1.3
  @@ -118,6 +118,7 @@
   #include "http_config.h"
   #include "http_core.h"
   #include "http_log.h"
  +#include "http_protocol.h"
   
   enum special {
       SPECIAL_NOT,
  @@ -399,6 +400,11 @@
       return DECLINED;
   }
   
  +static void register_hooks()
  +    {
  +    ap_hook_post_read_request(match_headers);
  +    }
  +
   module MODULE_VAR_EXPORT setenvif_module =
   {
       STANDARD20_MODULE_STUFF,
  @@ -420,6 +426,6 @@
       NULL,                       /* type_checker */
       NULL,                       /* fixups */
       NULL,                       /* logger */
  -    NULL,                       /* input header parse */
  -    match_headers               /* post_read_request */
  +    register_hooks		/* register hooks */
   };
  +
  
  
  
  1.3       +1 -2      apache-2.0/mpm/src/modules/standard/mod_userdir.c
  
  Index: mod_userdir.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_userdir.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_userdir.c	1999/06/19 18:10:09	1.2
  +++ mod_userdir.c	1999/07/06 21:32:23	1.3
  @@ -346,6 +346,5 @@
       NULL,                       /* type_checker */
       NULL,                       /* fixups */
       NULL,                       /* logger */
  -    NULL,                       /* header parser */
  -    NULL                        /* post read-request */
  +    NULL                        /* register hooks */
   };
  
  
  
  1.8       +2 -2      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.tmpl	1999/06/29 09:00:30	1.7
  +++ Makefile.tmpl	1999/07/06 21:32:31	1.8
  @@ -56,5 +56,5 @@
    $(OSDIR)/os.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 unixd.h
  + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  + $(INCDIR)/http_main.h $(INCDIR)/http_log.h unixd.h
  
  
  

Mime
View raw message