Author: richter
Date: Tue Dec 20 21:15:28 2005
New Revision: 358210
URL: http://svn.apache.org/viewcvs?rev=358210&view=rev
Log:
- Fixed parsing of Cache configuration functions in
httpd.conf. Spotted by Carl Eklof.
Modified:
perl/embperl/trunk/Changes.pod
perl/embperl/trunk/mod_embperl.c
Modified: perl/embperl/trunk/Changes.pod
URL:
http://svn.apache.org/viewcvs/perl/embperl/trunk/Changes.pod?rev=358210&r1=358209&r2=358210&view=diff
==============================================================================
--- perl/embperl/trunk/Changes.pod (original)
+++ perl/embperl/trunk/Changes.pod Tue Dec 20 21:15:28 2005
@@ -13,6 +13,8 @@
- Fixed Cookie expire calculation, because
relative exipre times where only calculated
once at server startup. Spotted by Derrick Spell.
+ - Fixed parsing of Cache configuration functions in
+ httpd.conf. Spotted by Carl Eklof.
=head1 2.1.0 15. Nov 2005
Modified: perl/embperl/trunk/mod_embperl.c
URL:
http://svn.apache.org/viewcvs/perl/embperl/trunk/mod_embperl.c?rev=358210&r1=358209&r2=358210&view=diff
==============================================================================
--- perl/embperl/trunk/mod_embperl.c (original)
+++ perl/embperl/trunk/mod_embperl.c Tue Dec 20 21:15:28 2005
@@ -953,10 +953,11 @@
ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "EmbperlDebug: Get: about to convert "#CFGNAME"
(type="#TYPE";CV) to perl data: %s\n", pDirCfg -> save_##STRUCT##NAME) ; \
\
if ((rc = EvalConfig (pApp, sv_2mortal(newSVpv(pDirCfg ->
save_##STRUCT##NAME, 0)), 0, NULL, "Configuration: EMBPERL_"#CFGNAME, &pDirCfg
-> STRUCT.NAME)) != ok) \
- LogError (pReq, rc) ; \
- return rc ; \
+ pDirCfg -> STRUCT.NAME = NULL ; \
+ tainted = 0 ; \
} \
- SvREFCNT_inc((SV *)(pDirCfg -> STRUCT.NAME)) ;
+ if (pDirCfg -> STRUCT.NAME) \
+ SvREFCNT_inc((SV *)(pDirCfg -> STRUCT.NAME)) ;
#undef EPCFG_AV
@@ -994,10 +995,11 @@
ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "EmbperlDebug: Get: about to convert "#CFGNAME"
(type="#TYPE";REGEX) to perl data: %s\n", pDirCfg -> save_##STRUCT##NAME) ; \
\
if ((rc = EvalRegEx (pApp, pDirCfg -> save_##STRUCT##NAME,
"Configuration: EMBPERL_"#CFGNAME, &pDirCfg -> STRUCT.NAME)) != ok) \
- return rc ; \
+ pDirCfg -> STRUCT.NAME = NULL ; \
tainted = 0 ; \
} \
- SvREFCNT_inc((SV *)(pDirCfg -> STRUCT.NAME)) ;
+ if (pDirCfg -> STRUCT.NAME) \
+ SvREFCNT_inc((SV *)(pDirCfg -> STRUCT.NAME)) ;
/*---------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
