rhebok 0.8.3 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82469802f30b8a8f97eabdb2788ca97ad26e0c37
-  data.tar.gz: ce03f4a2fc45f331ea3afc5d2513476ff85d65aa
+  metadata.gz: 63c847aca36084736ee20d2439a2a868f9cfdf09
+  data.tar.gz: 8a24d9b12665ace439784f2fe5d727da562a17b4
 SHA512:
-  metadata.gz: b8003c3e601e61ae7c5340980bc2f504f72bd596fb7c9c9b288c27a7aa0a4e49df0f0bd9f2f05b133025f3be79ce50ce95aa7b4488c678a5614c7c1940269583
-  data.tar.gz: f608aa9e2f220d276bc98ae3230ab751ea9962718d66cadeb4bc2eebaab012c184e0261de88df284beed5f17a71d93c577b909df03424cbd0688024ce9d8b7c0
+  metadata.gz: e77d3d23898445c851b65b945306c6fe19bdbe6af7332afa8578deca059e11d6204cb33aed2984492d9d05de2d0d682b89e4847bd831d2f958e0800b7bc8c942
+  data.tar.gz: 430031512ebf4a7a2054dabb651266738eef9ac6051a63b646f87a5b075d63a21ccfb263d2c67786091cf6d97cb9149f0f63b191f6062a0302f55571a5dd7f54

data/Changes

@@ -1,3 +1,7 @@
+0.8.5 2015-01-26T02:23:08Z
+
+    - fix bug. send 0byte mark when using a non raw Array body
+
 0.8.3 2015-01-23T00:33:02Z
 
     - change default backlog to SOMAXCONN

data/ext/rhebok/rhebok.c

@@ -708,7 +708,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 use_chunkedv) {
+VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status_codev, VALUE headers, VALUE body, VALUE use_chunkedv, VALUE header_onlyv) {
   ssize_t hlen = 0;
   ssize_t blen = 0;
 
@@ -739,7 +739,13 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   double timeout = NUM2DBL(timeoutv);
   int status_code = NUM2INT(status_codev);
   int use_chunked = NUM2INT(use_chunkedv);
-
+  int header_only = NUM2INT(header_onlyv);
+  
+  /* status_with_no_entity_body */
+  if ( status_code < 200 || status_code == 204 || status_code == 304 ) {
+    use_chunked = 0;
+  }
+  
   harr = rb_ary_new();
   RB_GC_GUARD(harr);
   rb_hash_foreach(headers, header_to_array, harr);
@@ -870,7 +876,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
           iovcnt++;
       }
     }
-    if ( use_chunked ) {
+    if ( use_chunked && header_only == 0 ) {
       v[iovcnt].iov_base = "0\r\n\r\n";
       v[iovcnt].iov_len = sizeof("0\r\n\r\n") - 1;
       iovcnt++;
@@ -958,5 +964,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, 6);
+  rb_define_module_function(cRhebok, "write_response", rhe_write_response, 7);
 }

data/lib/rack/handler/rhebok.rb

@@ -301,9 +301,9 @@ module Rack
                              headers.key?("Content-Length") ? 0 : 1
 
               if body.instance_of?(Array)
-                ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, body, use_chunked)
+                ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, body, use_chunked, 0)
               else
-                ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, [], use_chunked)
+                ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, [], use_chunked, 1)
                 body.each do |part|
                   ret = nil
                   if use_chunked == 1

data/lib/rhebok/version.rb

@@ -1,3 +1,3 @@
 class Rhebok
-  VERSION = "0.8.3"
+  VERSION = "0.8.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.5
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler