Index: src/modules/perl/modperl_handler.c
===================================================================
--- src/modules/perl/modperl_handler.c	(revision 930668)
+++ src/modules/perl/modperl_handler.c	(working copy)
@@ -497,6 +497,7 @@
 {
     char *name = NULL;
     GV *gv;
+    modperl_handler_t *handler;
 
     if (SvROK(sv)) {
         sv = SvRV(sv);
@@ -515,7 +516,10 @@
             Perl_croak(aTHX_ "can't resolve the code reference");
         }
         name = apr_pstrcat(p, HvNAME(GvSTASH(gv)), "::", GvNAME(gv), NULL);
-        return modperl_handler_new(p, apr_pstrdup(p, name));
+	handler = modperl_handler_new(p, name);
+	handler->attrs=*modperl_code_attrs(aTHX_ (CV*)sv);
+
+	return handler;
       default:
         break;
     };
Index: src/modules/perl/modperl_filter.c
===================================================================
--- src/modules/perl/modperl_filter.c	(revision 930668)
+++ src/modules/perl/modperl_filter.c	(working copy)
@@ -407,7 +407,9 @@
             MP_TRACE_h(MP_FUNC, "found init handler %s",
                        modperl_handler_name(init_handler));
 
-            if (!init_handler->attrs & MP_FILTER_INIT_HANDLER) {
+	    warn("init_attrs(%s)=%x\n", modperl_handler_name(init_handler),
+		 init_handler->attrs);
+            if (!(init_handler->attrs & MP_FILTER_INIT_HANDLER)) {
                 Perl_croak(aTHX_ "handler %s doesn't have "
                            "the FilterInitHandler attribute set",
                            modperl_handler_name(init_handler));
@@ -656,6 +658,10 @@
     (void)SvUPGRADE(buffer, SVt_PV);
     SvPOK_only(buffer);
     SvCUR(buffer) = 0;
+    SvGROW(buffer, 1);		/* make PERL_ARGS_ASSERT_SV_CATPVN_FLAGS
+				 * happy, see Perl_sv_catpvn_flags() in sv.c
+				 * of perl 5.10.1
+				 */
 
     /* sometimes the EOS bucket arrives in the same brigade with other
      * buckets, so that particular read() will not return 0 and will