[macruby-changes] [4124] ControlTower/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed May 19 00:14:43 PDT 2010
Revision: 4124
http://trac.macosforge.org/projects/ruby/changeset/4124
Author: joshua.ballanco at apple.com
Date: 2010-05-19 00:14:38 -0700 (Wed, 19 May 2010)
Log Message:
-----------
Small fixes
Modified Paths:
--------------
ControlTower/trunk/Rakefile
ControlTower/trunk/bin/control_tower
ControlTower/trunk/lib/control_tower/rack_socket.rb
ControlTower/trunk/lib/control_tower.rb
Modified: ControlTower/trunk/Rakefile
===================================================================
--- ControlTower/trunk/Rakefile 2010-05-18 20:51:17 UTC (rev 4123)
+++ ControlTower/trunk/Rakefile 2010-05-19 07:14:38 UTC (rev 4124)
@@ -24,7 +24,7 @@
lib/control_tower/vendor
lib/control_tower/vendor/rack
lib/control_tower/vendor/rack.rb
- ) + Dir.glob('lib/control_tower/vendor/rack/*')
+ ) + Dir.glob('lib/control_tower/vendor/rack/**/*')
spec.executable = 'control_tower'
end
Modified: ControlTower/trunk/bin/control_tower
===================================================================
--- ControlTower/trunk/bin/control_tower 2010-05-18 20:51:17 UTC (rev 4123)
+++ ControlTower/trunk/bin/control_tower 2010-05-19 07:14:38 UTC (rev 4124)
@@ -44,7 +44,7 @@
ENV['RACK_ENV'] = 'development'
rackup_config = File.read(File.expand_path(@options[:rackup]))
-app = eval("Rack::Builder.new {( #{rackup_config}\n )}.to_app", TOPLEVEL_BINDING)
+app = eval("Rack::Builder.new { #{rackup_config} }.to_app")
# Let's get to business!
server = ControlTower::Server.new(app, @options)
Modified: ControlTower/trunk/lib/control_tower/rack_socket.rb
===================================================================
--- ControlTower/trunk/lib/control_tower/rack_socket.rb 2010-05-18 20:51:17 UTC (rev 4123)
+++ ControlTower/trunk/lib/control_tower/rack_socket.rb 2010-05-19 07:14:38 UTC (rev 4124)
@@ -33,6 +33,7 @@
# TODO -- Concurrency doesn't quite work yet...
#@request_group.dispatch(@request_queue) do
req_data = parse!(connection, prepare_environment)
+ req_data['REMOTE_ADDR'] = connection.addr[3]
data = @server.handle_request(req_data)
data.each do |chunk|
connection.write chunk
@@ -59,7 +60,7 @@
def prepare_environment
{ 'rack.errors' => $stderr,
- 'rack.input' => '',
+ 'rack.input' => ''.force_encoding('ASCII-8BIT'),
'rack.multiprocess' => false, # No multiprocess, yet...probably never
'rack.run_once' => false,
RACK_VERSION => VERSION }
@@ -75,8 +76,7 @@
select([connection], nil, nil, 1)
if headers_done
begin
- data = connection.readpartial(READ_SIZE)
- env['rack.input'] << data
+ env['rack.input'] << connection.readpartial(READ_SIZE)
rescue EOFError
break
end
Modified: ControlTower/trunk/lib/control_tower.rb
===================================================================
--- ControlTower/trunk/lib/control_tower.rb 2010-05-18 20:51:17 UTC (rev 4123)
+++ ControlTower/trunk/lib/control_tower.rb 2010-05-19 07:14:38 UTC (rev 4124)
@@ -7,5 +7,3 @@
require 'rack'
require File.join(File.dirname(__FILE__), 'control_tower', 'rack_socket')
require File.join(File.dirname(__FILE__), 'control_tower', 'server')
-
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100519/d2543ec9/attachment.html>
More information about the macruby-changes
mailing list