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

Bug#771848: unblock libapache-gallery-perl/1.0.2-4



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

This is a simple fix for the important bug #770687, which breaks icons
for apache gallery. This particular bug was introduced by me, and the
fix returns to the upstream configuration. [Basically, it was appending
the wrong path to $filename; everything under /icons should be declined
and handled by Apache itself.]

diff -u libapache-gallery-perl-1.0.2/debian/changelog libapache-gallery-perl-1.0.2/debian/changelog
--- libapache-gallery-perl-1.0.2/debian/changelog
+++ libapache-gallery-perl-1.0.2/debian/changelog
@@ -1,3 +1,11 @@
+libapache-gallery-perl (1.0.2-4) unstable; urgency=medium
+
+  * Remove regex and filename setting for icons/gallery which caused the
+    wrong file to be used. Thanks to Andreas Pakulat for identifying the
+    issue. (Closes: #770687)
+
+ -- Don Armstrong <don@debian.org>  Tue, 02 Dec 2014 11:33:24 -0800
+
 libapache-gallery-perl (1.0.2-3) unstable; urgency=medium
 
   * Create var/cache/www and make it writable by www-data (Closes: #710281)
diff -u libapache-gallery-perl-1.0.2/lib/Apache/Gallery.pm libapache-gallery-perl-1.0.2/lib/Apache/Gallery.pm
--- libapache-gallery-perl-1.0.2/lib/Apache/Gallery.pm
+++ libapache-gallery-perl-1.0.2/lib/Apache/Gallery.pm
@@ -120,11 +120,7 @@
 	
 	# Let Apache serve icons without us modifying the request
 	if ($r->uri =~ m/^\/icons/i) {
-	    if ($r->uri =~ m/^\/icons\/gallery\/([^\/]+$)/i) {
-		$filename = "/usr/share/libapache-gallery-perl/icons/$filename";
-		$r->filename($filename);
-	    }
-	    return $::MP2 ? Apache2::Const::DECLINED() : Apache::Constants::DECLINED();
+		return $::MP2 ? Apache2::Const::DECLINED() : Apache::Constants::DECLINED();
 	}
 	# Lookup the file in the cache and scale the image if the cached
 	# image does not exist

-- 
Don Armstrong                      http://www.donarmstrong.com

I will not make any deals with you. I've resigned. I will not be
pushed, filed, stamped, indexed, briefed, debriefed or numbered. My
life is my own. I resign.
 -- Patrick McGoohan as Number 6 in "The Prisoner"


Reply to: