@@ -81,7 +81,7 @@ end if $0 == __FILE__ require DIR + '/../lib/ebb' Ebb::start_server(SimpleApp.new, - :port => 4001, + :port => 4001 # :ssl_cert => "/home/ryan/projects/ebb/benchmark/ca-cert.pem", # :ssl_key => "/home/ryan/projects/ebb/benchmark/ca-key.pem" ) benchmark/application.rb @@ -103,6 +103,7 @@ module Ebb end def on_open + @being_written = nil @requests = [] @@responses[self] = [] end @@ -158,7 +159,6 @@ module Ebb @head = "HTTP/1.1 #{status} #{HTTP_STATUS_CODES[status.to_i]}\r\n" headers.each { |field, value| @head << "#{field}: #{value}\r\n" } @head << "\r\n" - @output << @head # XXX i would prefer to do # @chunked = true unless body.respond_to?(:length) @@ -170,7 +170,6 @@ module Ebb body.each do |chunk| write(chunk) - @connection.write end body.on_error { close } if body.respond_to?(:on_error) @@ -191,15 +190,18 @@ module Ebb def finish @finished = true - if @chunked - write("") - @connection.write - end + write("") if @chunked end def write(chunk) encoded = @chunked ? "#{chunk.length.to_s(16)}\r\n#{chunk}\r\n" : chunk - @output << encoded + if @head.nil? + @output << encoded + else + @output << @head + encoded + @head = nil + end + @connection.write end HTTP_STATUS_CODES = { lib/ebb.rb ce063c507279157fe641a473ea02910bed3d07cd Ryan ry@tinyclouds.org http://github.com/ry/ebb/commit/61f4cc1356f7fde248a6b966d31be25bf8a97a22 61f4cc1356f7fde248a6b966d31be25bf8a97a22 2008-08-19T01:55:38-07:00 2008-08-19T01:55:38-07:00 make sure the first chunk is written with the header f414af373b60608c771aa864cd4572f06a156de1 Ryan ry@tinyclouds.org