File: 1.2.4.patch

package info (click to toggle)
thin 1.2.4-1.1
  • links: PTS, VCS
  • area: main
  • in suites: squeeze
  • size: 1,252 kB
  • ctags: 531
  • sloc: ruby: 4,529; ansic: 725; sh: 21; makefile: 16
file content (44 lines) | stat: -rw-r--r-- 1,561 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
commit f52228f87ef443276a76719bd281c03403c17b3d
Author: macournoyer <macournoyer@gmail.com>
Date:   Sat Sep 5 22:56:48 2009 -0400

    Fix syntax error in rails adapter, oye! Bump version number to 1.2.4

diff --git a/CHANGELOG b/CHANGELOG
index 2689e4c..ae76373 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-== 1.2.3
+== 1.2.4 Flaming Astroboy
  * Fix a few issues in thin to make it a better "gem citizen" [josh]
  * Fix test for rack based Rails in adapter under Ruby >= 1.8.7 [#109 state:resolved]
  * Fix Remote address spoofing vulnerability in Connection#remote_address [Alexey Borzenkov]
diff --git a/lib/rack/adapter/rails.rb b/lib/rack/adapter/rails.rb
index abfd9c6..8e5fd81 100644
--- a/lib/rack/adapter/rails.rb
+++ b/lib/rack/adapter/rails.rb
@@ -33,8 +33,8 @@ module Rack
       
       def rack_based?
         ActionController.const_defined?(:Dispatcher) &&
-          (ActionController::Dispatcher.instance_methods.include?(:call)
-           || ActionController::Dispatcher.instance_methods.include?("call"))
+          (ActionController::Dispatcher.instance_methods.include?(:call) ||
+           ActionController::Dispatcher.instance_methods.include?("call"))
       end
       
       def load_application
diff --git a/lib/thin/version.rb b/lib/thin/version.rb
index 319269f..3992fa3 100644
--- a/lib/thin/version.rb
+++ b/lib/thin/version.rb
@@ -6,7 +6,7 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 1
     MINOR    = 2
-    TINY     = 3
+    TINY     = 4
     
     STRING   = [MAJOR, MINOR, TINY].join('.')