stas 2004/03/02 22:05:30
Modified: src/modules/perl modperl_filter.c Log: use modperl_handler_name wrapper and not directly access handler->name to handle anon subs handlers. Revision Changes Path 1.84 +9 -7 modperl-2.0/src/modules/perl/modperl_filter.c Index: modperl_filter.c =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v retrieving revision 1.83 retrieving revision 1.84 diff -u -u -r1.83 -r1.84 --- modperl_filter.c 3 Mar 2004 06:03:10 -0000 1.83 +++ modperl_filter.c 3 Mar 2004 06:05:30 -0000 1.84 @@ -6,7 +6,7 @@ #define MP_FILTER_NAME(f) \ (is_modperl_filter(f) \ - ? ((modperl_filter_ctx_t *)(f)->ctx)->handler->name \ + ? modperl_handler_name(((modperl_filter_ctx_t *)(f)->ctx)->handler) \ : (f)->frec->name) #define MP_FILTER_TYPE(filter) \ @@ -393,7 +393,8 @@ MP_dINTERP_SELECT(r, c, s); - MP_TRACE_h(MP_FUNC, "running filter init handler %s\n", handler->name); + MP_TRACE_h(MP_FUNC, "running filter init handler %s\n", + modperl_handler_name(handler)); modperl_handler_make_args(aTHX_ &args, "Apache::Filter", f, @@ -417,7 +418,7 @@ MP_INTERP_PUTBACK(interp); MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT - "return: %d\n", handler->name, status); + "return: %d\n", modperl_handler_name(handler), status); return status; } @@ -493,7 +494,7 @@ MP_INTERP_PUTBACK(interp); MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT - "return: %d\n", handler->name, status); + "return: %d\n", modperl_handler_name(handler), status); return status; } @@ -1105,7 +1106,8 @@ /* has to resolve early so we can check for init functions */ if (!modperl_mgv_resolve(aTHX_ handler, pool, handler->name, TRUE)) { - Perl_croak(aTHX_ "unable to resolve handler %s\n", handler->name); + Perl_croak(aTHX_ "unable to resolve handler %s\n", + modperl_handler_name(handler)); } /* verify that the filter handler is of the right kind */ @@ -1115,7 +1117,7 @@ Perl_croak(aTHX_ "Can't add connection filter handler '%s' " "since it doesn't have the " "FilterConnectionHandler attribute set", - handler->name); + modperl_handler_name(handler)); } } else { @@ -1129,7 +1131,7 @@ Perl_croak(aTHX_ "Can't add request filter handler '%s' " "since it doesn't have the " "FilterRequestHandler attribute set", - handler->name); + modperl_handler_name(handler)); } }