[DRE-commits] [SCM] camping.git branch, master, updated. debian/2.1.498-3-3-gbcd8575

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit ea8bcfff0a06dc90dbe1a8f993a78fa3be3ca812
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Thu Oct 25 19:43:07 2012 +0200

    Add patch camping-allow-POST-through-Rack-File (closes: #689038)

diff --git a/debian/changelog b/debian/changelog
index 9209096..4c35cfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+camping (2.1.498-4) UNRELEASED; urgency=low
+
+  * debian/patches: add camping-allow-POST-through-Rack-File,
+    courtesy of Magnus Holm (closes: #689038) 
+
+ -- Paul van Tilburg <paulvt at debian.org>  Thu, 25 Oct 2012 19:39:49 +0200
+
 camping (2.1.498-3) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/patches/allow-POST-through-Rack-File.patch b/debian/patches/allow-POST-through-Rack-File.patch
new file mode 100644
index 0000000..e8886e1
--- /dev/null
+++ b/debian/patches/allow-POST-through-Rack-File.patch
@@ -0,0 +1,25 @@
+>From fe791e787f5665efdc3f17b0f6122260b3a6d770 Mon Sep 17 00:00:00 2001
+From: Magnus Holm <judofyr at gmail.com>
+Date: Fri, 10 Feb 2012 17:31:12 +0100
+Subject: [PATCH] Server: Also catch 405 from Rack::File
+
+---
+ lib/camping/server.rb |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/camping/server.rb b/lib/camping/server.rb
+index 47bffa7..af2bfc8 100644
+--- a/lib/camping/server.rb
++++ b/lib/camping/server.rb
+@@ -149,7 +149,7 @@ module Camping
+     end
+     
+     def app
+-      Rack::Cascade.new([Rack::File.new(public_dir), self], [404, 403])
++      Rack::Cascade.new([Rack::File.new(public_dir), self], [405, 404, 403])
+     end
+     
+     def current_app
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..be7705a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+allow-POST-through-Rack-File.patch

-- 
camping.git