rhebok 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b58143758b183d03af523fa633a56783e030abd
-  data.tar.gz: 6a44fcfad56efa0fbdf28a595f552bec9dda9842
+  metadata.gz: fd12b50300a5e3b8b0c520c1780e4c4739914624
+  data.tar.gz: 3ed92d6cb499a00830b9b26e2ce97ec401c85252
 SHA512:
-  metadata.gz: ec40342c239b048255213965936191a83b9d4c41a6883783ac49ac9c544d0de677917315651441ce1b3abaaa7ca0d04f37f5642292a12a3311748baa213b09b3
-  data.tar.gz: 5855c448e72d86aa99fc13eff0a25cf8e3fc70502ce27d44457134715f4d67e3b6be27ca87b356200ef199070fafe3b29f45b82c15ce59e0cfb0df9a1feab654
+  metadata.gz: aacc1363c0c7d17800c0789c144cf688d492043f190bb3d2674f48ea8233382e024775d8e7e9777c34acebe70e4c8faa6f4a29b55abf729ad032605dc4d49654
+  data.tar.gz: de67014ec7944a6b575ac8fc6a7a9a9120d519b8d53a7ac524d751e2a0f7bd8e41b37da261c98182444f81d0cd6e709372b13e94eecac979aa4375509022e81d

data/.travis.yml

@@ -2,8 +2,9 @@ language: ruby
 install:
   - git submodule update --init --recursive
   - gem install bacon
+  - gem install bundler
   - bundle install --jobs=3 --retry=3
 rvm:
   - 2.0.0
   - 2.1.5
-  - 2.2.0
+  - 2.2.3

data/Changes

@@ -1,3 +1,7 @@
+0.9.1 2015-12-07T10:37:51
+
+    - disable chunked transfer by default
+
 0.9.0 2015-11-13T23:44:13
 
     - safe graceful shutdown

data/README.md

@@ -114,6 +114,10 @@ Max number of request before invoking GC (defualt: 5)
 
 If set, randomizes the number of request before invoking GC between the number of MaxGCPerRequest (defualt: none)
 
+### Chunked_Transfer
+
+If set, use chunked transfer for response (default: false)
+
 ### SpawnInterval
 
 if set, worker processes will not be spawned more than once than every given seconds. Also, when SIGUSR1 is being received, no more than one worker processes will be collected every given seconds. This feature is useful for doing a "slow-restart". See http://blog.kazuhooku.com/2011/04/web-serverstarter-parallelprefork.html for more information. (default: none)
@@ -165,6 +169,8 @@ Supported options in config file are below.
 
 ### min_gc_per_request
 
+### chunked_transfer
+
 ### spawn_interval
 
 ### before_fork

data/ext/rhebok/rhebok.c

@@ -241,7 +241,8 @@ VALUE find_common_header(const struct phr_header* header) {
 
 static
 int store_path_info(VALUE env, const char* src, size_t src_len) {
-  size_t dlen = 0, i = 0;
+  int dlen = 0;
+  size_t i = 0;
   char *d;
   char s2, s3;
   d = ALLOC_N(char, src_len * 3 + 1);
@@ -294,13 +295,23 @@ int _accept(int fileno, struct sockaddr *addr, unsigned int addrlen) {
 }
 
 static
-ssize_t _writev_timeout(const int fileno, const double timeout, struct iovec *iovec, const int iovcnt, const int do_select ) {
-  int rv;
+ssize_t _writev_timeout(const int fileno, const double timeout, struct iovec *iovec, const long iovcnt, const int do_select ) {
+  ssize_t rv;
   int nfound;
+  int iovcnt_len;
   struct pollfd wfds[1];
+  if ( iovcnt < 0 ){
+      return -1;
+  }
+  if ( iovcnt > UINT_MAX ) {
+      iovcnt_len = UINT_MAX;
+  }
+  else {
+      iovcnt_len = (int)iovcnt;
+  }
   if ( do_select == 1) goto WAIT_WRITE;
  DO_WRITE:
-  rv = writev(fileno, iovec, iovcnt);
+  rv = writev(fileno, iovec, iovcnt_len);
   if ( rv >= 0 ) {
     return rv;
   }
@@ -323,8 +334,8 @@ ssize_t _writev_timeout(const int fileno, const double timeout, struct iovec *io
 }
 
 static
-ssize_t _read_timeout(const int fileno, const double timeout, char * read_buf, const int read_len ) {
-  int rv;
+ssize_t _read_timeout(const int fileno, const double timeout, char * read_buf, const ssize_t read_len ) {
+  ssize_t rv;
   int nfound;
   struct pollfd rfds[1];
  DO_READ:
@@ -350,12 +361,23 @@ ssize_t _read_timeout(const int fileno, const double timeout, char * read_buf, c
 }
 
 static
-ssize_t _write_timeout(const int fileno, const double timeout, char * write_buf, const int write_len ) {
-  int rv;
+ssize_t _write_timeout(const int fileno, const double timeout, char * write_buf, const long write_len ) {
+  ssize_t rv;
   int nfound;
   struct pollfd wfds[1];
+  size_t write_buf_len;
+  if ( write_len < 0 ) {
+      return -1;
+  }
+  if ( write_len > UINT_MAX ) {
+      write_buf_len = UINT_MAX;
+  }
+  else {
+      write_buf_len = (unsigned int)write_len;
+  }
+  
  DO_WRITE:
-  rv = write(fileno, write_buf, write_len);
+  rv = write(fileno, write_buf, write_buf_len);
   if ( rv >= 0 ) {
     return rv;
   }
@@ -377,8 +399,8 @@ ssize_t _write_timeout(const int fileno, const double timeout, char * write_buf,
 }
 
 static
-void str_s(char * dst, int *dst_len, const char * src, int src_len) {
-  int i;
+void str_s(char * dst, int *dst_len, const char * src, const unsigned long src_len) {
+  unsigned long i;
   int dlen = *dst_len;
   for ( i=0; i<src_len; i++) {
     dst[dlen++] = src[i];
@@ -691,8 +713,8 @@ VALUE rhe_write_chunk(VALUE self, VALUE fileno, VALUE buf, VALUE offsetv, VALUE
   ssize_t rv = 0;
   ssize_t written = 0;
   ssize_t vec_offset = 0;
-  int count =0;
-  int remain;
+  ssize_t count =0;
+  ssize_t remain;
   ssize_t iovcnt = 3;
   char chunked_header_buf[18];
 
@@ -788,9 +810,9 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   ssize_t iovcnt;
   ssize_t vec_offset;
   ssize_t written;
-  int count;
+  ssize_t count;
   int i;
-  int remain;
+  ssize_t remain;
   char status_line[512];
   char date_line[512];
   char server_line[1032];
@@ -819,7 +841,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
     use_chunked = 0;
   }
   
-  harr = rb_ary_new();
+  harr = rb_ary_new2(RHASH_SIZE(headers) * 2);
   RB_GC_GUARD(harr);
   rb_hash_foreach(headers, header_to_array, harr);
   hlen = RARRAY_LEN(harr);

data/lib/rack/handler/rhebok.rb

@@ -41,6 +41,7 @@ module Rack
         :BeforeFork => nil,
         :AfterFork => nil,
         :ReusePort => false,
+        :ChunkedTransfer => false,
       }
       NULLIO  = StringIO.new("").set_encoding('BINARY')
 
@@ -64,6 +65,9 @@ module Rack
         if options[:ReusePort].instance_of?(String)
           options[:ReusePort] = options[:ReusePort].match(/^(true|yes|1)$/i) ? true : false
         end
+        if options[:ChunkedTransfer].instance_of?(String)
+          options[:ChunkedTransfer] = options[:ChunkedTransfer].match(/^(true|yes|1)$/i) ? true : false
+        end
 
         @options = DEFAULT_OPTIONS.merge(options)
         if @options[:ConfigFile] != nil
@@ -293,9 +297,12 @@ module Rack
 
               status_code, headers, body = app.call(env)
 
-              use_chunked =  env["SERVER_PROTOCOL"] != "HTTP/1.1" ||
-                             headers.key?("Transfer-Encoding") ||
-                             headers.key?("Content-Length") ? 0 : 1
+              use_chunked = 0
+              if @options[:ChunkedTransfer]
+                use_chunked =  env["SERVER_PROTOCOL"] != "HTTP/1.1" ||
+                               headers.key?("Transfer-Encoding") ||
+                               headers.key?("Content-Length") ? 0 : 1
+              end
 
               if body.instance_of?(Array)
                 ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, body, use_chunked, 0)

data/lib/rhebok/config.rb

@@ -68,6 +68,10 @@ class Rhebok
       @config[:ReusePort] = block
     end
 
+    def chunked_transfer(&block)
+      @config[:ChunkedTransfer] = block
+    end
+
     def retrieve
       @config
     end

data/lib/rhebok/version.rb

@@ -1,3 +1,3 @@
 class Rhebok
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/test/spec_06_curl.rb

@@ -51,7 +51,7 @@ describe Rhebok do
       @header["Connection"].should.equal "close"
       @header.key?("HTTP/1.1 100 Continue").should.equal false
     end
-  })
+  },1)
 
   test_rhebok( proc {
     [200,{"Content-Type"=>"text/plain"},["Content","","Again",nil,0]]
@@ -66,7 +66,7 @@ describe Rhebok do
     should "zero length with curl http/1.0" do
       @body.should.equal "ContentAgain0"
     end
-  })
+  },1)
 
   test_rhebok( proc {
     [200,{"Content-Type"=>"text/plain"},[]]
@@ -81,7 +81,7 @@ describe Rhebok do
     should "vacant rew with curl http/1.0" do
       @body.should.equal ""
     end
-  })
+  },1)
 
   test_rhebok( proc {
     [200,{"Content-Type"=>"text/plain"},ZeroStreamBody]
@@ -96,7 +96,7 @@ describe Rhebok do
     should "zerostream length with curl http/1.0" do
       @body.should.equal "ContentAgain0"
     end
-  })
+  },1)
 
   test_rhebok( proc {
     [200,{"Content-Type"=>"text/plain"},VacantStreamBody]
@@ -111,6 +111,6 @@ describe Rhebok do
     should "vacantstream length with curl http/1.0" do
       @body.should.equal ""
     end
-  })
+  },1)
 
 end

data/test/testrequest.rb

@@ -78,12 +78,12 @@ class TestRequest
       }
     end
 
-    def test_rhebok(app,cb)
+    def test_rhebok(app,cb,chunked=0)
       begin
         @pid = fork
         if @pid == nil
           # child
-          Rack::Handler::Rhebok.run(app, :Host=>@host, :Port=>@port, :MaxWorkers=>1)
+          Rack::Handler::Rhebok.run(app, :Host=>@host, :Port=>@port, :MaxWorkers=>1, :ChunkedTransfer=>chunked)
           exit!(true)
         end
         cb.call

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler