| 1 |
commit f52228f87ef443276a76719bd281c03403c17b3d
|
| 2 |
Author: macournoyer <macournoyer@gmail.com>
|
| 3 |
Date: Sat Sep 5 22:56:48 2009 -0400
|
| 4 |
|
| 5 |
Fix syntax error in rails adapter, oye! Bump version number to 1.2.4
|
| 6 |
|
| 7 |
diff --git a/CHANGELOG b/CHANGELOG
|
| 8 |
index 2689e4c..ae76373 100644
|
| 9 |
--- a/CHANGELOG
|
| 10 |
+++ b/CHANGELOG
|
| 11 |
@@ -1,4 +1,4 @@
|
| 12 |
-== 1.2.3
|
| 13 |
+== 1.2.4 Flaming Astroboy
|
| 14 |
* Fix a few issues in thin to make it a better "gem citizen" [josh]
|
| 15 |
* Fix test for rack based Rails in adapter under Ruby >= 1.8.7 [#109 state:resolved]
|
| 16 |
* Fix Remote address spoofing vulnerability in Connection#remote_address [Alexey Borzenkov]
|
| 17 |
diff --git a/lib/rack/adapter/rails.rb b/lib/rack/adapter/rails.rb
|
| 18 |
index abfd9c6..8e5fd81 100644
|
| 19 |
--- a/lib/rack/adapter/rails.rb
|
| 20 |
+++ b/lib/rack/adapter/rails.rb
|
| 21 |
@@ -33,8 +33,8 @@ module Rack
|
| 22 |
|
| 23 |
def rack_based?
|
| 24 |
ActionController.const_defined?(:Dispatcher) &&
|
| 25 |
- (ActionController::Dispatcher.instance_methods.include?(:call)
|
| 26 |
- || ActionController::Dispatcher.instance_methods.include?("call"))
|
| 27 |
+ (ActionController::Dispatcher.instance_methods.include?(:call) ||
|
| 28 |
+ ActionController::Dispatcher.instance_methods.include?("call"))
|
| 29 |
end
|
| 30 |
|
| 31 |
def load_application
|
| 32 |
diff --git a/lib/thin/version.rb b/lib/thin/version.rb
|
| 33 |
index 319269f..3992fa3 100644
|
| 34 |
--- a/lib/thin/version.rb
|
| 35 |
+++ b/lib/thin/version.rb
|
| 36 |
@@ -6,7 +6,7 @@ module Thin
|
| 37 |
module VERSION #:nodoc:
|
| 38 |
MAJOR = 1
|
| 39 |
MINOR = 2
|
| 40 |
- TINY = 3
|
| 41 |
+ TINY = 4
|
| 42 |
|
| 43 |
STRING = [MAJOR, MINOR, TINY].join('.')
|
| 44 |
|