You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@hyperreal.org on 1998/06/17 18:58:00 UTC
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 98/06/17 09:57:59
Modified: src/modules/perl mod_perl.c
Log:
we still want to run END blocks if hard_timeout jumps out of perl_handler()
yesterday's patch only made sure the END block was saved before the possible
jump
Revision Changes Path
1.22 +4 -3 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_perl.c 1998/05/29 22:07:43 1.21
+++ mod_perl.c 1998/06/17 16:57:59 1.22
@@ -637,8 +637,6 @@
PERL_CALLBACK("PerlHandler", cld->PerlHandler);
- perl_run_rgy_endav(r->uri);
-
FREETMPS;
LEAVE;
MP_TRACE_g(fprintf(stderr, "perl_handler LEAVE: SVs = %5d, OBJs = %5d\n",
@@ -801,8 +799,11 @@
void mod_perl_end_cleanup(void *data)
{
+ request_rec *r = (request_rec *)data;
MP_TRACE_g(fprintf(stderr, "perl_end_cleanup..."));
+ perl_run_rgy_endav(r->uri);
+
/* clear %ENV */
perl_clear_env();
@@ -1064,7 +1065,7 @@
mod_perl_tie_scriptname();
/* will be released in mod_perl_end_cleanup */
(void)acquire_mutex(mod_perl_mutex);
- register_cleanup(r->pool, NULL, mod_perl_end_cleanup, mod_perl_noop);
+ register_cleanup(r->pool, (void*)r, mod_perl_end_cleanup, mod_perl_noop);
#ifdef WIN32
sv_setpvf(perl_get_sv("Apache::CurrentThreadId", TRUE), "0x%lx",