rhebok 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e57b88c70418eccd0131a3798c093e5f121783df
-  data.tar.gz: d483fa40f2b94af141e1a7674bb9ee01d3c0b326
+  metadata.gz: 9f2f6e28f41bf7d49e71ade28a3c1ff5628d219f
+  data.tar.gz: b593fa179c4f0e53271f883d82e68ee6fe6e40d7
 SHA512:
-  metadata.gz: 56a9bedb5bdfa63745fc1bcd46ef349173a144c911cfbb2b08570d81051ebe6bdad4c2f39a1ad98892428b6093ebb27b9d0b7e6e83c22856b6939ff3a77d30ee
-  data.tar.gz: 80dbef163aa4804173847972c5c2dbdb5097775a24e3127cebee33efdd460326e0a6d84d1e574d6170214dbafea110c3cb5280e1945ecb8dc4e6d187ea90ea61
+  metadata.gz: e1c9b47ec3cf7e8b9e1566e0d62f04a0d80bea52d4b5b8a357e0b29253c339199825ff1fa7e4fc8daa1501a47b441034363d4a8e09504bc91d00124e4d21eb8b
+  data.tar.gz: 288903b31717eb0887605c0dc36e4743d45e3be4f876b20a8c3985cc88141f29913b16f8607576b7a52e89e43e95a597b2d267b832cb9e07ebf8341218ce0b00

data/Changes

@@ -1,3 +1,7 @@
+0.0.4 2014-12-19-T01:50:11Z
+
+    - support multiple line header
+
 0.0.3 2014-12-18T17:22:53Z
 
     - fixed segfault. iovec shortage

data/ext/rhebok/rhebok.c

@@ -122,6 +122,12 @@ static VALUE remote_addr_key;
 static VALUE remote_port_key;
 static VALUE path_info_key;
 
+static VALUE vacant_string_val;
+static VALUE zero_string_val;
+
+static VALUE http10_val;
+static VALUE http11_val;
+
 struct common_header {
   const char * name;
   size_t name_len;
@@ -167,6 +173,17 @@ void set_common_header(const char * key, int key_len, const int raw)
   common_headers_num++;
 }
 
+static
+long find_lf(const char* v, ssize_t offset, ssize_t len)
+{
+  ssize_t i;
+  for ( i=offset; i != len; ++i) {
+    if (v[i] == 10) {
+      return i;
+    }
+  }
+  return len;
+}
 
 static
 size_t find_ch(const char* s, size_t len, char ch)
@@ -207,7 +224,7 @@ int store_path_info(VALUE env, const char* src, size_t src_len) {
   size_t dlen = 0, i = 0;
   char *d;
   char s2, s3;
-  d = (char*)malloc(src_len * 3 + 1);
+  d = ALLOC_N(char, src_len * 3 + 1);
   for (i = 0; i < src_len; i++ ) {
     if ( src[i] == '%' ) {
       if ( !isxdigit(src[i+1]) || !isxdigit(src[i+2]) ) {
@@ -231,7 +248,7 @@ int store_path_info(VALUE env, const char* src, size_t src_len) {
   }
   d[dlen]='0';
   rb_hash_aset(env, path_info_key, rb_str_new(d, dlen));
-  free(d);
+  xfree(d);
   return dlen;
 }
 
@@ -418,10 +435,8 @@ int _parse_http_request(char *buf, ssize_t buf_len, VALUE env) {
 
   rb_hash_aset(env, request_method_key, rb_str_new(method,method_len));
   rb_hash_aset(env, request_uri_key, rb_str_new(path, path_len));
-  rb_hash_aset(env, script_name_key, rb_str_new2(""));
-  strcpy(tmp, "HTTP/1.");
-  tmp[7] = 48 + ((minor_version > 1 || minor_version < 0 ) ? 0 : minor_version);
-  rb_hash_aset(env, server_protocol_key, rb_str_new(tmp, sizeof("HTTP/1.0") - 1));
+  rb_hash_aset(env, script_name_key, vacant_string_val);
+  rb_hash_aset(env, server_protocol_key, (minor_version > 1 || minor_version < 0 ) ? http10_val : http11_val);
 
   /* PATH_INFO QUERY_STRING */
   path_len = find_ch(path, path_len, '#'); /* strip off all text after # after storing request_uri */
@@ -515,8 +530,8 @@ VALUE rhe_accept(VALUE self, VALUE fileno, VALUE timeoutv, VALUE tcp, VALUE env)
     rb_hash_aset(env, remote_port_key, rb_String(rb_int_new(ntohs(cliaddr.sin_port))));
   }
   else {
-    rb_hash_aset(env, remote_addr_key, rb_str_new("",0));
-    rb_hash_aset(env, remote_port_key, rb_String(rb_int_new(0)));
+    rb_hash_aset(env, remote_addr_key, vacant_string_val);
+    rb_hash_aset(env, remote_port_key, zero_string_val);
   }
 
   buf_len = rv;
@@ -556,15 +571,23 @@ VALUE rhe_accept(VALUE self, VALUE fileno, VALUE timeoutv, VALUE tcp, VALUE env)
 }
 
 static
-VALUE rhe_read_timeout(VALUE self, VALUE fileno, VALUE rbuf, VALUE len, VALUE offset, VALUE timeout) {
+VALUE rhe_read_timeout(VALUE self, VALUE filenov, VALUE rbuf, VALUE lenv, VALUE offsetv, VALUE timeoutv) {
   char * d;
   ssize_t rv;
-  d = malloc(len);
-  rv = _read_timeout(NUM2INT(fileno), NUM2DBL(timeout), &d[NUM2LONG(offset)], NUM2LONG(len));
+  int fileno;
+  double timeout;
+  ssize_t offset;
+  ssize_t len;
+  fileno = NUM2INT(filenov);
+  timeout = NUM2DBL(timeoutv);
+  offset = NUM2LONG(offsetv);
+  len = NUM2LONG(lenv);
+  d = ALLOC_N(char, len);
+  rv = _read_timeout(fileno, timeout, &d[offset], len);
   if ( rv > 0 ) {
     rb_str_cat(rbuf, d, rv);
   }
-  free(d);
+  xfree(d);
   return rb_int_new(rv);
 }
 
@@ -638,6 +661,10 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   VALUE key_obj;
   VALUE val_obj;
   char * key;
+  char * val;
+  ssize_t val_len;
+  ssize_t val_offset;
+  long val_lf;
   const char * message;
 
 
@@ -650,7 +677,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   rb_hash_foreach(headers, my_hash_keys, arr);
   hlen = RARRAY_LEN(arr);
   blen = RARRAY_LEN(body);
-  iovcnt = 10 + (hlen * 4) + blen;
+  iovcnt = 128 + (hlen * 4) + blen;
 
   {
     struct iovec v[iovcnt]; // Needs C99 compiler
@@ -694,20 +721,50 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
       if ( strncasecmp(key,"Date",len) == 0 ) {
         date_pushed = 1;
       }
-      v[iovcnt].iov_base = key;
-      v[iovcnt].iov_len = len;
-      iovcnt++;
-      v[iovcnt].iov_base = ": ";
-      v[iovcnt].iov_len = sizeof(": ") - 1;
-      iovcnt++;
       /* value */
       val_obj = rb_hash_aref(headers, key_obj);
-      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++;
+      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++;
+      }
+
+
     }
 
     if ( date_pushed == 0 ) {
@@ -771,12 +828,21 @@ void Init_rhebok()
   rb_gc_register_address(&server_protocol_key);
   query_string_key = rb_obj_freeze(rb_str_new2("QUERY_STRING"));
   rb_gc_register_address(&query_string_key);
-
   remote_addr_key = rb_obj_freeze(rb_str_new2("REMOTE_ADDR"));
   rb_gc_register_address(&remote_addr_key);
   remote_port_key = rb_obj_freeze(rb_str_new2("REMOTE_PORT"));
   rb_gc_register_address(&remote_port_key);
 
+  vacant_string_val = rb_obj_freeze(rb_str_new("",0));
+  rb_gc_register_address(&vacant_string_val);
+  zero_string_val = rb_obj_freeze(rb_str_new("0",1));
+  rb_gc_register_address(&zero_string_val);
+
+  http10_val = rb_obj_freeze(rb_str_new2("HTTP/1.0"));
+  rb_gc_register_address(&http10_val);
+  http11_val = rb_obj_freeze(rb_str_new2("HTTP/1.1"));
+  rb_gc_register_address(&http11_val);
+
   set_common_header("ACCEPT",sizeof("ACCEPT") - 1, 0);
   set_common_header("ACCEPT-ENCODING",sizeof("ACCEPT-ENCODING") - 1, 0);
   set_common_header("ACCEPT-LANGUAGE",sizeof("ACCEPT-LANGUAGE") - 1, 0);

data/lib/rhebok/version.rb

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

data/rhebok.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Rhebok::VERSION
   spec.authors       = ["Masahiro Nagano"]
   spec.email         = ["kazeburo@gmail.com"]
-  spec.summary       = %q{High Perfomance Preforked Rack Handler}
-  spec.description   = %q{High Perfomance and Optimized Preforked Rack Handler}
+  spec.summary       = %q{High Performance Preforked Rack Handler}
+  spec.description   = %q{High Performance and Optimized Preforked Rack Handler}
   spec.homepage      = "https://github.com/kazeburo/rhebok"
   spec.license       = "Artistic"
   spec.extensions    = %w[ext/rhebok/extconf.rb]

data/test/spec_02_server.rb

@@ -40,6 +40,16 @@ describe Rhebok do
     response["rack.run_once"].should.equal false
   end
 
+  should "multiple header" do
+    GET("/")
+    header["Content-Type"].should.equal "text/yaml"
+    header["X-Foo"].should.equal "Foo, Bar"
+    header["X-Bar"].should.equal "Foo, Bar"
+    header["X-Baz"].should.equal "Baz"
+    header["X-Fuga"].should.equal "Fuga"
+  end
+
+
   should "have CGI headers on GET" do
     GET("/")
     response["REQUEST_METHOD"].should.equal "GET"

data/test/testrequest.rb

@@ -13,11 +13,11 @@ class TestRequest
     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}, [body]]
+    [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]]
   end
 
   module Helpers
-    attr_reader :status, :response
+    attr_reader :status, :response, :header
 
     ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
     ENV["RUBYOPT"] = "-I#{ROOT}/lib -rubygems"
@@ -39,6 +39,7 @@ class TestRequest
         get.basic_auth user, passwd  if user && passwd
         http.request(get) { |response|
           @status = response.code.to_i
+          @header = response
           begin
             @response = YAML.load(response.body)
           rescue TypeError, ArgumentError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Masahiro Nagano
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
-description: High Perfomance and Optimized Preforked Rack Handler
+description: High Performance and Optimized Preforked Rack Handler
 email:
 - kazeburo@gmail.com
 executables: []
@@ -137,7 +137,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: High Perfomance Preforked Rack Handler
+summary: High Performance Preforked Rack Handler
 test_files:
 - test/spec_02_basic.rb
 - test/spec_02_server.rb