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/modules/standard mod_access.c mod_actions.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
Date Sat, 24 Jul 1999 18:16:38 GMT
ben         99/07/24 11:16:38

  Modified:    mpm/src/include http_config.h http_request.h
               mpm/src/main http_config.c http_core.c http_request.c
               mpm/src/modules/mpm/prefork prefork.c
               mpm/src/modules/standard mod_access.c mod_actions.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
  Log:
  Another hook.
  
  Revision  Changes    Path
  1.9       +0 -2      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- http_config.h	1999/07/17 10:35:33	1.8
  +++ http_config.h	1999/07/24 18:15:52	1.9
  @@ -242,7 +242,6 @@
       int (*auth_checker) (request_rec *);
       int (*access_checker) (request_rec *);
       int (*type_checker) (request_rec *);
  -    int (*fixer_upper) (request_rec *);
       void (*register_hooks) (void);
   } module;
   
  @@ -369,7 +368,6 @@
   int ap_check_user_id(request_rec *);	/* obtain valid username from client auth */
   int ap_check_auth(request_rec *);	/* check (validated) user is authorized here */
   int ap_find_types(request_rec *);	/* identify MIME type */
  -int ap_run_fixups(request_rec *);	/* poke around for other metainfo, etc.... */
   int ap_invoke_handler(request_rec *);
   
   /* for mod_perl */
  
  
  
  1.4       +1 -0      apache-2.0/mpm/src/include/http_request.h
  
  Index: http_request.h
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/include/http_request.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- http_request.h	1999/07/11 19:00:47	1.3
  +++ http_request.h	1999/07/24 18:15:53	1.4
  @@ -115,6 +115,7 @@
     /* Hooks */
   DECLARE_HOOK(int,translate_name,(request_rec *))
   DECLARE_HOOK(int,check_user_id,(request_rec *))
  +DECLARE_HOOK(int,fixups,(request_rec *))
   
   #ifdef __cplusplus
   }
  
  
  
  1.12      +0 -8      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- http_config.c	1999/07/17 10:35:39	1.11
  +++ http_config.c	1999/07/24 18:15:56	1.12
  @@ -239,7 +239,6 @@
   #define m(meth)	{ XtOffsetOf(module,meth),#meth }
       m(auth_checker),
       m(type_checker),
  -    m(fixer_upper),
       { -1, "?" },
   #undef m
   };
  @@ -277,7 +276,6 @@
       XtOffsetOf(module, auth_checker),
       XtOffsetOf(module, access_checker),
       XtOffsetOf(module, type_checker),
  -    XtOffsetOf(module, fixer_upper),
   };
   #define NMETHODS	(sizeof (method_offsets)/sizeof (method_offsets[0]))
   
  @@ -285,7 +283,6 @@
       int auth_checker;
       int access_checker;
       int type_checker;
  -    int fixer_upper;
   } offsets_into_method_ptrs;
   
   /*
  @@ -371,11 +368,6 @@
   int ap_find_types(request_rec *r)
   {
       return run_method(r, offsets_into_method_ptrs.type_checker, 0);
  -}
  -
  -int ap_run_fixups(request_rec *r)
  -{
  -    return run_method(r, offsets_into_method_ptrs.fixer_upper, 1);
   }
   
   IMPLEMENT_HOOK(int,header_parser,(request_rec *r),(r),RUN_ALL,OK,DECLINED)
  
  
  
  1.9       +0 -1      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- http_core.c	1999/07/22 19:17:22	1.8
  +++ http_core.c	1999/07/24 18:15:56	1.9
  @@ -2653,6 +2653,5 @@
       NULL,			/* check auth */
       do_nothing,			/* check access */
       do_nothing,			/* type_checker */
  -    NULL,			/* pre-run fixups */
       register_hooks		/* register hooks */
   };
  
  
  
  1.13      +2 -0      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- http_request.c	1999/07/22 19:17:23	1.12
  +++ http_request.c	1999/07/24 18:15:57	1.13
  @@ -81,10 +81,12 @@
   HOOK_STRUCT(
   	    HOOK_LINK(translate_name)
   	    HOOK_LINK(check_user_id)
  +	    HOOK_LINK(fixups)
   )
   
   IMPLEMENT_HOOK(int,translate_name,(request_rec *r),(r),RUN_FIRST,OK,DECLINED)
   IMPLEMENT_HOOK(int,check_user_id,(request_rec *r),(r),RUN_FIRST,OK,DECLINED)
  +IMPLEMENT_HOOK(int,fixups,(request_rec *r),(r),RUN_ALL,OK,DECLINED)
   
   /*****************************************************************
    *
  
  
  
  1.15      +0 -1      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- prefork.c	1999/07/24 13:55:56	1.14
  +++ prefork.c	1999/07/24 18:16:11	1.15
  @@ -3090,6 +3090,5 @@
       NULL,			/* check auth */
       NULL,			/* check access */
       NULL,			/* type_checker */
  -    NULL,			/* pre-run fixups */
       NULL			/* register hooks */
   };
  
  
  
  1.7       +0 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_access.c	1999/07/17 10:35:51	1.6
  +++ mod_access.c	1999/07/24 18:16:14	1.7
  @@ -403,6 +403,5 @@
       NULL,			/* check auth */
       check_dir_access,		/* check access */
       NULL,			/* type_checker */
  -    NULL,			/* fixups */
       NULL			/* register hooks */
   };
  
  
  
  1.6       +0 -1      apache-2.0/mpm/src/modules/standard/mod_actions.c
  
  Index: mod_actions.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_actions.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_actions.c	1999/07/17 10:35:51	1.5
  +++ mod_actions.c	1999/07/24 18:16:15	1.6
  @@ -225,6 +225,5 @@
       NULL,                       /* "check auth */
       NULL,			/* check access */
       NULL,			/* type_checker */
  -    NULL,			/* fixups */
       NULL			/* register hooks */
   };
  
  
  
  1.8       +1 -1      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_alias.c	1999/07/17 10:35:52	1.7
  +++ mod_alias.c	1999/07/24 18:16:15	1.8
  @@ -400,6 +400,7 @@
       static const char * const aszPre[]={ "mod_userdir.c",NULL };
   
       ap_hook_translate_name(translate_alias_redir,aszPre,NULL,HOOK_MIDDLE);
  +    ap_hook_fixups(fixup_redir,NULL,NULL,HOOK_MIDDLE);
       }
   
   module MODULE_VAR_EXPORT alias_module =
  @@ -419,6 +420,5 @@
       NULL,			/* check auth */
       NULL,			/* check access */
       NULL,			/* type_checker */
  -    fixup_redir,		/* fixups */
       register_hooks		/* register hooks */
   };
  
  
  
  1.7       +0 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_asis.c	1999/07/17 10:35:52	1.6
  +++ mod_asis.c	1999/07/24 18:16:17	1.7
  @@ -140,6 +140,5 @@
       NULL,			/* check auth */
       NULL,			/* check access */
       NULL,			/* type_checker */
  -    NULL,			/* pre-run fixups */
       NULL			/* register hooks */
   };
  
  
  
  1.7       +0 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_auth.c	1999/07/17 10:35:53	1.6
  +++ mod_auth.c	1999/07/24 18:16:18	1.7
  @@ -332,6 +332,5 @@
       check_user_access,		/* check auth */
       NULL,			/* check access */
       NULL,			/* type_checker */
  -    NULL,			/* fixups */
       register_hooks		/* register hooks */
   };
  
  
  
  1.7       +0 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_autoindex.c	1999/07/17 10:35:53	1.6
  +++ mod_autoindex.c	1999/07/24 18:16:18	1.7
  @@ -1664,6 +1664,5 @@
       NULL,			/* check auth */
       NULL,			/* check access */
       NULL,			/* type_checker */
  -    NULL,			/* fixups */
       NULL			/* register hooks */
   };
  
  
  
  1.6       +0 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_dir.c	1999/07/17 10:35:54	1.5
  +++ mod_dir.c	1999/07/24 18:16:18	1.6
  @@ -238,6 +238,5 @@
       NULL,			/* check auth */
       NULL,			/* check access */
       NULL,			/* type_checker */
  -    NULL,			/* pre-run fixups */
       NULL			/* register hooks */
   };
  
  
  
  1.8       +8 -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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_env.c	1999/07/17 10:35:54	1.7
  +++ mod_env.c	1999/07/24 18:16:19	1.8
  @@ -100,6 +100,7 @@
   
   #include "httpd.h"
   #include "http_config.h"
  +#include "http_request.h"
   
   typedef struct {
       table *vars;
  @@ -246,6 +247,12 @@
       return OK;
   }
   
  +static void register_hooks()
  +    {
  +    ap_hook_fixups(fixup_env_module,NULL,NULL,HOOK_MIDDLE);
  +    }
  +
  +
   module MODULE_VAR_EXPORT env_module =
   {
       STANDARD20_MODULE_STUFF,
  @@ -263,6 +270,5 @@
       NULL,                       /* check auth */
       NULL,                       /* check access */
       NULL,                       /* type_checker */
  -    fixup_env_module,           /* fixups */
  -    NULL                        /* register hooks */
  +    register_hooks              /* register hooks */
   };
  
  
  
  1.7       +0 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_imap.c	1999/07/17 10:35:55	1.6
  +++ mod_imap.c	1999/07/24 18:16:19	1.7
  @@ -911,6 +911,5 @@
       NULL,                       /* check auth */
       NULL,                       /* check access */
       NULL,                       /* type_checker */
  -    NULL,                       /* fixups */
       NULL                        /* register hooks */
   };
  
  
  
  1.7       +0 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_log_config.c	1999/07/17 10:35:55	1.6
  +++ mod_log_config.c	1999/07/24 18:16:19	1.7
  @@ -1127,6 +1127,5 @@
       NULL,                       /* check auth */
       NULL,                       /* check access */
       NULL,                       /* type_checker */
  -    NULL,                       /* fixups */
       register_hooks              /* register hooks */
   };
  
  
  
  1.6       +0 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_mime.c	1999/07/17 10:35:56	1.5
  +++ mod_mime.c	1999/07/24 18:16:19	1.6
  @@ -394,6 +394,5 @@
       NULL,			/* check auth */
       NULL,			/* check access */
       find_ct,			/* type_checker */
  -    NULL,			/* pre-run fixups */
       NULL			/* register hooks */
   };
  
  
  
  1.7       +6 -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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_negotiation.c	1999/07/17 10:35:56	1.6
  +++ mod_negotiation.c	1999/07/24 18:16:19	1.7
  @@ -2724,6 +2724,11 @@
       {NULL}
   };
   
  +static void register_hooks()
  +    {
  +    ap_hook_fixups(fix_encoding,NULL,NULL,HOOK_MIDDLE);
  +    }
  +
   module MODULE_VAR_EXPORT negotiation_module =
   {
       STANDARD20_MODULE_STUFF,
  @@ -2741,6 +2746,5 @@
       NULL,                       /* check auth */
       NULL,                       /* check access */
       handle_multi,               /* type_checker */
  -    fix_encoding,               /* fixups */
  -    NULL                        /* register hooks */
  +    register_hooks              /* register hooks */
   };
  
  
  
  1.8       +0 -1      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_setenvif.c	1999/07/17 10:35:57	1.7
  +++ mod_setenvif.c	1999/07/24 18:16:20	1.8
  @@ -422,7 +422,6 @@
       NULL,                       /* check auth */
       NULL,                       /* check access */
       NULL,                       /* type_checker */
  -    NULL,                       /* fixups */
       register_hooks		/* register hooks */
   };
   
  
  
  
  1.8       +0 -1      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_userdir.c	1999/07/17 10:35:57	1.7
  +++ mod_userdir.c	1999/07/24 18:16:21	1.8
  @@ -350,6 +350,5 @@
       NULL,                       /* check auth */
       NULL,                       /* check access */
       NULL,                       /* type_checker */
  -    NULL,                       /* fixups */
       register_hooks              /* register hooks */
   };
  
  
  

Mime
View raw message