rhebok 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cf21a4ceaeeaf1c6e72a19f59555508984ee6c6
-  data.tar.gz: 29b1d23eebdd7837be2af68adb2b6dabefea2590
+  metadata.gz: af16d4fa2ab9899851800cf75b3d16c5143435d4
+  data.tar.gz: 08c761f99f0b0e9993c804c8598ec77284ca9bb6
 SHA512:
-  metadata.gz: ce57b5d0c2dc1f2c880f81255f2424f5157ffab68eff12bb2c898c4acfd5b478e4dc23b0cfe38ea9157cce6214c6e68ec28a597afe13eb887aa5446d2b18ef57
-  data.tar.gz: d590aec96108ede772c81176c385c3bb4a15d98b8ea41a527e5316cc9bfb86dbc954ca2fffc62bf4be2af931739e63b746ec0569e0aa369d644eabce558af940
+  metadata.gz: 60b6eb3edc8a8cc6e0792a4d2448f779ad2ffe8c51b6d39c2542ae999d0db5ce81402faf6dde1752f0eee14c7c82fab1f0f00d797282058638d413c15d5fa7d9
+  data.tar.gz: fb8e2129867eaa88a2dea1c598a3c0aecdfb2c711480e7edeaefe02c0cc2151cc3b8544303cd8459a5f7e23f95d71e727f1af18570ef88e78a262f99d1576bcc

data/.travis.yml

@@ -5,6 +5,5 @@ install:
   - gem install bundler
   - bundle install --jobs=3 --retry=3
 rvm:
-  - 2.0.0
-  - 2.1.5
   - 2.2.3
+  - 2.3.1

data/Changes

@@ -1,3 +1,9 @@
+0.9.3 2016-09-13T11:05:00
+
+    - bugfix about timeout by wrong Operator Precedence #7
+    - Optimize by avoiding function call #8
+    - fix rack deps
+
 0.9.2 2015-12-24T00:31:23
 
     - optimize a bit

data/ext/rhebok/rhebok.c

@@ -325,7 +325,7 @@ ssize_t _writev_timeout(const int fileno, const double timeout, struct iovec *io
   while (1) {
     wfds[0].fd = fileno;
     wfds[0].events = POLLOUT;
-    nfound = poll(wfds, 1, (int)timeout*1000);
+    nfound = poll(wfds, 1, (int)(timeout*1000));
     if ( nfound == 1 ) {
       break;
     }
@@ -353,7 +353,7 @@ ssize_t _read_timeout(const int fileno, const double timeout, char * read_buf, c
     return rv;
   }
   while (1) {
-    nfound = poll(rfds, 1, (int)timeout*1000);
+    nfound = poll(rfds, 1, (int)(timeout*1000));
     if ( nfound == 1 ) {
       break;
     }
@@ -391,7 +391,7 @@ ssize_t _write_timeout(const int fileno, const double timeout, char * write_buf,
   while (1) {
     wfds[0].fd = fileno;
     wfds[0].events = POLLOUT;
-    nfound = poll(wfds, 1, (int)timeout*1000);
+    nfound = poll(wfds, 1, (int)(timeout*1000));
     if ( nfound == 1 ) {
       break;
     }
@@ -593,7 +593,7 @@ VALUE rhe_accept(VALUE self, VALUE fileno, VALUE timeoutv, VALUE tcp, VALUE env)
   if ( tcp == Qtrue ) {
     setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(int));
     rb_hash_aset(env, remote_addr_key, rb_str_new2(inet_ntoa(cliaddr.sin_addr)));
-    rb_hash_aset(env, remote_port_key, rb_String(rb_int_new(ntohs(cliaddr.sin_port))));
+    rb_hash_aset(env, remote_port_key, rb_fix2str(INT2FIX(ntohs(cliaddr.sin_port)),10));
   }
   else {
     rb_hash_aset(env, remote_addr_key, vacant_string_val);
@@ -649,7 +649,7 @@ VALUE rhe_accept(VALUE self, VALUE fileno, VALUE timeoutv, VALUE tcp, VALUE env)
   }
 
   req = rb_ary_new2(2);
-  rb_ary_push(req, rb_int_new(fd));
+  rb_ary_push(req, INT2NUM(fd));
   rb_ary_push(req, rb_str_new(&read_buf[reqlen],buf_len - reqlen));
   return req;
  badexit:
@@ -676,7 +676,7 @@ VALUE rhe_read_timeout(VALUE self, VALUE filenov, VALUE rbuf, VALUE lenv, VALUE
     rb_str_cat(rbuf, d, rv);
   }
   xfree(d);
-  return rb_int_new(rv);
+  return SSIZET2NUM(rv);
 }
 
 static
@@ -689,7 +689,7 @@ VALUE rhe_write_timeout(VALUE self, VALUE fileno, VALUE buf, VALUE len, VALUE of
   if ( rv < 0 ) {
     return Qnil;
   }
-  return rb_int_new(rv);
+  return SSIZET2NUM(rv);
 }
 
 
@@ -715,7 +715,7 @@ VALUE rhe_write_all(VALUE self, VALUE fileno, VALUE buf, VALUE offsetv, VALUE ti
   if (rv < 0) {
     return Qnil;
   }
-  return rb_int_new(written);
+  return SSIZET2NUM(written);
 }
 
 static
@@ -733,7 +733,7 @@ VALUE rhe_write_chunk(VALUE self, VALUE fileno, VALUE buf, VALUE offsetv, VALUE
   buf_len = RSTRING_LEN(buf);
 
   if ( buf_len == 0 ){
-      return rb_int_new(0);
+      return INT2FIX(0);
   }
 
   {
@@ -773,7 +773,7 @@ VALUE rhe_write_chunk(VALUE self, VALUE fileno, VALUE buf, VALUE offsetv, VALUE
   if ( rv < 0 ) {
     return Qnil;
   }
-  return rb_int_new(written);
+  return SSIZET2NUM(written);
 }
 
 static
@@ -1021,7 +1021,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   if ( rv < 0 ) {
     return Qnil;
   }
-  return rb_int_new(written);
+  return SSIZET2NUM(written);
 }
 
 void Init_rhebok()

data/lib/rhebok/version.rb

@@ -1,3 +1,3 @@
 class Rhebok
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/rhebok.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.0'
+  spec.required_ruby_version = '>= 2.2.2'
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "bacon"
   spec.add_dependency "rack"
-  spec.add_dependency "prefork_engine", ">= 0.0.6"
+  spec.add_dependency "prefork_engine", ">= 0.0.7"
 
   # get an array of submodule dirs by executing 'pwd' inside each submodule
   `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|

data/test/testrequest.rb

@@ -118,7 +118,7 @@ class TestRequest
             header[key.to_s] = val.to_s
             next
           end
-          line.sub!(/\* Closing connection #0\n/,"")
+          line.sub!(/\* Closing connection #?0\n/,"")
           body += line
         end
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 description: High Performance and Optimized Preforked Rack Handler
 email:
 - kazeburo@gmail.com
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: High Performance Preforked Rack Handler