From b9c9672659d5b6b6df1bd98cf1b0b4e2871620cc Mon Sep 17 00:00:00 2001
From: Blake Mizerany <blakemizerany@blake-mizeranys-computer.local>
Date: Thu, 29 Nov 2007 00:35:04 -0800
Subject: [PATCH] FIX:  maintain default_options through resets

---
 lib/sinatra.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/sinatra.rb b/lib/sinatra.rb
index e9172c6..edce6a4 100644
--- a/lib/sinatra.rb
+++ b/lib/sinatra.rb
@@ -204,15 +204,15 @@ module Sinatra
     attr_reader :events, :layouts, :default_options
     
     def self.default_options
-      @@default_options = {
+      @@default_options ||= {
         :run => true,
         :port => 4567,
-        :environment => :development
+        :env => :development
       }
     end
     
     def default_options
-      @@default_options
+      self.class.default_options
     end
     
     def initialize
-- 
2.11.4.GIT