[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

please accept blosxom 2.1.1-1 into lenny


 There was some regression noticed after the release of 2.1.0 which
affects Debian users upgrading from etch to that version, too. The diff
looks much bigger than the fix actually is because of additional
documentation fixes and corrections along the lines that mostly should
had been done with 2.1.0 but were overlooked unfortunately there.

 The code changes in blosxom.cgi are limited to the chunk
"@@ -142,20 +142,39 @@" and bail down to this pseudo-diff minus all the
documentation comments surrounding it:

-$url ||= url( -path_info => 1 );

-$url =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;      
-$url =~ s/^included:/http:/ if $ENV{SERVER_PROTOCOL} eq 'INCLUDED';

-my $pi_len = length $ENV{PATH_INFO};
-my $might_be_pi = substr( $url, -$pi_len );
-substr( $url, -length $ENV{PATH_INFO} ) = ''
-    if $might_be_pi eq $ENV{PATH_INFO};

+unless ($url) {
+    $url = url();

+    $url =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;      
+    $url =~ s/^included:/http:/ if $ENV{SERVER_PROTOCOL} eq 'INCLUDED';

+    $url =~ s/\Q$ENV{PATH_INFO}\E$// if defined $ENV{PATH_INFO};

 The change in here is to a.) support setting the url in the config file
when all automatism fails (enhancement to work around false automatism
in special circumstances), but the more important part is b.) the
handling of PATH_INFO which used to false produced URLs that were proper
with the 2.0 version of blosxom we had in etch.

 Find the complete diff for your convenience at [1], but I guess you are
extracing the diff on your own anyway to not have people cheat on you
with special-prepared diffs. :)

 Thanks in advance,
[1] <http://deb.at/~rhonda/blosxom_2.1.0-1_2.1.1-1.diff>

Reply to: