Re: Does the AxKit-devel mailing list have an archive?

[Doug MacEachern]

ok, here's the right patch.  the deal is, the generated .xs file would
register cleanups for objects created by {DIR,SERVER}_CREATE, but not
MERGE.  perl_config.c:perl_perl_merge_cfg() now takes care of this as it
should.  i did some testing with t/TestDirectives and do not see any
leakage.
p.s.
(i left the cleanup_av -> cleanup_sv rename in there, even though
the patch no longer uses that function)

Index: src/modules/perl/perl_config.c
===================================================================
RCS file: /home/cvs/modperl/src/modules/perl/perl_config.c,v
retrieving revision 1.101
diff -u -r1.101 perl_config.c
--- src/modules/perl/perl_config.c      2000/08/15 19:36:33     1.101
+++ src/modules/perl/perl_config.c      2000/09/22 18:41:22
@@ -436,7 +436,7 @@
     sva = newSVpv(arg,0); 
     if(!*cmd) { 
         *cmd = newAV(); 
-       register_cleanup(p, (void*)*cmd, mod_perl_cleanup_av, mod_perl_noop);
+       register_cleanup(p, (void*)*cmd, mod_perl_cleanup_sv, mod_perl_noop);
        MP_TRACE_d(fprintf(stderr, "init `%s' stack\n", hook)); 
     } 
     MP_TRACE_d(fprintf(stderr, "perl_cmd_push_handlers: @%s, '%s'\n", hook, arg)); 
@@ -823,13 +823,13 @@
     return NULL;
 }
 
-void mod_perl_cleanup_av(void *data)
+void mod_perl_cleanup_sv(void *data)
 {
-    AV *av = (AV*)data;
-    if(SvREFCNT((SV*)av)) {
-       MP_TRACE_g(fprintf(stderr, "cleanup_av: SvREFCNT(0x%lx)==%d\n", 
-                          (unsigned long)av, (int)SvREFCNT((SV*)av)));
-       SvREFCNT_dec((SV*)av);
+    SV *sv = (SV*)data;
+    if (SvREFCNT(sv)) {
+        MP_TRACE_g(fprintf(stderr, "cleanup_sv: SvREFCNT(0x%lx)==%d\n",
+                           (unsigned long)sv, (int)SvREFCNT(sv)));
+        SvREFCNT_dec(sv);
     }
 }
 
@@ -929,7 +929,7 @@
        *basevp = (mod_perl_perl_dir_config *)basev,
        *addvp  = (mod_perl_perl_dir_config *)addv;
 
-    SV *sv, 
+    SV *sv=Nullsv, 
        *basesv = basevp ? basevp->obj : Nullsv,
        *addsv  = addvp  ? addvp->obj  : Nullsv;
 
@@ -958,16 +958,23 @@
        if((perl_eval_ok(NULL) == OK) && (count == 1)) {
            sv = POPs;
            ++SvREFCNT(sv);
-           mrg->obj = sv;
            mrg->pclass = SvCLASS(sv);
        }
        PUTBACK;
        FREETMPS;LEAVE;
     }
     else {
-       mrg->obj = newSVsv(basesv);
-       mrg->pclass = basevp->pclass;
+        sv = newSVsv(basesv);
+        mrg->pclass = basevp->pclass;
     }
+
+    if (sv) {
+        mrg->obj = sv;
+        register_cleanup(p, (void*)mrg,
+                         perl_perl_cmd_cleanup, mod_perl_noop);
+
+    }
+
     return (void *)mrg;
 }
 
Index: src/modules/perl/mod_perl.h
===================================================================
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.h,v
retrieving revision 1.102
diff -u -r1.102 mod_perl.h
--- src/modules/perl/mod_perl.h 2000/08/15 19:36:33     1.102
+++ src/modules/perl/mod_perl.h 2000/09/22 18:41:32
@@ -1132,7 +1132,7 @@
 void perl_setup_env(request_rec *r);
 SV  *perl_bless_request_rec(request_rec *); 
 void perl_set_request_rec(request_rec *); 
-void mod_perl_cleanup_av(void *data);
+void mod_perl_cleanup_sv(void *data);
 void mod_perl_cleanup_handler(void *data);
 void mod_perl_end_cleanup(void *data);
 void mod_perl_register_cleanup(request_rec *r, SV *sv);