richter 2004/08/15 21:19:45
Modified: . epparse.c mod_embperl.c
Embperl Object.pm
xsbuilder/maps ep_structure.map
Log:
correctly destroy pUriMatch
Revision Changes Path
1.13 +1 -1 embperl/epparse.c
Index: epparse.c
===================================================================
RCS file: /home/cvs/embperl/epparse.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- epparse.c 16 Aug 2004 03:39:00 -0000 1.12
+++ epparse.c 16 Aug 2004 04:19:44 -0000 1.13
@@ -911,7 +911,7 @@
pEndCurr = NULL ;
if (strcmp (pToken -> sEndText, "\n\n") == 0)
{
- if (pEndCurr = strstr (pCurr, "\n\r\n"))
+ if ((pEndCurr = strstr (pCurr, "\n\r\n")))
{
if (pEndCurr[-1] == '\r')
{
1.20 +3 -1 embperl/mod_embperl.c
Index: mod_embperl.c
===================================================================
RCS file: /home/cvs/embperl/mod_embperl.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_embperl.c 16 Aug 2004 03:39:00 -0000 1.19
+++ mod_embperl.c 16 Aug 2004 04:19:44 -0000 1.20
@@ -428,7 +428,7 @@
if (cfg -> STRUCT.NAME) \
{ \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "EmbperlDebug: ApacheConfigCleanup:SvREFCNT_dec "#CFGNAME"
(name="#NAME" type="#TYPE") \n") ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "EmbperlDebug: ApacheConfigCleanup:SvREFCNT_dec "#CFGNAME"
(name="#NAME" type="#TYPE" refcnt=%d) \n", (int)SvREFCNT ((SV *)(cfg -> STRUCT.NAME)))
; \
SvREFCNT_dec ((SV *)(cfg -> STRUCT.NAME)) ; \
cfg -> STRUCT.NAME = NULL ; \
}
@@ -623,6 +623,8 @@
{ \
mrg -> set_##STRUCT##NAME = 1 ; \
mrg -> STRUCT.NAME = add -> STRUCT.NAME ; \
+ if (mrg -> STRUCT.NAME) \
+ SvREFCNT_inc((SV *)mrg -> STRUCT.NAME) ; \
mrg -> save_##STRUCT##NAME = add -> save_##STRUCT##NAME ; \
if (mrg -> STRUCT.NAME) \
SvREFCNT_inc((SV *)mrg -> STRUCT.NAME) ; \
1.10 +23 -11 embperl/Embperl/Object.pm
Index: Object.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Object.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Object.pm 16 Aug 2004 03:39:01 -0000 1.9
+++ Object.pm 16 Aug 2004 04:19:44 -0000 1.10
@@ -100,19 +100,31 @@
}
-#############################################################################
-
-sub handler
- {
- my %req ;
-
- $req{'req_rec'} = $_[0] ;
-
+#############################################################################
+
+sub handler_dmalloc
+ {
+ my %req ;
+
+ $req{'req_rec'} = $_[0] ;
+
my $n = Embperl::dmalloc_mark () ;
- Execute (\%req) ;
+ my $rc = Execute (\%req) ;
Embperl::dmalloc_check ($n, "Embperl::Object") ;
- }
-
+ return $rc ;
+ }
+
+#############################################################################
+
+sub handler
+ {
+ my %req ;
+
+ $req{'req_rec'} = $_[0] ;
+
+ Execute (\%req) ;
+ }
+
#############################################################################
1.7 +1 -1 embperl/xsbuilder/maps/ep_structure.map
Index: ep_structure.map
===================================================================
RCS file: /home/cvs/embperl/xsbuilder/maps/ep_structure.map,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ep_structure.map 2 Apr 2004 05:10:41 -0000 1.6
+++ ep_structure.map 16 Aug 2004 04:19:45 -0000 1.7
@@ -227,7 +227,7 @@
<tReqConfig>
! _perlsv
pAllow | allow
- pURIMatch | urimatch
+ pUriMatch | urimatch
sDecline | decline
cMultFieldSep | mult_field_sep
pPathAV | path
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
