httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c
Date Mon, 08 Jan 2001 23:55:13 GMT
dougm       01/01/08 15:55:13

  Modified:    .        libhttpd.def
               include  http_config.h
               modules/aaa mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c
                        mod_auth_digest.c
               modules/cache mod_file_cache.c
               modules/dav/fs mod_dav_fs.c
               modules/dav/main mod_dav.c
               modules/generators mod_asis.c mod_autoindex.c mod_cgi.c
                        mod_cgid.c mod_status.c
               modules/http http_core.c
               modules/mappers mod_actions.c mod_dir.c mod_imap.c
                        mod_negotiation.c mod_rewrite.c mod_so.c
                        mod_speling.c
               modules/metadata mod_cern_meta.c mod_expires.c mod_headers.c
                        mod_usertrack.c
               os/win32 mod_isapi.c
               server   config.c
               server/mpm/winnt mpm_winnt.c
  Log:
  adjust remaining modules to use the new handler hook method (Alan Edwards)
  
  bring back the old handler prototype by reusing r->handler (dougm)
  
  Revision  Changes    Path
  1.50      +1 -0      httpd-2.0/libhttpd.def
  
  Index: libhttpd.def
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/libhttpd.def,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- libhttpd.def	2001/01/04 22:37:27	1.49
  +++ libhttpd.def	2001/01/08 23:54:39	1.50
  @@ -376,6 +376,7 @@
           ap_hook_post_config
           ap_hook_open_logs
           ap_hook_child_init
  +        ap_hook_handler
   
           ap_get_status_table
           ap_run_default_port
  
  
  
  1.54      +2 -3      httpd-2.0/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_config.h,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- http_config.h	2001/01/07 19:55:55	1.53
  +++ http_config.h	2001/01/08 23:54:41	1.54
  @@ -993,12 +993,11 @@
   
   /**
    * Run the handler functions for each module
  - * @param handler The handler string (a MIME type or a handler)
    * @param r The request_rec
  - * @deffunc void ap_run_handler(const char *handler,request_rec *r)
  + * @deffunc void ap_run_handler(request_rec *r)
    * @tip non-wildcard handlers should HOOK_MIDDLE, wildcard HOOK_LAST
    */
  -AP_DECLARE_HOOK(int,handler,(const char *handler,request_rec *r))
  +AP_DECLARE_HOOK(int,handler,(request_rec *))
   
   #ifdef __cplusplus
   }
  
  
  
  1.20      +0 -1      httpd-2.0/modules/aaa/mod_auth_anon.c
  
  Index: mod_auth_anon.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_anon.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_auth_anon.c	2000/12/19 15:09:00	1.19
  +++ mod_auth_anon.c	2001/01/08 23:54:42	1.20
  @@ -308,6 +308,5 @@
       NULL,			/* server config */
       NULL,			/* merge server config */
       anon_auth_cmds,		/* command apr_table_t */
  -    NULL,			/* handlers */
       register_hooks		/* register hooks */
   };
  
  
  
  1.21      +0 -1      httpd-2.0/modules/aaa/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_db.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_auth_db.c	2000/12/19 19:44:16	1.20
  +++ mod_auth_db.c	2001/01/08 23:54:43	1.21
  @@ -409,7 +409,6 @@
       NULL,			/* server config */
       NULL,			/* merge server config */
       db_auth_cmds,		/* command apr_table_t */
  -    NULL,			/* handlers */
       register_hooks		/* register hooks */
   };
   
  
  
  
  1.23      +0 -1      httpd-2.0/modules/aaa/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_dbm.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_auth_dbm.c	2000/12/19 15:09:01	1.22
  +++ mod_auth_dbm.c	2001/01/08 23:54:44	1.23
  @@ -349,6 +349,5 @@
       NULL,			/* server config */
       NULL,			/* merge server config */
       dbm_auth_cmds,		/* command apr_table_t */
  -    NULL,			/* handlers */
       register_hooks              /* register hooks */
   };
  
  
  
  1.28      +0 -1      httpd-2.0/modules/aaa/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_auth_digest.c	2000/12/19 15:09:02	1.27
  +++ mod_auth_digest.c	2001/01/08 23:54:44	1.28
  @@ -2070,7 +2070,6 @@
       NULL,			/* server config */
       NULL,			/* merge server config */
       digest_cmds,		/* command table */
  -    NULL,			/* handlers */
       register_hooks		/* register hooks */
   };
   
  
  
  
  1.35      +5 -7      httpd-2.0/modules/cache/mod_file_cache.c
  
  Index: mod_file_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/cache/mod_file_cache.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- mod_file_cache.c	2000/12/13 13:22:51	1.34
  +++ mod_file_cache.c	2001/01/08 23:54:47	1.35
  @@ -422,6 +422,10 @@
       int errstatus;
       int rc = OK;
   
  +    if (strcmp(r->handler, "*.*")) {
  +        return DECLINED;
  +    }
  +
       /* we don't handle anything but GET */
       if (r->method_number != M_GET) return DECLINED;
   
  @@ -473,6 +477,7 @@
   
   static void register_hooks(void)
   {
  +    ap_hook_handler(file_cache_handler, NULL, NULL, AP_HOOK_MIDDLE);
       ap_hook_post_config(file_cache_post_config, NULL, NULL, AP_HOOK_MIDDLE);
       ap_hook_translate_name(file_cache_xlat, NULL, NULL, AP_HOOK_MIDDLE);
       /* This trick doesn't work apparently because the translate hooks
  @@ -483,12 +488,6 @@
   
   }
   
  -static const handler_rec file_cache_handlers[] =
  -{
  -    { "*/*", file_cache_handler },
  -    { NULL }
  -};
  -
   module AP_MODULE_DECLARE_DATA file_cache_module =
   {
       STANDARD20_MODULE_STUFF,
  @@ -497,6 +496,5 @@
       create_server_config,     /* create per-server config structure */
       NULL,                     /* merge per-server config structures */
       file_cache_cmds,          /* command handlers */
  -    file_cache_handlers,      /* handlers */
       register_hooks            /* register hooks */
   };
  
  
  
  1.11      +0 -1      httpd-2.0/modules/dav/fs/mod_dav_fs.c
  
  Index: mod_dav_fs.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/fs/mod_dav_fs.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_dav_fs.c	2000/10/14 18:24:33	1.10
  +++ mod_dav_fs.c	2001/01/08 23:54:49	1.11
  @@ -138,6 +138,5 @@
       dav_fs_create_server_config,	/* server config */
       dav_fs_merge_server_config,	/* merge server config */
       dav_fs_cmds,		/* command table */
  -    NULL,                       /* handlers */
       register_hooks,             /* register hooks */
   };
  
  
  
  1.34      +5 -7      httpd-2.0/modules/dav/main/mod_dav.c
  
  Index: mod_dav.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- mod_dav.c	2000/11/27 12:54:21	1.33
  +++ mod_dav.c	2001/01/08 23:54:50	1.34
  @@ -3788,6 +3788,10 @@
   {
       dav_dir_conf *conf;
   
  +    if (strcmp(r->handler, "dav-handler")) {
  +	return DECLINED;
  +    }
  +
       /* quickly ignore any HTTP/0.9 requests */
       if (r->assbackwards) {
   	return DECLINED;
  @@ -4004,6 +4008,7 @@
   
   static void register_hooks(void)
   {
  +    ap_hook_handler(dav_handler, NULL, NULL, AP_HOOK_MIDDLE);
       ap_hook_post_config(dav_init_handler, NULL, NULL, AP_HOOK_MIDDLE);
       ap_hook_type_checker(dav_type_checker, NULL, NULL, AP_HOOK_FIRST);
   
  @@ -4044,12 +4049,6 @@
       { NULL }
   };
   
  -static const handler_rec dav_handlers[] =
  -{
  -    {"dav-handler", dav_handler},
  -    { NULL }
  -};
  -
   module DAV_DECLARE_DATA dav_module =
   {
       STANDARD20_MODULE_STUFF,
  @@ -4058,7 +4057,6 @@
       dav_create_server_config,	/* server config */
       dav_merge_server_config,	/* merge server config */
       dav_cmds,			/* command table */
  -    dav_handlers,		/* handlers */
       register_hooks,             /* register hooks */
   };
   
  
  
  
  1.28      +2 -2      httpd-2.0/modules/generators/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_asis.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_asis.c	2001/01/07 19:55:56	1.27
  +++ mod_asis.c	2001/01/08 23:54:51	1.28
  @@ -68,14 +68,14 @@
   
   #define ASIS_MAGIC_TYPE "httpd/send-as-is"
   
  -static int asis_handler(const char *handler,request_rec *r)
  +static int asis_handler(request_rec *r)
   {
       apr_file_t *f = NULL;
       apr_status_t status;
       const char *location;
       apr_size_t nbytes;
   
  -    if(strcmp(handler,ASIS_MAGIC_TYPE) && strcmp(handler,"send-as-is"))
  +    if(strcmp(r->handler,ASIS_MAGIC_TYPE) && strcmp(r->handler,"send-as-is"))
   	return DECLINED;
   
       r->allowed |= (1 << M_GET);
  
  
  
  1.51      +2 -2      httpd-2.0/modules/generators/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_autoindex.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- mod_autoindex.c	2001/01/07 19:55:56	1.50
  +++ mod_autoindex.c	2001/01/08 23:54:52	1.51
  @@ -1660,12 +1660,12 @@
   
   /* The formal handler... */
   
  -static int handle_autoindex(const char *handler,request_rec *r)
  +static int handle_autoindex(request_rec *r)
   {
       autoindex_config_rec *d;
       int allow_opts;
   
  -    if(strcmp(handler,DIR_MAGIC_TYPE))
  +    if(strcmp(r->handler,DIR_MAGIC_TYPE))
   	return DECLINED;
   
       allow_opts = ap_allow_options(r);
  
  
  
  1.77      +2 -2      httpd-2.0/modules/generators/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- mod_cgi.c	2001/01/07 19:55:56	1.76
  +++ mod_cgi.c	2001/01/08 23:54:52	1.77
  @@ -498,7 +498,7 @@
       return APR_SUCCESS;
   }
   
  -static int cgi_handler(const char *handler, request_rec *r)
  +static int cgi_handler(request_rec *r)
   {
       int retval, nph, dbpos = 0;
       const char *argv0;
  @@ -514,7 +514,7 @@
       cgi_server_conf *conf;
       apr_status_t rv;
   
  -    if(strcmp(handler,CGI_MAGIC_TYPE) && strcmp(handler,"cgi-script"))
  +    if(strcmp(r->handler,CGI_MAGIC_TYPE) && strcmp(r->handler,"cgi-script"))
   	return DECLINED;
   
       p = r->main ? r->main->pool : r->pool;
  
  
  
  1.59      +2 -2      httpd-2.0/modules/generators/mod_cgid.c
  
  Index: mod_cgid.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- mod_cgid.c	2001/01/07 19:55:56	1.58
  +++ mod_cgid.c	2001/01/08 23:54:53	1.59
  @@ -730,7 +730,7 @@
    * 
    * Actual cgid handling... 
    */ 
  -static int cgid_handler(const char *handler, request_rec *r) 
  +static int cgid_handler(request_rec *r) 
   { 
       int retval, nph, dbpos = 0; 
       char *argv0, *dbuf = NULL; 
  @@ -746,7 +746,7 @@
       apr_file_t *tempsock = NULL;
       apr_size_t nbytes;
   
  -    if(strcmp(handler,CGI_MAGIC_TYPE) && strcmp(handler,"cgi-script"))
  +    if(strcmp(r->handler,CGI_MAGIC_TYPE) && strcmp(r->handler,"cgi-script"))
   	return DECLINED;
   
       if (r->method_number == M_OPTIONS) { 
  
  
  
  1.15      +8 -7      httpd-2.0/modules/generators/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_status.c	2000/10/16 06:05:07	1.14
  +++ mod_status.c	2001/01/08 23:54:53	1.15
  @@ -84,6 +84,10 @@
       apr_array_header_t *server_status;
       ap_status_table_row_t *status_rows;
   
  +    if (strcmp(r->handler, STATUS_MAGIC_TYPE) && strcmp(r->handler, "server-status"))
{
  +        return DECLINED;
  +    }
  +
       r->allowed = (1 << M_GET);
       if (r->method_number != M_GET)
   	return DECLINED;
  @@ -120,12 +124,10 @@
       return 0;
   }
   
  -static const handler_rec status_handlers[] =
  +static void register_hooks(void)
   {
  -    {STATUS_MAGIC_TYPE, status_handler},
  -    {"server-status", status_handler},
  -    {NULL}
  -};
  +    ap_hook_handler(status_handler, NULL, NULL, AP_HOOK_MIDDLE);
  +}
   
   module AP_MODULE_DECLARE_DATA status_module =
   {
  @@ -135,6 +137,5 @@
       NULL,			/* server config */
       NULL,			/* merge server config */
       NULL,			/* command table */
  -    status_handlers,		/* handlers */
  -    NULL                        /* register hooks */
  +    register_hooks	/* register hooks */
   };
  
  
  
  1.236     +3 -3      httpd-2.0/modules/http/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_core.c,v
  retrieving revision 1.235
  retrieving revision 1.236
  diff -u -r1.235 -r1.236
  --- http_core.c	2001/01/07 19:55:57	1.235
  +++ http_core.c	2001/01/08 23:54:57	1.236
  @@ -2971,7 +2971,7 @@
   
   static int do_nothing(request_rec *r) { return OK; }
   
  -static int default_handler(const char *handler, request_rec *r)
  +static int default_handler(request_rec *r)
   {
       ap_bucket_brigade *bb;
       ap_bucket *e;
  @@ -2994,8 +2994,8 @@
        * have a / in the middle, which probably captures the original
        * intent, but may cause problems at first - Ben 7th Jan 01
        */
  -    if(strcmp(handler,"request-handler")
  -       && ap_strcmp_match(handler,"*/*"))
  +    if(strcmp(r->handler,"default-handler")
  +       && ap_strcmp_match(r->handler,"*/*"))
   	return DECLINED;
   
       d = (core_dir_config *)ap_get_module_config(r->per_dir_config,
  
  
  
  1.17      +1 -1      httpd-2.0/modules/mappers/mod_actions.c
  
  Index: mod_actions.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_actions.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_actions.c	2001/01/07 19:55:57	1.16
  +++ mod_actions.c	2001/01/08 23:54:58	1.17
  @@ -158,7 +158,7 @@
       {NULL}
   };
   
  -static int action_handler(const char *handler,request_rec *r)
  +static int action_handler(request_rec *r)
   {
       action_dir_config *conf = (action_dir_config *)
           ap_get_module_config(r->per_dir_config, &action_module);
  
  
  
  1.24      +2 -2      httpd-2.0/modules/mappers/mod_dir.c
  
  Index: mod_dir.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_dir.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_dir.c	2001/01/07 19:55:57	1.23
  +++ mod_dir.c	2001/01/08 23:54:59	1.24
  @@ -116,7 +116,7 @@
       return new;
   }
   
  -static int handle_dir(const char *handler,request_rec *r)
  +static int handle_dir(request_rec *r)
   {
       dir_config_rec *d;
       char *dummy_ptr[1];
  @@ -124,7 +124,7 @@
       int num_names;
       int error_notfound = 0;
   
  -    if(strcmp(handler,DIR_MAGIC_TYPE))
  +    if(strcmp(r->handler,DIR_MAGIC_TYPE))
   	return DECLINED;
   
       d = (dir_config_rec *) ap_get_module_config(r->per_dir_config,
  
  
  
  1.25      +3 -3      httpd-2.0/modules/mappers/mod_imap.c
  
  Index: mod_imap.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_imap.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mod_imap.c	2001/01/07 19:55:57	1.24
  +++ mod_imap.c	2001/01/08 23:54:59	1.25
  @@ -612,7 +612,7 @@
       ap_rputs("\n\n</body>\n</html>\n", r);         /* finish the menu */
   }
   
  -static int imap_handler(const char *handler,request_rec *r)
  +static int imap_handler(request_rec *r)
   {
       char input[MAX_STRING_LEN];
       char *directive;
  @@ -640,8 +640,8 @@
   
       configfile_t *imap; 
   
  -    if (r->method_number != M_GET || (strcmp(handler,IMAP_MAGIC_TYPE)
  -				      && strcmp(handler, "imap-file")))
  +    if (r->method_number != M_GET || (strcmp(r->handler,IMAP_MAGIC_TYPE)
  +				      && strcmp(r->handler, "imap-file")))
   	return DECLINED;
   
       icr = ap_get_module_config(r->per_dir_config, &imap_module);
  
  
  
  1.46      +2 -2      httpd-2.0/modules/mappers/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- mod_negotiation.c	2001/01/07 19:55:57	1.45
  +++ mod_negotiation.c	2001/01/08 23:55:00	1.46
  @@ -2566,14 +2566,14 @@
       return OK;
   }
   
  -static int handle_map_file(const char *handler,request_rec *r)
  +static int handle_map_file(request_rec *r)
   {
       negotiation_state *neg;
       var_rec *best;
       int res;
       char *udir;
   
  -    if(strcmp(handler,MAP_FILE_MAGIC_TYPE) && strcmp(handler,"type-map"))
  +    if(strcmp(r->handler,MAP_FILE_MAGIC_TYPE) && strcmp(r->handler,"type-map"))
   	return DECLINED;
   
       neg = parse_accept_headers(r);
  
  
  
  1.58      +5 -7      httpd-2.0/modules/mappers/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_rewrite.c	2001/01/03 16:47:02	1.57
  +++ mod_rewrite.c	2001/01/08 23:55:00	1.58
  @@ -210,14 +210,9 @@
       { NULL }
   };
   
  -    /* the apr_table_t of content handlers we provide */
  -static const handler_rec handler_table[] = {
  -    { "redirect-handler", handler_redirect },
  -    { NULL }
  -};
  -
   static void register_hooks(void)
   {
  +    ap_hook_handler(handler_redirect, NULL, NULL, AP_HOOK_MIDDLE);
       ap_hook_post_config(init_module,NULL,NULL,AP_HOOK_MIDDLE);
       ap_hook_child_init(init_child,NULL,NULL,AP_HOOK_MIDDLE);
   
  @@ -234,7 +229,6 @@
      config_server_create,        /* create per-server config structures */
      config_server_merge,         /* merge  per-server config structures */
      command_table,               /* apr_table_t of config file commands  */
  -   handler_table,               /* [#8] MIME-typed-dispatched handlers */
      register_hooks               /* register hooks                      */
   };
   
  @@ -1628,6 +1622,10 @@
   
   static int handler_redirect(request_rec *r)
   {
  +    if (strcmp(r->handler, "redirect-handler")) {
  +        return DECLINED;
  +    }
  +
       /* just make sure that we are really meant! */
       if (strncmp(r->filename, "redirect:", 9) != 0) {
           return DECLINED;
  
  
  
  1.32      +0 -1      httpd-2.0/modules/mappers/mod_so.c
  
  Index: mod_so.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_so.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- mod_so.c	2001/01/02 18:32:49	1.31
  +++ mod_so.c	2001/01/08 23:55:01	1.32
  @@ -379,6 +379,5 @@
      so_sconf_create,		/* server config */
      NULL,			    /* merge server config */
      so_cmds,			    /* command apr_table_t */
  -   NULL,			    /* handlers */
      NULL				    /* register hooks */
   };
  
  
  
  1.24      +0 -1      httpd-2.0/modules/mappers/mod_speling.c
  
  Index: mod_speling.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_speling.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_speling.c	2001/01/05 19:40:03	1.23
  +++ mod_speling.c	2001/01/08 23:55:01	1.24
  @@ -564,6 +564,5 @@
       create_mconfig_for_server,  /* server config */
       NULL,                       /* merge server config */
       speling_cmds,               /* command apr_table_t */
  -    NULL,                       /* handlers */
       register_hooks		/* register hooks */
   };
  
  
  
  1.26      +0 -1      httpd-2.0/modules/metadata/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_cern_meta.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mod_cern_meta.c	2000/12/01 21:49:25	1.25
  +++ mod_cern_meta.c	2001/01/08 23:55:05	1.26
  @@ -397,6 +397,5 @@
       NULL,			/* server config */
       NULL,			/* merge server configs */
       cern_meta_cmds,		/* command apr_table_t */
  -    NULL,			/* handlers */
       register_hooks		/* register hooks */
   };
  
  
  
  1.25      +0 -1      httpd-2.0/modules/metadata/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_expires.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mod_expires.c	2000/12/01 21:49:25	1.24
  +++ mod_expires.c	2001/01/08 23:55:06	1.25
  @@ -516,6 +516,5 @@
       NULL,                       /* server config */
       NULL,                       /* merge server configs */
       expires_cmds,               /* command apr_table_t */
  -    NULL,                       /* handlers */
       register_hooks		/* register hooks */
   };
  
  
  
  1.15      +0 -1      httpd-2.0/modules/metadata/mod_headers.c
  
  Index: mod_headers.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_headers.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_headers.c	2000/12/01 21:49:25	1.14
  +++ mod_headers.c	2001/01/08 23:55:06	1.15
  @@ -262,6 +262,5 @@
       create_headers_config,      /* server config */
       merge_headers_config,       /* merge server configs */
       headers_cmds,               /* command apr_table_t */
  -    NULL,                       /* handlers */
       register_hooks		/* register hooks */
   };
  
  
  
  1.23      +0 -1      httpd-2.0/modules/metadata/mod_usertrack.c
  
  Index: mod_usertrack.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_usertrack.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_usertrack.c	2000/12/01 21:49:26	1.22
  +++ mod_usertrack.c	2001/01/08 23:55:06	1.23
  @@ -319,6 +319,5 @@
       make_cookie_log_state,      /* server config */
       NULL,                       /* merge server configs */
       cookie_log_cmds,            /* command apr_table_t */
  -    NULL,                       /* handlers */
       register_hooks		/* register hooks */
   };
  
  
  
  1.32      +9 -9      httpd-2.0/os/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/win32/mod_isapi.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- mod_isapi.c	2000/11/29 18:50:12	1.31
  +++ mod_isapi.c	2001/01/08 23:55:09	1.32
  @@ -347,15 +347,20 @@
   
   apr_status_t isapi_handler (request_rec *r)
   {
  -    isapi_server_conf *sconf = ap_get_module_config(r->server->module_config, 
  -                                                    &isapi_module);
  -    apr_table_t *e = r->subprocess_env;
  +    isapi_server_conf * sconf;
  +    apr_table_t *e;
       apr_status_t rv;
       isapi_loaded *isa;
       isapi_cid *cid;
       DWORD read;
       int res;
       
  +    if(strcmp(r->handler, "isapi-isa"))
  +        return DECLINED;    
  +
  +    sconf = ap_get_module_config(r->server->module_config, &isapi_module);
  +    e = r->subprocess_env;
  +
       /* Use similar restrictions as CGIs
        *
        * If this fails, it's pointless to load the isapi dll.
  @@ -1262,6 +1267,7 @@
   static void isapi_hooks(void)
   {
       ap_hook_post_config(isapi_post_config, NULL, NULL, AP_HOOK_MIDDLE);
  +    ap_hook_handler(isapi_handler, NULL, NULL, AP_HOOK_MIDDLE);
   }
   
   static const command_rec isapi_cmds[] = {
  @@ -1278,11 +1284,6 @@
   { NULL }
   };
   
  -handler_rec isapi_handlers[] = {
  -    { "isapi-isa", isapi_handler },
  -    { NULL}
  -};
  -
   module isapi_module = {
      STANDARD20_MODULE_STUFF,
      NULL,                        /* create per-dir config */
  @@ -1290,6 +1291,5 @@
      create_isapi_server_config,  /* server config */
      NULL,                        /* merge server config */
      isapi_cmds,                  /* command apr_table_t */
  -   isapi_handlers,              /* handlers */
      isapi_hooks                  /* register hooks */
   };
  
  
  
  1.97      +8 -7      httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- config.c	2001/01/07 23:04:15	1.96
  +++ config.c	2001/01/08 23:55:10	1.97
  @@ -132,8 +132,8 @@
   AP_IMPLEMENT_HOOK_VOID(child_init,
                          (apr_pool_t *pchild, server_rec *s),(pchild,s))
   
  -AP_IMPLEMENT_HOOK_RUN_FIRST(int,handler,(const char *handler,request_rec *r),
  -			    (handler,r),DECLINED)
  +AP_IMPLEMENT_HOOK_RUN_FIRST(int,handler,(request_rec *r),
  +			    (r),DECLINED)
   
   /****************************************************************
    *
  @@ -283,11 +283,9 @@
       char *p2;
       int result;
       char hbuf[MAX_STRING_LEN];
  +    const char *old_handler = r->handler;
   
  -    if (r->handler) {
  -        handler = r->handler;
  -    }
  -    else {
  +    if (!r->handler) {
           handler = r->content_type ? r->content_type : ap_default_type(r);
           if ((p=ap_strchr_c(handler, ';')) != NULL) {
   	    apr_cpystrn(hbuf, handler, sizeof hbuf);
  @@ -298,9 +296,12 @@
   	        --p2;		/* strip trailing spaces */
   	    *p2='\0';
   	}
  +        r->handler = handler;
       }
  +
  +    result = ap_run_handler(r);
   
  -    result = ap_run_handler(handler ,r);
  +    r->handler = old_handler;
   
       if (result == DECLINED && r->handler && r->filename) {
           ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  
  
  
  1.120     +0 -1      httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- mpm_winnt.c	2000/12/21 16:25:44	1.119
  +++ mpm_winnt.c	2001/01/08 23:55:12	1.120
  @@ -2348,6 +2348,5 @@
       NULL,			/* create per-server config structure */
       NULL,			/* merge per-server config structures */
       winnt_cmds,		        /* command apr_table_t */
  -    NULL,			/* handlers */
       winnt_hooks 		/* register_hooks */
   };
  
  
  

Mime
View raw message