diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-12-26 10:58:20 -0600 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-12-26 11:04:58 -0600 |
commit | 2a8c937af7dc9c1e7dc5fb59e8ba70c6cd1b86e8 (patch) | |
tree | 7eb9465510974ff015df4931b244cd11fef850a6 | |
parent | d54092e3fda6039f90348fcc6c3a362eae01cf4c (diff) | |
download | rack-2a8c937af7dc9c1e7dc5fb59e8ba70c6cd1b86e8.tar.gz |
Bump version and release to 1.1
-rw-r--r-- | lib/rack.rb | 4 | ||||
-rw-r--r-- | lib/rack/handler/cgi.rb | 2 | ||||
-rw-r--r-- | lib/rack/handler/fastcgi.rb | 2 | ||||
-rw-r--r-- | lib/rack/handler/lsws.rb | 2 | ||||
-rw-r--r-- | lib/rack/handler/mongrel.rb | 2 | ||||
-rw-r--r-- | lib/rack/handler/scgi.rb | 8 | ||||
-rw-r--r-- | lib/rack/handler/webrick.rb | 2 | ||||
-rw-r--r-- | lib/rack/lint.rb | 2 | ||||
-rw-r--r-- | lib/rack/mock.rb | 2 | ||||
-rw-r--r-- | test/spec_rack_cgi.rb | 2 | ||||
-rw-r--r-- | test/spec_rack_fastcgi.rb | 2 | ||||
-rw-r--r-- | test/spec_rack_mongrel.rb | 2 | ||||
-rw-r--r-- | test/spec_rack_webrick.rb | 2 |
13 files changed, 17 insertions, 17 deletions
diff --git a/lib/rack.rb b/lib/rack.rb index 6bdb878f..ecc238ee 100644 --- a/lib/rack.rb +++ b/lib/rack.rb @@ -11,7 +11,7 @@ module Rack # The Rack protocol version number implemented. - VERSION = [1,0] + VERSION = [1,1] # Return the Rack protocol version as a dotted string. def self.version @@ -20,7 +20,7 @@ module Rack # Return the Rack release as a dotted string. def self.release - "1.0" + "1.1" end autoload :Builder, "rack/builder" diff --git a/lib/rack/handler/cgi.rb b/lib/rack/handler/cgi.rb index f45f3d73..c6903f15 100644 --- a/lib/rack/handler/cgi.rb +++ b/lib/rack/handler/cgi.rb @@ -15,7 +15,7 @@ module Rack env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/" - env.update({"rack.version" => [1,0], + env.update({"rack.version" => [1,1], "rack.input" => $stdin, "rack.errors" => $stderr, diff --git a/lib/rack/handler/fastcgi.rb b/lib/rack/handler/fastcgi.rb index d8301474..b992a5f4 100644 --- a/lib/rack/handler/fastcgi.rb +++ b/lib/rack/handler/fastcgi.rb @@ -36,7 +36,7 @@ module Rack rack_input = RewindableInput.new(request.in) - env.update({"rack.version" => [1,0], + env.update({"rack.version" => [1,1], "rack.input" => rack_input, "rack.errors" => request.err, diff --git a/lib/rack/handler/lsws.rb b/lib/rack/handler/lsws.rb index e261003d..eabc0bc9 100644 --- a/lib/rack/handler/lsws.rb +++ b/lib/rack/handler/lsws.rb @@ -20,7 +20,7 @@ module Rack rack_input = RewindableInput.new($stdin.read.to_s) env.update( - "rack.version" => [1,0], + "rack.version" => [1,1], "rack.input" => rack_input, "rack.errors" => $stderr, "rack.multithread" => false, diff --git a/lib/rack/handler/mongrel.rb b/lib/rack/handler/mongrel.rb index 21f9f134..b6b775ea 100644 --- a/lib/rack/handler/mongrel.rb +++ b/lib/rack/handler/mongrel.rb @@ -52,7 +52,7 @@ module Rack rack_input = request.body || StringIO.new('') rack_input.set_encoding(Encoding::BINARY) if rack_input.respond_to?(:set_encoding) - env.update({"rack.version" => [1,0], + env.update({"rack.version" => [1,1], "rack.input" => rack_input, "rack.errors" => $stderr, diff --git a/lib/rack/handler/scgi.rb b/lib/rack/handler/scgi.rb index bd860a5d..79a6b2bd 100644 --- a/lib/rack/handler/scgi.rb +++ b/lib/rack/handler/scgi.rb @@ -7,14 +7,14 @@ module Rack module Handler class SCGI < ::SCGI::Processor attr_accessor :app - + def self.run(app, options=nil) new(options.merge(:app=>app, :host=>options[:Host], :port=>options[:Port], :socket=>options[:Socket])).listen end - + def initialize(settings = {}) @app = Rack::Chunked.new(Rack::ContentLength.new(settings[:app])) @log = Object.new @@ -22,7 +22,7 @@ module Rack def @log.error(*args); end super(settings) end - + def process_request(request, input_body, socket) env = {}.replace(request) env.delete "HTTP_CONTENT_TYPE" @@ -36,7 +36,7 @@ module Rack rack_input = StringIO.new(input_body) rack_input.set_encoding(Encoding::BINARY) if rack_input.respond_to?(:set_encoding) - env.update({"rack.version" => [1,0], + env.update({"rack.version" => [1,1], "rack.input" => rack_input, "rack.errors" => $stderr, "rack.multithread" => true, diff --git a/lib/rack/handler/webrick.rb b/lib/rack/handler/webrick.rb index 43286113..8d7f5724 100644 --- a/lib/rack/handler/webrick.rb +++ b/lib/rack/handler/webrick.rb @@ -26,7 +26,7 @@ module Rack rack_input = StringIO.new(req.body.to_s) rack_input.set_encoding(Encoding::BINARY) if rack_input.respond_to?(:set_encoding) - env.update({"rack.version" => [1,0], + env.update({"rack.version" => [1,1], "rack.input" => rack_input, "rack.errors" => $stderr, diff --git a/lib/rack/lint.rb b/lib/rack/lint.rb index 493982ac..534375b9 100644 --- a/lib/rack/lint.rb +++ b/lib/rack/lint.rb @@ -111,7 +111,7 @@ module Rack ## In addition to this, the Rack environment must include these ## Rack-specific variables: - ## <tt>rack.version</tt>:: The Array [1,0], representing this version of Rack. + ## <tt>rack.version</tt>:: The Array [1,1], representing this version of Rack. ## <tt>rack.url_scheme</tt>:: +http+ or +https+, depending on the request URL. ## <tt>rack.input</tt>:: See below, the input stream. ## <tt>rack.errors</tt>:: See below, the error stream. diff --git a/lib/rack/mock.rb b/lib/rack/mock.rb index 7964c447..23ecba17 100644 --- a/lib/rack/mock.rb +++ b/lib/rack/mock.rb @@ -40,7 +40,7 @@ module Rack end DEFAULT_ENV = { - "rack.version" => [1,0], + "rack.version" => [1,1], "rack.input" => StringIO.new, "rack.errors" => StringIO.new, "rack.multithread" => true, diff --git a/test/spec_rack_cgi.rb b/test/spec_rack_cgi.rb index 97456320..59500cd7 100644 --- a/test/spec_rack_cgi.rb +++ b/test/spec_rack_cgi.rb @@ -36,7 +36,7 @@ context "Rack::Handler::CGI" do specify "should have rack headers" do GET("/test") - response["rack.version"].should.equal [1,0] + response["rack.version"].should.equal [1,1] response["rack.multithread"].should.be false response["rack.multiprocess"].should.be true response["rack.run_once"].should.be true diff --git a/test/spec_rack_fastcgi.rb b/test/spec_rack_fastcgi.rb index 98963c0e..1ae55ace 100644 --- a/test/spec_rack_fastcgi.rb +++ b/test/spec_rack_fastcgi.rb @@ -36,7 +36,7 @@ context "Rack::Handler::FastCGI" do specify "should have rack headers" do GET("/test.fcgi") - response["rack.version"].should.equal [1,0] + response["rack.version"].should.equal [1,1] response["rack.multithread"].should.be false response["rack.multiprocess"].should.be true response["rack.run_once"].should.be false diff --git a/test/spec_rack_mongrel.rb b/test/spec_rack_mongrel.rb index 6a69af75..4b386891 100644 --- a/test/spec_rack_mongrel.rb +++ b/test/spec_rack_mongrel.rb @@ -41,7 +41,7 @@ context "Rack::Handler::Mongrel" do specify "should have rack headers" do GET("/test") - response["rack.version"].should.equal [1,0] + response["rack.version"].should.equal [1,1] response["rack.multithread"].should.be true response["rack.multiprocess"].should.be false response["rack.run_once"].should.be false diff --git a/test/spec_rack_webrick.rb b/test/spec_rack_webrick.rb index 8951687a..599425c4 100644 --- a/test/spec_rack_webrick.rb +++ b/test/spec_rack_webrick.rb @@ -39,7 +39,7 @@ context "Rack::Handler::WEBrick" do specify "should have rack headers" do GET("/test") - response["rack.version"].should.equal [1,0] + response["rack.version"].should.equal [1,1] response["rack.multithread"].should.be true response["rack.multiprocess"].should.be false response["rack.run_once"].should.be false |