Author: stas Date: Wed May 25 10:14:46 2005 New Revision: 178490 URL: http://svn.apache.org/viewcvs?rev=178490&view=rev Log: fix a bug in ModPerl::RegistryCooker: now stripping __(END|DATA)__ only at the beginning of the line
Modified: perl/modperl/trunk/Changes perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/basic.pl Modified: perl/modperl/trunk/Changes URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=178490&r1=178489&r2=178490&view=diff ============================================================================== --- perl/modperl/trunk/Changes (original) +++ perl/modperl/trunk/Changes Wed May 25 10:14:46 2005 @@ -12,6 +12,9 @@ =item 2.0.1-dev +fix a bug in ModPerl::RegistryCooker: now stripping __(END|DATA)__ +only at the beginning of the line [Stas] + APR::Base64 : [Torsten Foertsch <[EMAIL PROTECTED]>] - fix encode_len() to return the length without accounting for the terminating '\0' as the C API does. Modified: perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm?rev=178490&r1=178489&r2=178490&view=diff ============================================================================== --- perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm (original) +++ perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm Wed May 25 10:14:46 2005 @@ -645,7 +645,7 @@ ######################################################################### sub strip_end_data_segment { - ${ +shift->{CODE} } =~ s/__(END|DATA)__(.*)//s; + ${ +shift->{CODE} } =~ s/^__(END|DATA)__(.*)//ms; } Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/basic.pl URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/basic.pl?rev=178490&r1=178489&r2=178490&view=diff ============================================================================== --- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/basic.pl (original) +++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/basic.pl Wed May 25 10:14:46 2005 @@ -3,8 +3,13 @@ # test all the basic functionality print "Content-type: text/plain\n\n"; + +# test that __END__ can appear in a comment w/o cutting data after it + print "ok $0"; +# test that __END__ starting at the beginning of the line makes +# everything following it, stripped __END__ this is some irrelevant data