perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steve...@apache.org
Subject svn commit: r1537743 - in /perl/modperl/branches/httpd24threading: ./ Changes src/modules/perl/mod_perl.c src/modules/perl/modperl_callback.c t/directive/perlcleanuphandler.t t/response/TestDirective/perlcleanuphandler.pm
Date Thu, 31 Oct 2013 22:30:13 GMT
Author: stevehay
Date: Thu Oct 31 22:30:13 2013
New Revision: 1537743

URL: http://svn.apache.org/r1537743
Log:
Merged revision(s) 594609 from perl/modperl/branches/threading:
Now correctly invokes PerlCleanupHandlers, even if they are the only 
handler type configured for that request

Reviewed-By: gozer
Submitted-By: Torsten Foertsch <torsten.foertsch@gmx.net>
Message-Id: <200710241325.53933.torsten.foertsch@gmx.net>


........

Added:
    perl/modperl/branches/httpd24threading/t/directive/perlcleanuphandler.t
      - copied unchanged from r594609, perl/modperl/branches/threading/t/directive/perlcleanuphandler.t
    perl/modperl/branches/httpd24threading/t/response/TestDirective/perlcleanuphandler.pm
      - copied unchanged from r594609, perl/modperl/branches/threading/t/response/TestDirective/perlcleanuphandler.pm
Modified:
    perl/modperl/branches/httpd24threading/   (props changed)
    perl/modperl/branches/httpd24threading/Changes
    perl/modperl/branches/httpd24threading/src/modules/perl/mod_perl.c
    perl/modperl/branches/httpd24threading/src/modules/perl/modperl_callback.c

Propchange: perl/modperl/branches/httpd24threading/
------------------------------------------------------------------------------
  Merged /perl/modperl/branches/threading:r594609

Modified: perl/modperl/branches/httpd24threading/Changes
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/Changes?rev=1537743&r1=1537742&r2=1537743&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/Changes (original)
+++ perl/modperl/branches/httpd24threading/Changes Thu Oct 31 22:30:13 2013
@@ -12,6 +12,9 @@ Also refer to the Apache::Test changes l
 
 =item 2.0.9-dev
 
+Now correctly invokes PerlCleanupHandlers, even if they are the only
+handler type configured for that request [Torsten Foertsch]
+
 For threaded MPMs, change interpreter managment to a new, reference-counted
 allocation model. [Torsten Foertsch]
 

Modified: perl/modperl/branches/httpd24threading/src/modules/perl/mod_perl.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/mod_perl.c?rev=1537743&r1=1537742&r2=1537743&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/src/modules/perl/mod_perl.c (original)
+++ perl/modperl/branches/httpd24threading/src/modules/perl/mod_perl.c Thu Oct 31 22:30:13
2013
@@ -750,6 +750,7 @@ static int modperl_hook_create_request(r
 #endif
 
     modperl_config_req_init(r, rcfg);
+    modperl_config_req_cleanup_register(r, rcfg);
 
     /* set the default for cgi header parsing On as early as possible
      * so $r->content_type in any phase after header_parser could turn

Modified: perl/modperl/branches/httpd24threading/src/modules/perl/modperl_callback.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/modperl_callback.c?rev=1537743&r1=1537742&r2=1537743&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/src/modules/perl/modperl_callback.c (original)
+++ perl/modperl/branches/httpd24threading/src/modules/perl/modperl_callback.c Thu Oct 31
22:30:13 2013
@@ -201,14 +201,6 @@ int modperl_callback_run_handlers(int id
     }
 #endif
 
-    /* XXX: would like to do this in modperl_hook_create_request()
-     * but modperl_interp_select() is what figures out if
-     * PerlInterpScope eq handler, in which case we do not register
-     * a cleanup.  modperl_hook_create_request() is also currently always
-     * run even if modperl isn't handling any part of the request
-     */
-    modperl_config_req_cleanup_register(r, rcfg);
-
     switch (type) {
       case MP_HANDLER_TYPE_PER_SRV:
         modperl_handler_make_args(aTHX_ &av_args,



Mime
View raw message