rhebok 0.2.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a896132dd677343c070f45f44902d760feeb3b08
-  data.tar.gz: 7a5f20c3fc6fc30b13dbccbd820f675eae44a5f8
+  metadata.gz: 454acd81875129e8a6b70d0322faeded5a9b12ab
+  data.tar.gz: c2e879260c7505697b312f7ce07b4b91e137ccbb
 SHA512:
-  metadata.gz: 534a23046a8d9207c9746175d25ad7a81bd005e670129c5074262fed719574a8b9fe3cea30de9c4cfe445dcbc17b118d96d640d95ede960bbab98b8186c32170
-  data.tar.gz: 714f997e82ecede337cf86ff87018267e79b9dc4a1cef5af29ed6419abe45960ce279b73c6a92b65024a0c5934e60a3766ddca0f6f7ea240ecae58793df2ac14
+  metadata.gz: 0233481756e663f30ca815c7320e2bfc0bc88636a2577451dc8717c2e938c76fd68a71eec61c36da06e95d8f7ad985c8cb36fd566f6d92e6fc98191c0ff21066
+  data.tar.gz: a3297edf4bd16b7e331e7c068bb2bb0c1be641d145b9fca70c52b06a68599ce48488ea6d19b997eea69ece63aa46bb18be6ad1c5f625fd8b0a0bad4de993a78e

data/Changes

@@ -1,3 +1,7 @@
+0.8.0 2015-01-22T10:18:30Z
+
+    - support HTTP/1.1
+
 0.2.3 2015-01-08T11:21:01Z
 
     - check ENV["SERVER_STARTER_PORT"] has "="

data/README.md

@@ -9,7 +9,7 @@ Rhebok supports following features.
 - uses writev(2) for output responses
 - prefork and graceful shutdown using [prefork_engine](https://rubygems.org/gems/prefork_engine)
 - hot deploy using [start_server](https://metacpan.org/release/Server-Starter) ([here](https://github.com/lestrrat/go-server-starter) is golang version by lestrrat-san)
-- only supports HTTP/1.0. But does not support Keepalive.
+- supports HTTP/1.1. But does not have Keepalive
 - supports OobGC
 
 This server is suitable for running HTTP application servers behind a reverse proxy like nginx.

data/ext/rhebok/rhebok.c

@@ -18,6 +18,7 @@
 #define MAX_HEADER_NAME_LEN 1024
 #define MAX_HEADERS         128
 #define BAD_REQUEST "HTTP/1.0 400 Bad Request\r\nConnection: close\r\n\r\n400 Bad Request\r\n"
+#define READ_BUF 16384
 #define TOU(ch) (('a' <= ch && ch <= 'z') ? ch - ('a' - 'A') : ch)
 
 static const char *DoW[] = {
@@ -26,6 +27,8 @@ static const char *DoW[] = {
 static const char *MoY[] = {
   "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"
 };
+static const char xdigit[16] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};
+
 
 /* stolen from HTTP::Status and Feersum */
 /* Unmarked codes are from RFC 2616 */
@@ -377,6 +380,24 @@ void str_i(char * dst, int * dst_len, int src, int fig) {
   *dst_len += fig;
 }
 
+static
+int _chunked_header(char *buf, ssize_t len) {
+    int dlen = 0, i;
+    ssize_t l = len;
+    while ( l > 0 ) {
+        dlen++;
+        l /= 16;
+    }
+    i = dlen;
+    buf[i++] = 13;
+    buf[i++] = 10;
+    while ( len > 0 ) {
+        buf[--dlen] = xdigit[len % 16];
+        len /= 16;
+    }
+    return i;
+}
+
 static
 int _date_line(char * date_line) {
   struct tm gtm;
@@ -436,7 +457,7 @@ 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, vacant_string_val);
-  rb_hash_aset(env, server_protocol_key, (minor_version > 1 || minor_version < 0 ) ? http10_val : http11_val);
+  rb_hash_aset(env, server_protocol_key, (minor_version == 1) ? http11_val : http10_val);
 
   /* PATH_INFO QUERY_STRING */
   path_len = find_ch(path, path_len, '#'); /* strip off all text after # after storing request_uri */
@@ -582,6 +603,8 @@ VALUE rhe_read_timeout(VALUE self, VALUE filenov, VALUE rbuf, VALUE lenv, VALUE
   timeout = NUM2DBL(timeoutv);
   offset = NUM2LONG(offsetv);
   len = NUM2LONG(lenv);
+  if ( len > READ_BUF )
+    len = READ_BUF;
   d = ALLOC_N(char, len);
   rv = _read_timeout(fileno, timeout, &d[offset], len);
   if ( rv > 0 ) {
@@ -665,7 +688,7 @@ VALUE rhe_close(VALUE self, VALUE fileno) {
 }
 
 static
-VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status_codev, VALUE headers, VALUE body) {
+VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status_codev, VALUE headers, VALUE body, VALUE use_chunkedv) {
   ssize_t hlen = 0;
   ssize_t blen = 0;
 
@@ -687,12 +710,15 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   const char * message;
 
   const char * s;
-  char* d;
+  char * d;
   ssize_t n;
 
+  char * chunked_header_buf;
+  
   int fileno = NUM2INT(filenov);
   double timeout = NUM2DBL(timeoutv);
   int status_code = NUM2INT(status_codev);
+  int use_chunked = NUM2INT(use_chunkedv);
 
   harr = rb_ary_new();
   RB_GC_GUARD(harr);
@@ -700,6 +726,9 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   hlen = RARRAY_LEN(harr);
   blen = RARRAY_LEN(body);
   iovcnt = 10 + (hlen * 2) + blen;
+  if ( use_chunked )
+      iovcnt += blen*2;
+  chunked_header_buf = ALLOC_N(char, 32 * blen);
 
   {
     struct iovec v[iovcnt]; // Needs C99 compiler
@@ -713,7 +742,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
     status_line[i++] = '/';
     status_line[i++] = '1';
     status_line[i++] = '.';
-    status_line[i++] = '0';
+    status_line[i++] = '1';
     status_line[i++] = ' ';
     str_i(status_line,&i,status_code,3);
     status_line[i++] = ' ';
@@ -790,15 +819,38 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
       v[1].iov_base = date_line;
     }
 
+    if ( use_chunked ) {
+      v[iovcnt].iov_base = "Transfer-Encoding: chunked\r\n";
+      v[iovcnt].iov_len = sizeof("Transfer-Encoding: chunked\r\n") - 1;
+      iovcnt++;
+    }
+
     v[iovcnt].iov_base = "Connection: close\r\n\r\n";
     v[iovcnt].iov_len = sizeof("Connection: close\r\n\r\n") - 1;
     iovcnt++;
 
+    ssize_t chb_offset = 0;
     for ( i=0; i<blen; i++) {
       val_obj = rb_ary_entry(body, i);
+      if ( use_chunked ) {
+          v[iovcnt].iov_len = _chunked_header(&chunked_header_buf[chb_offset],RSTRING_LEN(val_obj));
+          v[iovcnt].iov_base = &chunked_header_buf[chb_offset];
+          chb_offset += v[iovcnt].iov_len;
+          iovcnt++;
+      }
       v[iovcnt].iov_base = RSTRING_PTR(val_obj);
       v[iovcnt].iov_len = RSTRING_LEN(val_obj);
       iovcnt++;
+      if ( use_chunked ) {
+          v[iovcnt].iov_base = "\r\n";
+          v[iovcnt].iov_len = sizeof("\r\n") -1;
+          iovcnt++;
+      }
+    }
+    if ( use_chunked ) {
+      v[iovcnt].iov_base = "0\r\n\r\n";
+      v[iovcnt].iov_len = sizeof("0\r\n\r\n") - 1;
+      iovcnt++;
     }
 
     vec_offset = 0;
@@ -824,7 +876,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
       }
     }
   }
-
+  xfree(chunked_header_buf);
   if ( rv < 0 ) {
     return Qnil;
   }
@@ -880,5 +932,5 @@ void Init_rhebok()
   rb_define_module_function(cRhebok, "write_timeout", rhe_write_timeout, 5);
   rb_define_module_function(cRhebok, "write_all", rhe_write_all, 4);
   rb_define_module_function(cRhebok, "close_rack", rhe_close, 1);
-  rb_define_module_function(cRhebok, "write_response", rhe_write_response, 5);
+  rb_define_module_function(cRhebok, "write_response", rhe_write_response, 6);
 }

data/lib/rack/handler/rhebok.rb

@@ -11,6 +11,7 @@ require 'io/nonblock'
 require 'prefork_engine'
 require 'rhebok'
 require 'rhebok/config'
+require 'rhebok/buffered'
 
 $RACK_HANDLER_RHEBOK_GCTOOL = true
 begin
@@ -238,16 +239,15 @@ module Rack
             begin
               proc_req_count += 1
               @can_exit = false
+              # expect
+              if env.key?("HTTP_EXPECT") && env.delete("HTTP_EXPECT") == "100-continue"
+                ::Rhebok.write_all(connection, "HTTP/1.1 100 Continue\015\012\015\012", 0, @options[:Timeout])
+              end
               # handle request
+              is_chunked = env.key?("HTTP_TRANSFER_ENCODING") && env.delete("HTTP_TRANSFER_ENCODING") == 'chunked'
               if env.key?("CONTENT_LENGTH") && env["CONTENT_LENGTH"].to_i > 0
                 cl = env["CONTENT_LENGTH"].to_i
-                if cl > MAX_MEMORY_BUFFER_SIZE
-                  buffer = Tempfile.open('r')
-                  buffer.binmode
-                  buffer.set_encoding('BINARY')
-                else
-                  buffer = StringIO.new("").set_encoding('BINARY')
-                end
+                buffer = ::Rhebok::Buffered.new(cl,MAX_MEMORY_BUFFER_SIZE)
                 while cl > 0
                   chunk = ""
                   if buf.bytesize > 0
@@ -259,30 +259,74 @@ module Rack
                       return
                     end
                   end
-                  buffer << chunk
+                  buffer.print(chunk)
                   cl -= chunk.bytesize
                 end
-                buffer.rewind
-                env["rack.input"] = buffer
+                env["rack.input"] = buffer.rewind
+              elsif is_chunked
+                buffer = ::Rhebok::Buffered.new(0,MAX_MEMORY_BUFFER_SIZE)
+                chunked_buffer = '';
+                complete = false
+                while !complete
+                  chunk = ""
+                  if buf.bytesize > 0
+                    chunk = buf
+                    buf = ""
+                  else
+                    readed = ::Rhebok.read_timeout(connection, chunk, 16384, 0, @options[:Timeout])
+                    if readed == nil
+                      return
+                    end
+                  end
+                  chunked_buffer << chunk
+                  while chunked_buffer.sub!(/^(([0-9a-fA-F]+).*\015\012)/,"") != nil
+                    trailer = $1
+                    chunked_len = $2.hex
+                    if chunked_len == 0
+                      complete = true
+                      break
+                    elsif chunked_buffer.bytesize < chunked_len + 2
+                      chunked_buffer = trailer + chunked_buffer
+                      break
+                    end
+                    buffer.print(chunked_buffer.byteslice(0,chunked_len))
+                    chunked_buffer = chunked_buffer.byteslice(chunked_len,chunked_buffer.bytesize-chunked_len)
+                    chunked_buffer.sub!(/^\015\012/,"")
+                  end
+                  break if complete
+                end
+                env["CONTENT_LENGTH"] = buffer.size.to_s
+                env["rack.input"] = buffer.rewind
               end
 
               status_code, headers, body = app.call(env)
+
+              use_chunked =  env["SERVER_PROTOCOL"] != "HTTP/1.1" ||
+                             headers.key?("Transfer-Encoding") ||
+                             headers.key?("Content-Length") ? false : true
+              
               if body.instance_of?(Array)
-                ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, body)
+                ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, body, use_chunked ? 1 : 0)
               else
-                ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, [])
+                ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, [], use_chunked ? 1 : 0)
                 body.each do |part|
-                  ret = ::Rhebok.write_all(connection, part, 0, @options[:Timeout])
+                  ret = nil
+                  if use_chunked
+                    ret = ::Rhebok.write_all(connection, part.bytesize.to_s(16) + "\015\012" + part + "\015\012", 0, @options[:Timeout])
+                  else
+                    ret = ::Rhebok.write_all(connection, part, 0, @options[:Timeout])
+                  end
                   if ret == nil
                     break
                   end
                 end #body.each
+                ::Rhebok.write_all(connection, "0\015\012\015\012", 0, @options[:Timeout]) if use_chunked
                 body.respond_to?(:close) and body.close
               end
               #p [env,status_code,headers,body]
             ensure
-              if buffer.instance_of?(Tempfile)
-                buffer.close!
+              if buffer != nil
+                buffer.close
               end
               ::Rhebok.close_rack(connection)
               # out of band gc

data/lib/rhebok/buffered.rb

@@ -0,0 +1,46 @@
+require 'stringio'
+require 'tempfile'
+
+class Rhebok
+  class Buffered
+    def initialize(length=0,memory_max=1048576)
+      @length = length
+      @memory_max = memory_max
+      @size = 0
+      if length > memory_max
+        @buffer = Tempfile.open('r')
+        @buffer.binmode
+        @buffer.set_encoding('BINARY')
+      else
+        @buffer = StringIO.new("").set_encoding('BINARY')
+      end
+    end
+
+    def print(buf)
+      if @size + buf.bytesize > @memory_max && @buffer.instance_of?(StringIO)
+        new_buffer = Tempfile.open('r')
+        new_buffer.binmode
+        new_buffer.set_encoding('BINARY')
+        new_buffer << @buffer.string
+        @buffer = new_buffer
+      end
+      @buffer << buf
+      @size += buf.bytesize
+    end
+
+    def size
+      @size
+    end
+
+    def rewind
+      @buffer.rewind
+      @buffer
+    end
+
+    def close
+      if @buffer.instance_of?(Tempfile)
+        @buffer.close!
+      end
+    end
+  end
+end

data/lib/rhebok/version.rb

@@ -1,3 +1,3 @@
 class Rhebok
-  VERSION = "0.2.3"
+  VERSION = "0.8.0"
 end

data/test/spec_06_curl.rb

@@ -0,0 +1,46 @@
+require 'rack'
+require File.expand_path('../testrequest', __FILE__)
+require 'timeout'
+require 'socket'
+require 'rack/handler/rhebok'
+
+describe Rhebok do
+  extend TestRequest::Helpers
+  begin
+
+    @host = '127.0.0.1'
+    @port = 9202
+    #@app = Rack::Lint.new(TestRequest.new) Lint requires Content-Length or Transfer-Eoncoding
+    @app = TestRequest.new
+    @pid = fork
+    if @pid == nil
+      #child
+      Rack::Handler::Rhebok.run(@app, :Host=>'127.0.0.1', :Port=>9202, :MaxWorkers=>1,
+                                :BeforeFork => proc { ENV["TEST_FOO"] = "FOO" },
+                                :AfterFork => proc { ENV["TEST_BAR"] = "BAR" },
+                                )
+      exit!(true)
+    end
+
+    command = 'curl  --stderr - -sv -X POST -T "'+File.expand_path('../testrequest.rb', __FILE__)+'" -H "Content-type: text/plain" --header "Transfer-Encoding: chunked" http://127.0.0.1:9202/remove_length'
+    curl_command(command)
+    should "with curl" do
+      @request["Transfer-Encoding"].should.equal "chunked"
+      @request["Expect"].should.equal "100-continue"
+      @response.key?("Transfer-Encoding").should.equal false
+      @response["CONTENT_LENGTH"].should.equal File.stat(File.expand_path('../testrequest.rb', __FILE__)).size.to_s
+      @response["test.postdata"].bytesize.should.equal File.stat(File.expand_path('../testrequest.rb', __FILE__)).size
+      @header["Transfer-Encoding"].should.equal "chunked"
+      @header["Connection"].should.equal "close"
+      @header.key?("HTTP/1.1 100 Continue").should.equal true
+    end
+
+  ensure
+    sleep 1
+    if @pid != nil
+      Process.kill(:TERM, @pid)
+      Process.wait()
+    end
+  end
+
+end

data/test/testrequest.rb

@@ -23,7 +23,10 @@ class TestRequest
     ENV.has_key?("TEST_BAR") and minienv["TEST_BAR"] = ENV["TEST_BAR"]
     body = minienv.to_yaml
     size = body.respond_to?(:bytesize) ? body.bytesize : body.size
-    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"}
+    res_header = {"Content-Length" => size.to_s, "Content-Type" => "text/yaml",  "X-Foo" => "Foo\nBar", "X-Bar"=>"Foo\n\nBar", "X-Baz"=>"\nBaz", "X-Fuga"=>"Fuga\n"}
+    if env["PATH_INFO"] =~ /remove_length/
+      res_header.delete("Content-Length")
+    end
     [status, res_header.merge(test_header), [body]]
   end
 
@@ -74,6 +77,36 @@ class TestRequest
         }
       }
     end
+
+    def curl_command(command)
+      body = ""
+      header = {}
+      request = {}
+      open("|" + command) { |f|
+        while (line = f.gets)
+          next if line.match(/^(\*|}|{) /)
+          if line.match(/^> /)
+            line.sub!(/^> /,"")
+            line.gsub!(/[\r\n]/,"")
+            key,val = line.split(/: /,2)
+            request[key.to_s] = val.to_s
+            next
+          end
+          if line.match(/^< /)
+            line.sub!(/^< /,"")
+            line.gsub!(/[\r\n]/,"")
+            key,val = line.split(/: /,2)
+            header[key.to_s] = val.to_s
+            next
+          end
+          line.sub!(/\* Closing connection #0\n/,"")
+          body += line
+        end
+      }
+      @request = request
+      @response = YAML.load(body)
+      @header = header
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,7 @@ files:
 - ext/rhebok/rhebok.c
 - lib/rack/handler/rhebok.rb
 - lib/rhebok.rb
+- lib/rhebok/buffered.rb
 - lib/rhebok/config.rb
 - lib/rhebok/version.rb
 - rhebok.gemspec
@@ -117,6 +118,7 @@ files:
 - test/spec_03_unix.rb
 - test/spec_04_hook.rb
 - test/spec_05_config.rb
+- test/spec_06_curl.rb
 - test/testconfig.rb
 - test/testrequest.rb
 homepage: https://github.com/kazeburo/rhebok
@@ -149,5 +151,6 @@ test_files:
 - test/spec_03_unix.rb
 - test/spec_04_hook.rb
 - test/spec_05_config.rb
+- test/spec_06_curl.rb
 - test/testconfig.rb
 - test/testrequest.rb