[DRE-commits] [SCM] camping.git branch, master, updated. debian/2.1.498-4-8-g771c63f

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 936aac7b248c8b9afedcf8d0b290eb599e83c2c3
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Thu Jun 6 21:18:25 2013 +0200

    Dropped patch allow-POST-through-Rack-File.patch; applied upstream

diff --git a/debian/changelog b/debian/changelog
index c025183..5d21d58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 camping (2.1.532-1) UNRELEASED; urgency=low
 
   * New upstream release 
+  * d/p/allow-POST-through-Rack-File.patch: dropped, applied upstream 
 
  -- Paul van Tilburg <paulvt at debian.org>  Thu, 06 Jun 2013 21:16:59 +0200
 
diff --git a/debian/patches/allow-POST-through-Rack-File.patch b/debian/patches/allow-POST-through-Rack-File.patch
deleted file mode 100644
index e8886e1..0000000
--- a/debian/patches/allow-POST-through-Rack-File.patch
+++ /dev/null
@@ -1,25 +0,0 @@
->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
index be7705a..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-allow-POST-through-Rack-File.patch

-- 
camping.git