Fix regression when --only option is used w/ --socket.

CHANGELOG

@@ -1,4 +1,5 @@
 == ? release
+ * Fix regression when --only option is used w/ --socket.
  * Add process name 'tag' functionality. Easier to distinguish thin daemons 
    from eachother in process listing [ctcherry]
 

lib/thin/controllers/cluster.rb

@@ -102,9 +102,9 @@ def run(cmd, number)
 
         def with_each_server
           if only
-            if only < 80
+            if first_port && only < 80
               # interpret +only+ as a sequence number
-              yield(first_port + only)
+              yield first_port + only
             else
               # interpret +only+ as an absolute port number
               yield only

spec/controllers/cluster_spec.rb

@@ -135,6 +135,29 @@ def options_for_port(port)
     end
 end
 
+describe Cluster, "controlling only one server with UNIX socket" do
+  before do
+    @cluster = Cluster.new(:chdir => '/rails_app',
+                           :socket => '/tmp/thin.sock',
+                           :address => '0.0.0.0',
+                           :port => 3000,
+                           :servers => 3,
+                           :timeout => 10,
+                           :log => 'thin.log',
+                           :pid => 'thin.pid',
+                           :only => 1
+                          )
+  end
+
+  it 'should call only specified server' do
+    calls = []
+    @cluster.send(:with_each_server) do |n|
+      calls << n
+    end
+    calls.should == [1]
+  end
+end
+
 describe Cluster, "controlling only one server, by sequence number" do
   before do
     @cluster = Cluster.new(:chdir => '/rails_app',