bossan 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa6c20fc1586a9072c8edd0ca46364486fa86976
-  data.tar.gz: e36462b54639d280f13210aa607d2f3c7e4ea31a
+  metadata.gz: 943923d13677bcb0574eae13e2bfe1145af1fd0a
+  data.tar.gz: b16bc4e09fb61dca0f8f84a4f011f744e1a15ed6
 SHA512:
-  metadata.gz: 179adc2a4ffd737a67b19763691bdb4b8be9188552b47163390d2aeb6943b394fa920dbaabb834cbe4c14c13fcc8003244073ae6aacaf9a6e94739bcec4baf36
-  data.tar.gz: 62e47f8c8f4e3cd5f51ea5bf260dc7ea6e1842ce075d96e075a9e0912988bdd9a33bc324e495ecc8be7738030e25350839301f1d701ca2d368b150a933445e23
+  metadata.gz: dfc563ed9e3ba7221fb7099b2ccfdc5cc2e20588b34fbf967a31f7cf2d89423851c60033679a699d2290f1350f9d890caa353ab4bd09bb0bae589c2684d57ca6
+  data.tar.gz: 0164c6c0bee4469c55077a81a1e6457c913fec1c4cb31b1ebba099530b329670f58305482489607de785cdf99011ea86c29deaf24a058c95e2c076709bd0ea44

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+### v0.4.2
+
+(Bug release. release 2013-07-25)
+
+* using tmpfile for very large message body(over 512K)
+
+* fix infinte accept loop while high load
+
 ### v0.4.1
 
 (Bug release. release 2013-07-20)

data/examples/blog/app.rb

@@ -16,7 +16,7 @@ ActiveRecord::Base.establish_connection(
 )
 
 get '/' do
-  @entries = Entries.find(:all).map do |row|
+  @entries = Entries.all.map do |row|
     {:title => row.title,
       :text => row.text }
   end

data/ext/bossan/bossan_ext.c

@@ -23,7 +23,7 @@
 #define CRLF "\r\n"
 #define DELIM ": "
 
-#define SERVER "bossan/0.4.1"
+#define SERVER "bossan/0.4.2"
 
 #define H_MSG_500 "HTTP/1.0 500 Internal Server Error\r\nContent-Type: text/html\r\nServer:  " SERVER "\r\n\r\n"
 
@@ -88,7 +88,7 @@ static VALUE rack_input;
 static VALUE http_connection;
 
 static VALUE content_type;
-static VALUE content_length;
+static VALUE content_length_key;
 
 static VALUE h_content_type;
 static VALUE h_content_length;
@@ -158,6 +158,7 @@ static int keep_alive_timeout = 5;
 static int max_fd = 1024 * 4;  // picoev max_fd size
 static int backlog = 1024;  // backlog size
 int max_content_length = 1024 * 1024 * 16; //max_content_length
+int client_body_buffer_size = 1024 * 500;  //client_body_buffer_size
 
 static VALUE StringIO;
 
@@ -254,7 +255,7 @@ write_log(const char *new_path, int fd, const char *data, size_t len)
 static int
 write_access_log(client_t *cli, int log_fd, const char *log_path)
 {
-  request *req = (cli);
+  request *req = cli->current_req;
 
   char buf[1024*4];
   if(log_fd > 0){
@@ -624,10 +625,8 @@ write_headers(client_t *client, char *data, size_t datalen)
   //write header
   for(i=0; i < hlen; i++){
     object1 = rb_ary_entry(arr, i);
-    /* Check_Type(object1, T_STRING); */
 
     object2 = rb_hash_aref(client->headers, object1);
-    /* Check_Type(object2, T_STRING); */
       
     name = StringValuePtr(object1);
     namelen = RSTRING_LEN(object1);
@@ -834,16 +833,17 @@ static response_status
 start_response_write(client_t *client)
 {
   VALUE item;
-  char *buf;
-  ssize_t buflen;
+  char *buf = NULL;
+  ssize_t buflen = NULL;
     
-  item = rb_funcall(client->response_iter, i_next, 0);
-  /* Check_Type(item, T_STRING); */
+  item = rb_rescue(rb_body_iterator, client->response_iter, ret_qnil, NULL);
   DEBUG("client %p :fd %d", client, client->fd);
 
-  //write string only
-  buf = StringValuePtr(item);
-  buflen = RSTRING_LEN(item);
+  if (item != Qnil) {
+    //write string only
+    buf = StringValuePtr(item);
+    buflen = RSTRING_LEN(item);
+  }
 
   /* DEBUG("status_code %d body:%.*s", client->status_code, (int)buflen, buf); */
   return write_headers(client, buf, buflen);
@@ -889,6 +889,17 @@ key_upper(char *s, const char *key, size_t len)
 }
 
 
+static int
+write_body2file(request *req, const char *buffer, size_t buf_len)
+{
+  FILE *tmp = (FILE *)req->body;
+  fwrite(buffer, 1, buf_len, tmp);
+  req->body_readed += buf_len;
+  DEBUG("write_body2file %d bytes", (int)buf_len);
+  return req->body_readed;
+}
+
+
 static int
 write_body2mem(request *req, const char *buffer, size_t buf_len)
 {
@@ -902,7 +913,11 @@ write_body2mem(request *req, const char *buffer, size_t buf_len)
 static int
 write_body(request *req, const char *buffer, size_t buffer_len)
 {
-  return write_body2mem(req, buffer, buffer_len);
+  if (req->body_type == BODY_TYPE_TMPFILE) {
+    return write_body2file(req, buffer, buffer_len);
+  } else {
+    return write_body2mem(req, buffer, buffer_len);
+  }
 }
 
 
@@ -1009,11 +1024,11 @@ static int
 replace_env_key(VALUE dict, VALUE old_key, VALUE new_key)
 {
   int ret = 1;
-
   VALUE value = rb_hash_aref(dict, old_key);
-  if(value != Qnil) {
-    rb_hash_aset(dict, old_key, Qnil);
-    ret = rb_hash_aset(dict, new_key, value);
+
+  if (value != Qnil) {
+    rb_hash_delete(dict, old_key);
+    rb_hash_aset(dict, new_key, value);
   }
   return ret;
 }
@@ -1249,11 +1264,23 @@ body_cb(http_parser *p, const char *buf, size_t len)
       req->bad_request_code = 411;
       return -1;
     }
-    //default memory stream
-    DEBUG("client->body_length %d \n", req->body_length);
-    req->body = rb_funcall(StringIO, i_new, 1, rb_str_new2(""));
-    req->body_type = BODY_TYPE_BUFFER;
-    DEBUG("BODY_TYPE_BUFFER \n");
+    if(req->body_length > client_body_buffer_size){
+      //large size request
+      FILE *tmp = tmpfile();
+      if(tmp < 0){
+	req->bad_request_code = 500;
+	return -1;
+      }
+      req->body = tmp;
+      req->body_type = BODY_TYPE_TMPFILE;
+      DEBUG("BODY_TYPE_TMPFILE");
+    }else{
+      //default memory stream
+      DEBUG("client->body_length %d \n", req->body_length);
+      req->body = rb_funcall(StringIO, i_new, 1, rb_str_new2(""));
+      req->body_type = BODY_TYPE_BUFFER;
+      DEBUG("BODY_TYPE_BUFFER");
+    }
   }
   write_body(req, buf, len);
   return 0;
@@ -1314,7 +1341,7 @@ headers_complete_cb(http_parser *p)
   if(unlikely(ret == -1)){
     return -1;
   }
-  ret = replace_env_key(env, h_content_length, content_length);
+  ret = replace_env_key(env, h_content_length, content_length_key);
   if(unlikely(ret == -1)){
     return -1;
   }
@@ -1483,7 +1510,7 @@ setup_static_env(char *name, int port)
   http_connection = rb_obj_freeze(rb_str_new2("HTTP_CONNECTION"));
 
   content_type = rb_obj_freeze(rb_str_new2("CONTENT_TYPE"));
-  content_length = rb_obj_freeze(rb_str_new2("CONTENT_LENGTH"));
+  content_length_key = rb_obj_freeze(rb_str_new2("CONTENT_LENGTH"));
 
   h_content_type = rb_obj_freeze(rb_str_new2("HTTP_CONTENT_TYPE"));
   h_content_length = rb_obj_freeze(rb_str_new2("HTTP_CONTENT_LENGTH"));
@@ -1535,7 +1562,6 @@ setup_listen_sock(int fd)
   int on = 1, r = -1;
 #ifdef linux
   r = setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &on, sizeof(on));
-  assert(r == 0);
 #endif
   r = fcntl(fd, F_SETFL, O_NONBLOCK);
   assert(r == 0);
@@ -1823,6 +1849,7 @@ process_rack_app(client_t *cli)
   char buff[256];
   sprintf(buff, "HTTP/1.%d %d %s\r\n", cli->http_parser->http_minor, cli->status_code, reason_phrase);
   cli->http_status = rb_str_new(buff, strlen(buff));
+  rb_gc_register_address(&cli->http_status);
 
   //check response
   if(cli->response && cli->response == Qnil){
@@ -1955,13 +1982,24 @@ prepare_call_rack(client_t *client)
     return;
   }
 
-  if(req->body_type == BODY_TYPE_BUFFER) {
+  if (req->body_type == BODY_TYPE_TMPFILE) {
+    int fd;
+    VALUE io;
+    request *req = client->current_req;
+    FILE *tmp = (FILE *)req->body;
+
+    fflush(tmp);
+    rewind(tmp);
+
+    fd = fileno(tmp);
+    io = rb_io_fdopen(fd, O_RDWR, NULL);
+    rb_hash_aset(req->environ, rack_input, io);
+  } else if(req->body_type == BODY_TYPE_BUFFER) {
     rb_funcall((VALUE)req->body, i_seek, 1, INT2NUM(0));
     rb_hash_aset(req->environ, rack_input, (VALUE)req->body);
   } else {
     object = rb_str_new2("");
     input = rb_funcall(StringIO, i_new, 1, object);
-    rb_gc_register_address(&input);
     rb_hash_aset(req->environ, rack_input, input);
     req->body = input;
   }
@@ -2136,8 +2174,9 @@ accept_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
     // next turn or other process
     return;
   }else if ((events & PICOEV_READ) != 0) {
+    int i;
     socklen_t client_len = sizeof(client_addr);
-    for(;;) {
+    for(i=0; i<8; ++i) {
 #ifdef linux
       client_fd = accept4(fd, (struct sockaddr *)&client_addr, &client_len, SOCK_NONBLOCK | SOCK_CLOEXEC);
 #else
@@ -2546,7 +2585,7 @@ Init_bossan_ext(void)
   rb_gc_register_address(&h_content_type);
   rb_gc_register_address(&h_content_length);
   rb_gc_register_address(&content_type);
-  rb_gc_register_address(&content_length);
+  rb_gc_register_address(&content_length_key);
 
   rb_gc_register_address(&http_10);
   rb_gc_register_address(&http_11);

data/ext/bossan/picoev.h

@@ -217,7 +217,9 @@ extern "C" {
   int picoev_add(picoev_loop* loop, int fd, int events, int timeout_in_secs,
 		 picoev_handler* callback, void* cb_arg) {
     picoev_fd* target;
-    assert(PICOEV_IS_INITED_AND_FD_IN_RANGE(fd));
+    if (unlikely(!PICOEV_IS_INITED_AND_FD_IN_RANGE(fd))) {
+      return -1;
+    }
     target = picoev.fds + fd;
     assert(target->loop_id == 0);
     target->callback = callback;

data/lib/bossan/version.rb

@@ -1,3 +1,3 @@
 module Bossan
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/test/test_rack_env_big_message_body.rb

@@ -0,0 +1,45 @@
+require 'test/unit'
+require "uri"
+require 'net/http'
+require_relative '../lib/bossan'
+
+
+class RackEnvBigMessageBodyTest < Test::Unit::TestCase
+
+  RESPONSE = ["Hello ", "world!"].freeze
+  DEFAULT_HOST = "localhost"
+  DEFAULT_PORT = 8000
+
+  def test_query_app
+    pid = fork do
+      trap(:INT) { Bossan.stop }
+      Bossan.listen(DEFAULT_HOST, DEFAULT_PORT)
+      Bossan.run(proc {|env|
+                   @env = env.dup
+                   assert_equal(IO, @env["rack.input"].class)
+                   body = RESPONSE
+                   [200,
+                    {
+                      'Content-type'=> 'text/plain',
+                      'Content-length'=> RESPONSE.join.size.to_s
+                    },
+                    body
+                   ]
+                 })
+    end
+    Process.detach pid
+    sleep 2
+
+    uri = URI.parse("http://0.0.0.0:8000/")
+    Net::HTTP.start(uri.host, uri.port){|http|
+      header = {
+        "user-agent" => "Ruby/#{RUBY_VERSION} MyHttpClient"
+      }
+      body = "A" * 1024 * 513 # 513K
+      response = http.post(uri.path, body, header)
+    }
+  ensure
+    Process.kill(:INT, pid)
+  end
+
+end

data/test/{test_rack_long_url.rb → test_rack_err_spec.rb}

@@ -4,44 +4,32 @@ require 'test/unit/testcase'
 require 'net/http'
 
 
-ASSERT_RESPONSE = "Hello world!"
-RESPONSE = ["Hello ", "world!"].freeze
 DEFAULT_HOST = "localhost"
 DEFAULT_PORT = 8000
+ASSERT_RESPONSE = "Hello world!"
+RESPONSE = ["Hello ", "world!"].freeze
 
 
-class App
+class ErrApp
   def call env
     body = RESPONSE
-    [200,
+    [500,
      {
-       'Content-type'=> 'text/plain',
-       'Content-length'=> RESPONSE.join.size.to_s
-       },
-     body
+       'Content-type'=> 'text/html',
+     },
+     RESPONSE
     ]
   end
 end
 
 
-class LongUrlTest < Test::Unit::TestCase
-
-  def test_long_url1
+class RackErrSpecTest < Test::Unit::TestCase
+  def test_error
     response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
-      query = "A" * 4095
-      http.get("/#{query}")
+      http.get("/")
     }
-
-    assert_equal("200", response.code)
-  end
-
-  def test_long_url2
-    response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
-      query = "A" * 4096
-      http.get("/#{query}")
-    }
-
-    assert_equal("400", response.code)
+    assert_equal("500", response.code)
+    assert_equal(ASSERT_RESPONSE, response.body)
   end
 end
 
@@ -60,15 +48,17 @@ def server_is_wake_up? n=100
 end
 
 
+
 begin
   $stderr.puts RUBY_DESCRIPTION
-
   pid = fork do
     trap(:INT) { Bossan.stop }
     Bossan.listen(DEFAULT_HOST, DEFAULT_PORT)
-    Bossan.run(App.new)
+    Bossan.run(ErrApp.new)
   end
+
   Process.detach pid
+
   unless server_is_wake_up?
     $stderr.puts "bossan won't wake up until you love it ..."
     exit 1

data/test/{test_rack_bad_http_method.rb → test_rack_evil.rb}

@@ -37,25 +37,27 @@ class App
   end
 end
 
-class BadHttpMethodTest < Test::Unit::TestCase
 
-  def send_data method
-    begin
-      sock = TCPSocket.new DEFAULT_HOST, DEFAULT_PORT
-      sock.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
-      sock.send("#{method} #{DEFAULT_PATH} #{DEFAULT_VERSION}\r\n", 0)
-      sock.send("Host: #{DEFAULT_HOST}\r\n", 0)
-      DEFAULT_HEADER.each_pair {|k, v|
-        sock.send("#{k}: #{v}\r\n", 0)
-      }
-      sock.send("\r\n", 0)
-
-      data = sock.recv(1024 * 2)
-      return data
-    rescue
-      raise
-    end
+def send_data method
+  begin
+    sock = TCPSocket.new DEFAULT_HOST, DEFAULT_PORT
+    sock.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
+    sock.send("#{method} #{DEFAULT_PATH} #{DEFAULT_VERSION}\r\n", 0)
+    sock.send("Host: #{DEFAULT_HOST}\r\n", 0)
+    DEFAULT_HEADER.each_pair {|k, v|
+      sock.send("#{k}: #{v}\r\n", 0)
+    }
+    sock.send("\r\n", 0)
+
+    data = sock.recv(1024 * 2)
+    return data
+  rescue
+    raise
   end
+end
+
+
+class BadHttpMethodTest < Test::Unit::TestCase
 
   def test_bad_method1
     response = send_data("")
@@ -71,6 +73,23 @@ class BadHttpMethodTest < Test::Unit::TestCase
     response = send_data("..")
     assert_equal(ERR_400, response.split("\r\n").first)
   end
+
+  def test_long_url1
+    response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
+      query = "A" * 4095
+      http.get("/#{query}")
+    }
+    assert_equal("200", response.code)
+  end
+
+  def test_long_url2
+    response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
+      query = "A" * 4096
+      http.get("/#{query}")
+    }
+    assert_equal("400", response.code)
+  end
+
 end
 
 

data/test/test_rack_spec.rb

@@ -13,6 +13,7 @@ RESPONSE = ["Hello ", "world!"].freeze
 
 class App
   def call env
+    # p env
     body = RESPONSE
     [200,
      {
@@ -24,21 +25,20 @@ class App
   end
 end
 
+
 class RackSpecTest < Test::Unit::TestCase
 
-  def test_simple_get
+  def test_get
     response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
       http.get("/")
     }
-
     assert_equal("200", response.code)
     assert_equal(ASSERT_RESPONSE, response.body)
   end
 
-  def test_simple_post
+  def test_post
     response = Net::HTTP.post_form(URI.parse("http://#{DEFAULT_HOST}:#{DEFAULT_PORT}/"),
                                    {'key1'=> 'value1', 'key2'=> 'value2'})
-
     assert_equal("200", response.code)
     assert_equal(ASSERT_RESPONSE, response.body)
   end
@@ -61,7 +61,6 @@ end
 
 begin
   $stderr.puts RUBY_DESCRIPTION
-
   pid = fork do
     trap(:INT) { Bossan.stop }
     Bossan.listen(DEFAULT_HOST, DEFAULT_PORT)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bossan
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Hiroki Noda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -39,7 +39,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- TODO
 - bossan.gemspec
 - examples/blog/README.md
 - examples/blog/app.rb
@@ -72,11 +71,12 @@ files:
 - lib/bossan.rb
 - lib/bossan/version.rb
 - lib/rack/handler/bossan.rb
-- test/test_rack_bad_http_method.rb
 - test/test_rack_chunk_response.rb
+- test/test_rack_env_big_message_body.rb
 - test/test_rack_env_simple_get.rb
 - test/test_rack_env_simple_query.rb
-- test/test_rack_long_url.rb
+- test/test_rack_err_spec.rb
+- test/test_rack_evil.rb
 - test/test_rack_spec.rb
 homepage: https://github.com/kubo39/bossan
 licenses:

data/TODO

@@ -1,4 +0,0 @@
-* set rack.input File-type object, if over 512K
-  - avoid too much use memory
-
-* or else...