fix 1.8 backwards compat

2 files changed, 17 insertions, 1 deletions

diff --git a/HISTORY.md b/HISTORY.md
index 2635c605..f7795c5b 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,7 @@
+Wed Jun 24 12:13:37 2015  Aaron Patterson <tenderlove@ruby-lang.org>
+
+        * Fix Ruby 1.8 backwards compatibility
+
 Fri Jun 19 07:14:50 2015  Matthew Draper <matthew@trebex.net>
 
         * Work around a Rails incompatibility in our private API
diff --git a/lib/rack/handler.rb b/lib/rack/handler.rb
index 8a5fadd5..03cac1b2 100644
--- a/lib/rack/handler.rb
+++ b/lib/rack/handler.rb
@@ -19,13 +19,25 @@ module Rack
       if klass = @handlers[server]
         klass.split("::").inject(Object) { |o, x| o.const_get(x) }
       else
-        const_get(server, false)
+        _const_get(server, false)
       end
 
     rescue NameError => name_error
       raise load_error || name_error
     end
 
+    begin
+      ::Object.const_get("Object", false)
+      def self._const_get(str, inherit = true)
+        const_get(str, inherit)
+      end
+    rescue
+      def self._const_get(str, inherit = true)
+        const_get(str)
+      end
+    end
+
+
     # Select first available Rack handler given an `Array` of server names.
     # Raises `LoadError` if no handler was found.
     #