[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-5-g7f1f228

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit b98d667b4bffa5fb23114d2c7f211b91bdcbe02b
Author: Jérémy Lal <kapouer at melix.org>
Date:   Mon May 14 14:39:39 2012 +0200

    Delete 2016_fix_openid_login_7857_and_8473.patch

diff --git a/debian/patches/2016_fix_openid_login_7857_and_8473.patch b/debian/patches/2016_fix_openid_login_7857_and_8473.patch
deleted file mode 100644
index 2670de1..0000000
--- a/debian/patches/2016_fix_openid_login_7857_and_8473.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- /dev/null
-+++ b/config/initializers/mongrel.rb
-@@ -0,0 +1,82 @@
-+if ['2.3.8', '2.3.9', '2.3.10', '2.3.11'].include?(Rails.version) && Gem.available?('mongrel', '~>1.1.5') && self.class.const_defined?(:Mongrel)
-+  
-+  # Pulled right from latest rack. Old looked like this in 1.1.0 version.
-+  # 
-+  # def [](k)
-+  #   super(@names[k] ||= @names[k.downcase])
-+  # end
-+  # 
-+  module Rack
-+    module Utils
-+      class HeaderHash < Hash
-+        def [](k)
-+          super(@names[k]) if @names[k]
-+          super(@names[k.downcase])
-+        end
-+      end
-+    end
-+  end
-+  
-+  # Code pulled from the ticket above.
-+  # 
-+  class Mongrel::CGIWrapper
-+    def header_with_rails_fix(options = 'text/html')
-+      @head['cookie'] = options.delete('cookie').flatten.map { |v| v.sub(/^\n/,'') } if options.class != String and options['cookie']
-+      header_without_rails_fix(options)
-+    end
-+    alias_method_chain :header, :rails_fix
-+  end
-+  
-+  # Pulled right from 2.3.8 ActionPack. Simple diff was
-+  # 
-+  # if headers.include?('Set-Cookie')
-+  #   headers['cookie'] = headers.delete('Set-Cookie').split("\n")
-+  # end
-+  # 
-+  # to 
-+  # 
-+  # if headers['Set-Cookie']
-+  #   headers['cookie'] = headers.delete('Set-Cookie').split("\n")
-+  # end
-+  #       
-+  module ActionController
-+    class CGIHandler
-+      def self.dispatch_cgi(app, cgi, out = $stdout)
-+        env = cgi.__send__(:env_table)
-+        env.delete "HTTP_CONTENT_LENGTH"
-+        cgi.stdinput.extend ProperStream
-+        env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/"
-+        env.update({
-+          "rack.version" => [0,1],
-+          "rack.input" => cgi.stdinput,
-+          "rack.errors" => $stderr,
-+          "rack.multithread" => false,
-+          "rack.multiprocess" => true,
-+          "rack.run_once" => false,
-+          "rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
-+        })
-+        env["QUERY_STRING"] ||= ""
-+        env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
-+        env["REQUEST_PATH"] ||= "/"
-+        env.delete "PATH_INFO" if env["PATH_INFO"] == ""
-+        status, headers, body = app.call(env)
-+        begin
-+          out.binmode if out.respond_to?(:binmode)
-+          out.sync = false if out.respond_to?(:sync=)
-+          headers['Status'] = status.to_s
-+          if headers['Set-Cookie']
-+            headers['cookie'] = headers.delete('Set-Cookie').split("\n")
-+          end
-+          out.write(cgi.header(headers))
-+          body.each { |part|
-+            out.write part
-+            out.flush if out.respond_to?(:flush)
-+          }
-+        ensure
-+          body.close if body.respond_to?(:close)
-+        end
-+      end
-+    end
-+  end
-+  
-+end
---- /dev/null
-+++ b/config/initializers/patch_for_mongrel.rb
-@@ -0,0 +1,19 @@
-+# $Id: patch_for_mongrel.rb 168 2010-10-09 10:36:25Z imc $
-+# Fix for mongrel which still doesn't know about Rails 2.2's changes, 
-+# We provide a backwards compatible wrapper around the new
-+# ActionController::base.relative_url_root,
-+# so it can still be called off of the actually non-existing
-+# AbstractRequest class.
-+
-+module ActionController
-+  class AbstractRequest < ActionController::Request
-+    def self.relative_url_root=(path)
-+      ActionController::Base.relative_url_root=(path)
-+    end
-+    def self.relative_url_root
-+      ActionController::Base.relative_url_root
-+    end
-+  end
-+end
-+#
-+# Thanks to http://www.ruby-forum.com/topic/190287
---- /dev/null
-+++ b/config/initializers/rails_6440_patch.rb
-@@ -0,0 +1,9 @@
-+# file config/initializers/rails_6440_patch.rb
-+ActionController::Request.class_eval do
-+    def reset_session
-+      # session may be a hash, if so, we do not want to call destroy
-+      # fixes issue 6440
-+      session.destroy if session and session.respond_to?(:destroy)
-+      self.session = {}
-+    end
-+end
-\ No newline at end of file

-- 
redmine.git