rhebok 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e516c2387824b8e3976a34529ea5593406d0c57
-  data.tar.gz: 1b29cd42069cdd7a520ba1955079b95d057f82d2
+  metadata.gz: e57b88c70418eccd0131a3798c093e5f121783df
+  data.tar.gz: d483fa40f2b94af141e1a7674bb9ee01d3c0b326
 SHA512:
-  metadata.gz: 1d089e15a546fb9a4b47c7b3b92ee5ac6e573628d846151b6959e8bbf3cf85f8ad52e67c5ece9dd6eb32e0705c0c5ef291f254d3bd13248d047a946b10dc0832
-  data.tar.gz: 6cfe98a1c126f04b5e4d4eec7640538de04f0ea19a69f38636cce74c23eac52e51cf88ecf85fe110defbd8d1cf44cfa24d6f8449add7f08ab58f0525c3d77152
+  metadata.gz: 56a9bedb5bdfa63745fc1bcd46ef349173a144c911cfbb2b08570d81051ebe6bdad4c2f39a1ad98892428b6093ebb27b9d0b7e6e83c22856b6939ff3a77d30ee
+  data.tar.gz: 80dbef163aa4804173847972c5c2dbdb5097775a24e3127cebee33efdd460326e0a6d84d1e574d6170214dbafea110c3cb5280e1945ecb8dc4e6d187ea90ea61

data/Changes

@@ -1,3 +1,7 @@
+0.0.3 2014-12-18T17:22:53Z
+
+    - fixed segfault. iovec shortage
+
 0.0.2 2014-12-18T12:50:11Z
 
     - fixed install issue

data/ext/rhebok/rhebok.c

@@ -120,6 +120,7 @@ static VALUE server_protocol_key;
 static VALUE query_string_key;
 static VALUE remote_addr_key;
 static VALUE remote_port_key;
+static VALUE path_info_key;
 
 struct common_header {
   const char * name;
@@ -206,7 +207,6 @@ 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);
   for (i = 0; i < src_len; i++ ) {
     if ( src[i] == '%' ) {
@@ -230,7 +230,7 @@ int store_path_info(VALUE env, const char* src, size_t src_len) {
     }
   }
   d[dlen]='0';
-  rb_hash_aset(env, rb_str_new2("PATH_INFO"), rb_str_new(d, dlen));
+  rb_hash_aset(env, path_info_key, rb_str_new(d, dlen));
   free(d);
   return dlen;
 }
@@ -573,7 +573,7 @@ VALUE rhe_write_timeout(VALUE self, VALUE fileno, VALUE buf, VALUE len, VALUE of
   char* d;
   ssize_t rv;
 
-  d = StringValuePtr(buf);
+  d = RSTRING_PTR(buf);
   rv = _write_timeout(NUM2INT(fileno), NUM2DBL(timeout), &d[NUM2LONG(offset)], NUM2LONG(len));
   if ( rv < 0 ) {
     return Qnil;
@@ -589,7 +589,7 @@ VALUE rhe_write_all(VALUE self, VALUE fileno, VALUE buf, VALUE offsetv, VALUE ti
   ssize_t rv = 0;
   ssize_t written = 0;
 
-  d = StringValuePtr(buf);
+  d = RSTRING_PTR(buf);
   buf_len = RSTRING_LEN(buf);
 
   written = 0;
@@ -608,6 +608,7 @@ 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);
   return ST_CONTINUE;
 }
@@ -620,8 +621,8 @@ 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) {
-  ssize_t hlen;
-  ssize_t blen;
+  ssize_t hlen = 0;
+  ssize_t blen = 0;
 
   ssize_t len;
   ssize_t rv = 0;
@@ -639,15 +640,17 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   char * key;
   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);
   blen = RARRAY_LEN(body);
-  iovcnt = 10 + (hlen * 2) + blen;
+  iovcnt = 10 + (hlen * 4) + blen;
 
   {
     struct iovec v[iovcnt]; // Needs C99 compiler
@@ -680,7 +683,7 @@ 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 = StringValuePtr(key_obj);
+      key = RSTRING_PTR(key_obj);
       len = RSTRING_LEN(key_obj);
       if ( strncasecmp(key,"Connection",len) == 0 ) {
         continue;
@@ -699,7 +702,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
       iovcnt++;
       /* value */
       val_obj = rb_hash_aref(headers, key_obj);
-      v[iovcnt].iov_base = StringValuePtr(val_obj);
+      v[iovcnt].iov_base = RSTRING_PTR(val_obj);
       v[iovcnt].iov_len = RSTRING_LEN(val_obj);
       iovcnt++;
       v[iovcnt].iov_base = "\r\n";
@@ -717,9 +720,9 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
     v[iovcnt].iov_len = sizeof("\r\n") - 1;
     iovcnt++;
 
-    for (i=0; i < blen; i++ ) {
+    for ( i=0; i<blen; i++) {
       val_obj = rb_ary_entry(body, i);
-      v[iovcnt].iov_base = StringValuePtr(val_obj);
+      v[iovcnt].iov_base = RSTRING_PTR(val_obj);
       v[iovcnt].iov_len = RSTRING_LEN(val_obj);
       iovcnt++;
     }
@@ -747,6 +750,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
       }
     }
   }
+
   if ( rv < 0 ) {
     return Qnil;
   }
@@ -757,6 +761,8 @@ void Init_rhebok()
 {
   request_method_key = rb_obj_freeze(rb_str_new2("REQUEST_METHOD"));
   rb_gc_register_address(&request_method_key);
+  path_info_key = rb_obj_freeze(rb_str_new2("PATH_INFO"));
+  rb_gc_register_address(&path_info_key);
   request_uri_key = rb_obj_freeze(rb_str_new2("REQUEST_URI"));
   rb_gc_register_address(&request_uri_key);
   script_name_key = rb_obj_freeze(rb_str_new2("SCRIPT_NAME"));

data/lib/rack/handler/rhebok.rb

@@ -179,9 +179,9 @@ module Rack
 
               status_code, headers, body = app.call(env)
               if body.instance_of?(Array) then
-                ::Rhebok.write_response(connection, @options[:Timeout], status_code, headers, body);
+                ::Rhebok.write_response(connection, @options[:Timeout], status_code, headers, body)
               else
-                ::Rhebok.write_response(connection, @options[:Timeout], status_code, headers, []);
+                ::Rhebok.write_response(connection, @options[:Timeout], status_code, headers, [])
                 body.each do |part|
                   ret = ::Rhebok.write_all(connection, part, 0, @options[:Timeout])
                   if ret == nil then
@@ -189,6 +189,7 @@ module Rack
                   end
                 end #body.each
               end
+              #p [env,status_code,headers,body]
             ensure
               if buffer.instance_of?(Tempfile)
                 buffer.close!

data/lib/rhebok/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Masahiro Nagano