rhebok 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f2f6e28f41bf7d49e71ade28a3c1ff5628d219f
-  data.tar.gz: b593fa179c4f0e53271f883d82e68ee6fe6e40d7
+  metadata.gz: a836851c9ccb94d821b8987477c7d40fdb1f15b0
+  data.tar.gz: 74aaeb694d767ccf0636110e75eaaf43dbf91d07
 SHA512:
-  metadata.gz: e1c9b47ec3cf7e8b9e1566e0d62f04a0d80bea52d4b5b8a357e0b29253c339199825ff1fa7e4fc8daa1501a47b441034363d4a8e09504bc91d00124e4d21eb8b
-  data.tar.gz: 288903b31717eb0887605c0dc36e4743d45e3be4f876b20a8c3985cc88141f29913b16f8607576b7a52e89e43e95a597b2d267b832cb9e07ebf8341218ce0b00
+  metadata.gz: 4cc4fcfc51987e96d998e3e5314c00b8b59c9661169f814e2ed31e7b10f91d4b8b03c45ad04a91946dd919ba2f4a06c0ced3b806a13bd2dbe3338412ab0d4d7e
+  data.tar.gz: e80fb4df159602fe5988983d26661b712ed694388a91b5b6d6c3932abf519ed33800c95a8e1e0c2f5d027ccd0904b5d36bd59d2a383341790fb6811bfe954a11

data/Changes

@@ -1,3 +1,8 @@
+0.0.5 2014-12-19T11:06:28Z
+
+    - support MaxRequestPerChild=0. worker never exit.
+    - refactor around res header
+
 0.0.4 2014-12-19-T01:50:11Z
 
     - support multiple line header

data/README.md

@@ -62,11 +62,11 @@ command line of running Rhebok
 
 ### Host
 
-hostname or ip address to bind
+hostname or ip address to bind (default: 0.0.0.0)
 
 ### Port
 
-port to bind
+port to bind (default: 9292)
 
 ### MaxWorkers
 
@@ -75,7 +75,7 @@ number of worker processes (default: 10)
 ### MaxRequestPerChild
 
 max. number of requests to be handled before a worker process exits (default: 1000)
-This option looks like Apache's MaxRequestPerChild
+If set to `0`. worker never exists. This option looks like Apache's MaxRequestPerChild
 
 ### MinRequestPerChild
 

data/ext/rhebok/rhebok.c

@@ -630,9 +630,31 @@ VALUE rhe_write_all(VALUE self, VALUE fileno, VALUE buf, VALUE offsetv, VALUE ti
 }
 
 static
-int my_hash_keys(VALUE key, VALUE val, VALUE ary) {
-  char * d = RSTRING_PTR(key);
-  rb_ary_push(ary, key);
+int header_to_array(VALUE key_obj, VALUE val_obj, VALUE ary) {
+  ssize_t val_len;
+  ssize_t val_offset;
+  long val_lf;
+  char * val;
+
+  val = RSTRING_PTR(val_obj);
+  val_len = RSTRING_LEN(val_obj);
+  val_offset = 0;
+  val_lf = find_lf(val, val_offset, val_len);
+  if ( val_lf < val_len ) {
+    /* contain "\n" */
+    while ( val_offset < val_len ) {
+      if ( val_offset != val_lf ) {
+        rb_ary_push(ary, key_obj);
+        rb_ary_push(ary, rb_str_new(&val[val_offset],val_lf - val_offset));
+      }
+      val_offset = val_lf + 1;
+      val_lf = find_lf(val, val_offset, val_len);
+    }
+  }
+  else {
+    rb_ary_push(ary, key_obj);
+    rb_ary_push(ary, val_obj);
+  }
   return ST_CONTINUE;
 }
 
@@ -647,7 +669,6 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   ssize_t hlen = 0;
   ssize_t blen = 0;
 
-  ssize_t len;
   ssize_t rv = 0;
   ssize_t iovcnt;
   ssize_t vec_offset;
@@ -657,27 +678,23 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   char status_line[512];
   char date_line[512];
   int date_pushed = 0;
-  VALUE arr;
+  VALUE harr;
   VALUE key_obj;
   VALUE val_obj;
   char * key;
-  char * val;
-  ssize_t val_len;
-  ssize_t val_offset;
-  long val_lf;
+  ssize_t key_len;
   const char * message;
 
-
   int fileno = NUM2INT(filenov);
   double timeout = NUM2DBL(timeoutv);
   int status_code = NUM2INT(status_codev);
 
-  arr = rb_ary_new();
-  RB_GC_GUARD(arr);
-  rb_hash_foreach(headers, my_hash_keys, arr);
-  hlen = RARRAY_LEN(arr);
+  harr = rb_ary_new();
+  RB_GC_GUARD(harr);
+  rb_hash_foreach(headers, header_to_array, harr);
+  hlen = RARRAY_LEN(harr);
   blen = RARRAY_LEN(body);
-  iovcnt = 128 + (hlen * 4) + blen;
+  iovcnt = 10 + (hlen * 2) + blen;
 
   {
     struct iovec v[iovcnt]; // Needs C99 compiler
@@ -709,62 +726,35 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
 
     date_pushed = 0;
     for ( i = 0; i < hlen; i++ ) {
-      key_obj = rb_ary_entry(arr, i);
+      key_obj = rb_ary_entry(harr, i);
       key = RSTRING_PTR(key_obj);
-      len = RSTRING_LEN(key_obj);
-      if ( strncasecmp(key,"Connection",len) == 0 ) {
+      key_len = RSTRING_LEN(key_obj);
+      if ( strncasecmp(key,"Connection",key_len) == 0 ) {
+        i++;
         continue;
       }
-      if ( strncasecmp(key,"Server",len) == 0 ) {
+      if ( strncasecmp(key,"Server",key_len) == 0 ) {
         v[1].iov_len -= (sizeof("Server: Rhebok\r\n") - 1);
       }
-      if ( strncasecmp(key,"Date",len) == 0 ) {
+      if ( strncasecmp(key,"Date",key_len) == 0 ) {
         date_pushed = 1;
       }
-      /* value */
-      val_obj = rb_hash_aref(headers, key_obj);
-      val = RSTRING_PTR(val_obj);
-      val_len = RSTRING_LEN(val_obj);
-      val_offset = 0;
-      val_lf = find_lf(val, val_offset, val_len);
-      if ( val_lf < val_len ) {
-        /* contain "\n" */
-        while ( val_offset < val_len ) {
-          // printf("'%s' val_len:%zd, val_offset:%zd, val_lf:%zd\n", &val[val_offset], val_len, val_offset, val_lf);
-          if ( val_offset != val_lf ) {
-            v[iovcnt].iov_base = key;
-            v[iovcnt].iov_len = len;
-            iovcnt++;
-            v[iovcnt].iov_base = ": ";
-            v[iovcnt].iov_len = sizeof(": ") - 1;
-            iovcnt++;
-            v[iovcnt].iov_base = &val[val_offset];
-            v[iovcnt].iov_len = val_lf - val_offset;
-            iovcnt++;
-            v[iovcnt].iov_base = "\r\n";
-            v[iovcnt].iov_len = sizeof("\r\n") - 1;
-            iovcnt++;
-          }
-          val_offset = val_lf + 1;
-          val_lf = find_lf(val, val_offset, val_len);
-        }
-      }
-      else {
-          v[iovcnt].iov_base = key;
-          v[iovcnt].iov_len = len;
-          iovcnt++;
-          v[iovcnt].iov_base = ": ";
-          v[iovcnt].iov_len = sizeof(": ") - 1;
-          iovcnt++;
-          v[iovcnt].iov_base = val;
-          v[iovcnt].iov_len = val_len;
-          iovcnt++;
-          v[iovcnt].iov_base = "\r\n";
-          v[iovcnt].iov_len = sizeof("\r\n") - 1;
-          iovcnt++;
-      }
-
+      v[iovcnt].iov_base = key;
+      v[iovcnt].iov_len = key_len;
+      iovcnt++;
+      v[iovcnt].iov_base = ": ";
+      v[iovcnt].iov_len = sizeof(": ") - 1;
+      iovcnt++;
 
+      /* value */
+      i++;
+      val_obj = rb_ary_entry(harr, i);
+      v[iovcnt].iov_base = RSTRING_PTR(val_obj);
+      v[iovcnt].iov_len = RSTRING_LEN(val_obj);
+      iovcnt++;
+      v[iovcnt].iov_base = "\r\n";
+      v[iovcnt].iov_len = sizeof("\r\n") - 1;
+      iovcnt++;
     }
 
     if ( date_pushed == 0 ) {

data/lib/rack/handler/rhebok.rb

@@ -105,9 +105,10 @@ module Rack
       def _calc_reqs_per_child
         max = @options[:MaxRequestPerChild].to_i
         if min = @options[:MinRequestPerChild] then
+          return max.to_i if min.to_i >= max
           return (max - (max - min.to_i + 1) * rand).to_i
         end
-        return max.to_i
+        return max
       end
 
       def accept_loop(app)
@@ -139,7 +140,7 @@ module Rack
           "rack.input"        => NULLIO
         }
 
-        while proc_req_count < max_reqs
+        while @options[:MaxRequestPerChild].to_i == 0 || proc_req_count < max_reqs
           @can_exit = true
           env = env_template.clone
           connection, buf = ::Rhebok.accept_rack(fileno, @options[:Timeout], @_is_tcp, env)

data/lib/rhebok/version.rb

@@ -1,3 +1,3 @@
 class Rhebok
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/spec_02_server.rb

@@ -49,6 +49,17 @@ describe Rhebok do
     header["X-Fuga"].should.equal "Fuga"
   end
 
+  should "date header" do
+    GET("/date")
+    header["Date"].should.equal "Foooo"
+  end
+
+  should "ignore connection header" do
+    GET("/connection")
+    header["Connection"].should.equal "close"
+    header["Content-Type"].should.equal "text/yaml"
+    header["Date"].should.match(/20/)
+  end
 
   should "have CGI headers on GET" do
     GET("/")

data/test/testrequest.rb

@@ -6,14 +6,23 @@ class TestRequest
   NOSERIALIZE = [Method, Proc, Rack::Lint::InputWrapper]
 
   def call(env)
+
+    test_header = {};
     status = env["QUERY_STRING"] =~ /secret/ ? 403 : 200
+    if env["PATH_INFO"] =~ /date/ then
+      test_header["Date"] = "Foooo"
+    end
+    if env["PATH_INFO"] =~ /connection/ then
+      test_header["Connection"] = "keepalive"
+    end
     env["test.postdata"] = env["rack.input"].read
     minienv = env.dup
     # This may in the future want to replace with a dummy value instead.
     minienv.delete_if { |k,v| NOSERIALIZE.any? { |c| v.kind_of?(c) } }
     body = minienv.to_yaml
     size = body.respond_to?(:bytesize) ? body.bytesize : body.size
-    [status, {"Content-Type" => "text/yaml", "Content-Length" => size.to_s, "X-Foo" => "Foo\nBar", "X-Bar"=>"Foo\n\nBar", "X-Baz"=>"\nBaz", "X-Fuga"=>"Fuga\n"}, [body]]
+    res_header = {"Content-Type" => "text/yaml", "Content-Length" => size.to_s, "X-Foo" => "Foo\nBar", "X-Bar"=>"Foo\n\nBar", "X-Baz"=>"\nBaz", "X-Fuga"=>"Fuga\n"}
+    [status, res_header.merge(test_header), [body]]
   end
 
   module Helpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler