dougm 02/03/24 14:06:39 Modified: . Changes STATUS lib/Apache RegistryNG.pm Log: Submitted by: Geoff Young Reviewed by: dougm properly deal with $r->status codes (e.g. redirect) in Apache::RegistryNG Revision Changes Path 1.634 +3 -0 modperl/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl/Changes,v retrieving revision 1.633 retrieving revision 1.634 diff -u -r1.633 -r1.634 --- Changes 24 Mar 2002 21:57:53 -0000 1.633 +++ Changes 24 Mar 2002 22:06:39 -0000 1.634 @@ -10,6 +10,9 @@ =item 1.26_01-dev +properly deal with $r->status codes (e.g. redirect) in +Apache::RegistryNG [Geoff Young <[EMAIL PROTECTED]>] + properly escape highbit chars in Apache::Utils::escape_html [Geoff Young <[EMAIL PROTECTED]>, Robin Berjon <[EMAIL PROTECTED]>] 1.10 +1 -6 modperl/STATUS Index: STATUS =================================================================== RCS file: /home/cvs/modperl/STATUS,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- STATUS 24 Mar 2002 21:57:53 -0000 1.9 +++ STATUS 24 Mar 2002 22:06:39 -0000 1.10 @@ -1,5 +1,5 @@ mod_perl 1.3 STATUS: - Last modified at [$Date: 2002/03/24 21:57:53 $] + Last modified at [$Date: 2002/03/24 22:06:39 $] Release: @@ -20,11 +20,6 @@ Report: http://marc.theaimsgroup.com/?l=apache-modperl&m=97449481013350&w=2 Status: doc patch at http://marc.theaimsgroup.com/?l=apache-modperl&m=97450363501652&w=2 - - * Apache::RegistryNG issues - Report: http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=101240123609773&w=2 - Status: - patch available * vanishing symbol tables Report: http://marc.theaimsgroup.com/?l=apache-modperl&m=100820262006934&w=2 1.8 +7 -1 modperl/lib/Apache/RegistryNG.pm Index: RegistryNG.pm =================================================================== RCS file: /home/cvs/modperl/lib/Apache/RegistryNG.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- RegistryNG.pm 28 Sep 2000 19:59:39 -0000 1.7 +++ RegistryNG.pm 24 Mar 2002 22:06:39 -0000 1.8 @@ -48,9 +48,15 @@ $pr->set_mtime; } + my $old_status = $r->status; + $rc = $pr->run(@_); $pr->chdir_file("$Apache::Server::CWD/"); - return ($rc != OK) ? $rc : $pr->status; + + my $pr_status = $pr->status; + $r->status($old_status); + + return ($rc != OK) ? $rc : $pr_status; } 1;