Attachment #39832 for bug #69235

View | Details | Raw Unified | Return to bug 69235
Collapse All | Expand All





static void register_hooks(apr_pool_t *p)
{
    /* fixup before mod_proxy so that a [P] URL gets fixed up there */
    static const char * const aszModProxy[] = { "mod_proxy.c", NULL };
     */
    static const char * const aszPre[]={ "mod_proxy.c", NULL };

    /* make the hashtable before registering the function, so that
     * other modules are prevented from accessing uninitialized memory.

    ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_post_config(post_config, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_child_init(init_child, NULL, NULL, APR_HOOK_MIDDLE);
    
    ap_hook_translate_name(hook_uri2file, NULL, NULL, APR_HOOK_FIRST);
    ap_hook_fixups(hook_fixup, NULL, aszModProxy, APR_HOOK_FIRST);
    ap_hook_fixups(hook_mimetype, NULL, NULL, APR_HOOK_LAST);
    ap_hook_translate_name(hook_uri2file, NULL, NULL, APR_HOOK_FIRST);
}

    /* the main config structure */




}
static void register_hooks(apr_pool_t *p)
{
    /* fixup after mod_rewrite so that a [P] URL from there gets fixed up */
    static const char * const aszModRewrite[] = { "mod_rewrite.c", NULL };
     */
    static const char * const aszSucc[] = { "mod_rewrite.c", NULL};
    /* Only the mpm_winnt has child init hook handler.
     * make sure that we are called after the mpm
     * initializes.
     */
    static const char *const aszPred[] = { "mpm_winnt.c", "mod_proxy_balancer.c",
                                           "mod_proxy_hcheck.c", NULL };

    /* handler */
    ap_hook_handler(proxy_handler, NULL, NULL, APR_HOOK_FIRST);
    /* filename-to-URI translation */
    ap_hook_pre_translate_name(proxy_pre_translate_name, NULL, NULL,
                               APR_HOOK_MIDDLE);
    ap_hook_translate_name(proxy_translate_name, aszModRewrite, NULL,
                           APR_HOOK_FIRST);
    /* walk <Proxy > entries and suppress default TRACE behavior */
    ap_hook_map_to_storage(proxy_map_location, NULL,NULL, APR_HOOK_FIRST);
    /* fixups */
    ap_hook_fixups(proxy_fixup, aszModRewrite, NULL, APR_HOOK_FIRST);
    /* post read_request handling */
    ap_hook_post_read_request(proxy_detect, NULL, NULL, APR_HOOK_FIRST);
    /* pre config handling */

Return to bug 69235

Lines 5610-5619 static void ap_register_rewrite_mapfunc(char *name Link Here

(-)modules/mappers/mod_rewrite.c (-7 / +5 lines)
5610		5610
5611	static void register_hooks(apr_pool_t *p)	5611	static void register_hooks(apr_pool_t *p)
5612	{	5612	{
5613	/* fixup after mod_proxy, so that the proxied url will not	5613	/* fixup before mod_proxy so that a [P] URL gets fixed up there */
5614	* escaped accidentally by mod_proxy's fixup.	5614	static const char * const aszModProxy[] = { "mod_proxy.c", NULL };
5615	*/
5616	static const char * const aszPre[]={ "mod_proxy.c", NULL };
5617		5615
5618	/* make the hashtable before registering the function, so that	5616	/* make the hashtable before registering the function, so that
5619	* other modules are prevented from accessing uninitialized memory.	5617	* other modules are prevented from accessing uninitialized memory.
Lines 5625-5634 static void register_hooks(apr_pool_t *p) Link Here
5625	ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_MIDDLE);	5623	ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_MIDDLE);
5626	ap_hook_post_config(post_config, NULL, NULL, APR_HOOK_MIDDLE);	5624	ap_hook_post_config(post_config, NULL, NULL, APR_HOOK_MIDDLE);
5627	ap_hook_child_init(init_child, NULL, NULL, APR_HOOK_MIDDLE);	5625	ap_hook_child_init(init_child, NULL, NULL, APR_HOOK_MIDDLE);
5628		5626
5629	ap_hook_fixups(hook_fixup, aszPre, NULL, APR_HOOK_FIRST);	5627	ap_hook_translate_name(hook_uri2file, NULL, NULL, APR_HOOK_FIRST);
		5628	ap_hook_fixups(hook_fixup, NULL, aszModProxy, APR_HOOK_FIRST);
5630	ap_hook_fixups(hook_mimetype, NULL, NULL, APR_HOOK_LAST);	5629	ap_hook_fixups(hook_mimetype, NULL, NULL, APR_HOOK_LAST);
5631	ap_hook_translate_name(hook_uri2file, NULL, NULL, APR_HOOK_FIRST);
5632	}	5630	}
5633		5631
5634	/* the main config structure */	5632	/* the main config structure */

Lines 3344-3370 static int proxy_pre_config(apr_pool_t *pconf, apr Link Here

(-)modules/proxy/mod_proxy.c (-7 / +6 lines)
3344	}	3344	}
3345	static void register_hooks(apr_pool_t *p)	3345	static void register_hooks(apr_pool_t *p)
3346	{	3346	{
3347	/* fixup before mod_rewrite, so that the proxied url will not	3347	/* fixup after mod_rewrite so that a [P] URL from there gets fixed up */
3348	* escaped accidentally by our fixup.	3348	static const char * const aszModRewrite[] = { "mod_rewrite.c", NULL };
3349	*/
3350	static const char * const aszSucc[] = { "mod_rewrite.c", NULL};
3351	/* Only the mpm_winnt has child init hook handler.	3349	/* Only the mpm_winnt has child init hook handler.
3352	* make sure that we are called after the mpm	3350	* make sure that we are called after the mpm
3353	* initializes.	3351	* initializes.
3354	*/	3352	*/
3355	static const char *const aszPred[] = { "mpm_winnt.c", "mod_proxy_balancer.c",	3353	static const char *const aszPred[] = { "mpm_winnt.c", "mod_proxy_balancer.c",
3356	"mod_proxy_hcheck.c", NULL};	3354	"mod_proxy_hcheck.c", NULL };
		3355
3357	/* handler */	3356	/* handler */
3358	ap_hook_handler(proxy_handler, NULL, NULL, APR_HOOK_FIRST);	3357	ap_hook_handler(proxy_handler, NULL, NULL, APR_HOOK_FIRST);
3359	/* filename-to-URI translation */	3358	/* filename-to-URI translation */
3360	ap_hook_pre_translate_name(proxy_pre_translate_name, NULL, NULL,	3359	ap_hook_pre_translate_name(proxy_pre_translate_name, NULL, NULL,
3361	APR_HOOK_MIDDLE);	3360	APR_HOOK_MIDDLE);
3362	ap_hook_translate_name(proxy_translate_name, aszSucc, NULL,	3361	ap_hook_translate_name(proxy_translate_name, aszModRewrite, NULL,
3363	APR_HOOK_FIRST);	3362	APR_HOOK_FIRST);
3364	/* walk <Proxy > entries and suppress default TRACE behavior */	3363	/* walk <Proxy > entries and suppress default TRACE behavior */
3365	ap_hook_map_to_storage(proxy_map_location, NULL,NULL, APR_HOOK_FIRST);	3364	ap_hook_map_to_storage(proxy_map_location, NULL,NULL, APR_HOOK_FIRST);
3366	/* fixups */	3365	/* fixups */
3367	ap_hook_fixups(proxy_fixup, NULL, aszSucc, APR_HOOK_FIRST);	3366	ap_hook_fixups(proxy_fixup, aszModRewrite, NULL, APR_HOOK_FIRST);
3368	/* post read_request handling */	3367	/* post read_request handling */
3369	ap_hook_post_read_request(proxy_detect, NULL, NULL, APR_HOOK_FIRST);	3368	ap_hook_post_read_request(proxy_detect, NULL, NULL, APR_HOOK_FIRST);
3370	/* pre config handling */	3369	/* pre config handling */