Vendor Rack in order to work around broken applications that depend o…

…n rack == 0.4.0.
phusion · Jan 30, 2009 · ea7fb0a · ea7fb0a
1 parent f050a46
commit ea7fb0a
Show file tree

Hide file tree

Showing 211 changed files with 32,716 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -25,3 +25,5 @@
 - Configurable temp dir.
 - Better error messages, more error checking, and other small things
   which makes your live easier.
+- Rack is now vendored in order to work around broken applications that
+  depend on rack == 0.4.0.
diff --git a/Rakefile b/Rakefile
@@ -474,7 +474,6 @@ spec = Gem::Specification.new do |s|
 	s.require_path = ["lib", "ext"]
 	s.add_dependency 'rake', '>= 0.8.1'
 	s.add_dependency 'fastthread', '>= 1.0.1'
-	s.add_dependency 'rack', '>= 0.1.0'
 	s.extensions << 'ext/passenger/extconf.rb'
 	s.files = FileList[
 		'Rakefile',
@@ -511,6 +510,7 @@ spec = Gem::Specification.new do |s|
 		'ext/passenger/*.{c,rb}',
 		'benchmark/*.{cpp,rb}',
 		'misc/*',
+		'vendor/**/*',
 		'test/*.{rb,cpp,example}',
 		'test/support/*',
 		'test/oxt/*.cpp',

diff --git a/bin/passenger-install-apache2-module b/bin/passenger-install-apache2-module
@@ -49,8 +49,7 @@ class Installer
 		Dependencies::Apache2_DevHeaders,
 		Dependencies::APR_DevHeaders,
 		Dependencies::APU_DevHeaders,
-		Dependencies::FastThread,
-		Dependencies::Rack
+		Dependencies::FastThread
 	]
 
 	def start(automatic = false)

diff --git a/lib/passenger/rack/application_spawner.rb b/lib/passenger/rack/application_spawner.rb
@@ -14,13 +14,16 @@
 #  with this program; if not, write to the Free Software Foundation, Inc.,
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../../../vendor/rack-0.9.1/lib"))
 require 'rack'
+
 require 'socket'
 require 'passenger/application'
 require 'passenger/message_channel'
 require 'passenger/abstract_request_handler'
 require 'passenger/utils'
 require 'passenger/rack/request_handler'
+
 module Passenger
 module Rack
 

diff --git a/vendor/README b/vendor/README
@@ -0,0 +1,12 @@
+You might be wondering why the Rack library is vendored, and why we don't
+just depend on the Rack gem. The reason for this is because there are broken
+applications out there that have a hard dependency on rack == 0.4.0 (the
+latest version of Rack is 0.9.1 at the time of writing). If Passenger
+depends on the Rack gem, then the application will crash with a gem version
+conflict error upon executing 'gem "rack", "=0.4.0"'.
+
+To fix this conflict, we vendor Rack. When we load our vendored Rack library,
+it won't be registered as a gem, so no RubyGems version conflict exception
+will be raised.
+
+Rack is backwards-compatible so there shouldn't be any problems.
diff --git a/vendor/README_FOR_PACKAGERS b/vendor/README_FOR_PACKAGERS
@@ -0,0 +1 @@
+Rack is vendored for a reason, don't try to remove it. See README.
diff --git a/vendor/rack-0.9.1/AUTHORS b/vendor/rack-0.9.1/AUTHORS
@@ -0,0 +1,8 @@
+* Christian Neukirchen <chneukirchen@gmail.com>
+* HTTP authentication: Tim Fletcher <twoggle@gmail.com>
+* Cookie sessions, Static handler: Luc Heinrich <luc@honk-honk.com>
+* Pool sessions, OpenID authentication: blink <blinketje@gmail.com>
+* Rack::Deflater: Christoffer Sawicki <christoffer.sawicki@gmail.com>
+* LiteSpeed handler: Adrian Madrid
+* SCGI handler: Jeremy Evans
+* Official Logo: Armin Ronacher
diff --git a/vendor/rack-0.9.1/COPYING b/vendor/rack-0.9.1/COPYING
@@ -0,0 +1,18 @@
+Copyright (c) 2007 Christian Neukirchen <purl.org/net/chneukirchen>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.