Commit 71936dd3 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

adjust remaining modules to use the new handler hook method (Alan Edwards) 

bring back the old handler prototype by reusing r->handler (dougm)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87617 13f79535-47bb-0310-9956-ffa450edef68
parent bf399be8

include/http_config.h

+2 −3
Original line number Diff line number Diff line
@@ -993,12 +993,11 @@ AP_DECLARE_HOOK(void,child_init,(apr_pool_t *pchild, server_rec *s)) 


/**

 * 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

}

libhttpd.def

+1 −0
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ EXPORTS 
        ap_hook_post_config

        ap_hook_open_logs

        ap_hook_child_init

        ap_hook_handler



        ap_get_status_table

        ap_run_default_port

modules/aaa/mod_auth_anon.c

+0 −1
Original line number Diff line number Diff line
@@ -308,6 +308,5 @@ module AP_MODULE_DECLARE_DATA anon_auth_module = 
    NULL,			/* server config */

    NULL,			/* merge server config */

    anon_auth_cmds,		/* command apr_table_t */

    NULL,			/* handlers */

    register_hooks		/* register hooks */

};

modules/aaa/mod_auth_db.c

+0 −1
Original line number Diff line number Diff line
@@ -409,7 +409,6 @@ module db_auth_module = 
    NULL,			/* server config */

    NULL,			/* merge server config */

    db_auth_cmds,		/* command apr_table_t */

    NULL,			/* handlers */

    register_hooks		/* register hooks */

};

modules/aaa/mod_auth_dbm.c

+0 −1
Original line number Diff line number Diff line
@@ -349,6 +349,5 @@ module AP_MODULE_DECLARE_DATA dbm_auth_module = 
    NULL,			/* server config */

    NULL,			/* merge server config */

    dbm_auth_cmds,		/* command apr_table_t */

    NULL,			/* handlers */

    register_hooks              /* register hooks */

};