rhebok 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f7b4d1269e51f01608ce10b664cbac7a48ab183
-  data.tar.gz: 63d4f869951c560a78b4878744b939e8ee40004c
+  metadata.gz: 9355b53eeddf987a2aa824aa639eb3fd6f4fcc22
+  data.tar.gz: 0a041cb2ebfc3daf54af50f1eccb639868c3d9a8
 SHA512:
-  metadata.gz: f1954f4c61f6f593af6d057d799d1c0568c7d978e21eb72fd0c90cba4effa0c4d12c6d2273e69dd2ebe87c9d29610b9af4c9a285175120ea5c41a5a95706d705
-  data.tar.gz: 9fe22db2f5b0e3f311b6321f28325d3f60dbba146c2d4873f338c165c13c4b582df97c693392bfc0aabbb17c3b38f3f25175e1ff1e5845e33ec26b79cf5c27e2
+  metadata.gz: cb9728ed0b511498d9c7adc8b60fb6c296754e8e430a2199d7f9491305d7fdd5acaed15fe2c52f2893ef40311dc2ad91bf8a4c8d53f6f94c2f7a05a4b755689a
+  data.tar.gz: cf23b2c70f18c728b01b10781136800e3c753033bb9627af91bc43dc9f301decb6bf834910370ce699291d8b7aed221db60625652986846924d3ac42ef08fd04

data/Changes

@@ -1,3 +1,8 @@
+0.0.8 2014-12-25T15:23:41Z
+
+    - tweek Header order
+    - require ruby >= 2.0
+
 0.0.7 2014-12-24T16:25:22Z
 
     - support unix domain socket directly

data/README.md

@@ -1,7 +1,5 @@
 # Rhebok
 
-This project is still in a very early development stage. IT IS NOT READY FOR PRODUCTION!
-
 Rhebok is High Performance Rack Handler/Web Server. 2x performance when compared against Unicorn. 
 
 Rhebok supports following features.

data/ext/rhebok/rhebok.c

@@ -677,6 +677,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   int i;
   char status_line[512];
   char date_line[512];
+  char server_line[1032];
   int date_pushed = 0;
   VALUE harr;
   VALUE key_obj;
@@ -685,6 +686,10 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   ssize_t key_len;
   const char * message;
 
+  const char * s;
+  char* d;
+  ssize_t n;
+
   int fileno = NUM2INT(filenov);
   double timeout = NUM2DBL(timeoutv);
   int status_code = NUM2INT(status_codev);
@@ -720,8 +725,11 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
     v[iovcnt].iov_len = i;
     iovcnt++;
 
-    v[iovcnt].iov_base = "Connection: close\r\nServer: Rhebok\r\n";
-    v[iovcnt].iov_len = sizeof("Connection: close\r\nServer: Rhebok\r\n")-1;
+    /* for date header */
+    iovcnt++;
+
+    v[iovcnt].iov_base = "Server: Rhebok\r\n";
+    v[iovcnt].iov_len = sizeof("Server: Rhebok\r\n")-1;
     iovcnt++;
 
     date_pushed = 0;
@@ -729,16 +737,38 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
       key_obj = rb_ary_entry(harr, i);
       key = RSTRING_PTR(key_obj);
       key_len = RSTRING_LEN(key_obj);
+      i++;
+
       if ( strncasecmp(key,"Connection",key_len) == 0 ) {
-        i++;
         continue;
       }
-      if ( strncasecmp(key,"Server",key_len) == 0 ) {
-        v[1].iov_len -= (sizeof("Server: Rhebok\r\n") - 1);
-      }
+
+      val_obj = rb_ary_entry(harr, i);
+
       if ( strncasecmp(key,"Date",key_len) == 0 ) {
+        strcpy(date_line, "Date: ");
+        for ( s=RSTRING_PTR(val_obj), n = RSTRING_LEN(val_obj), d=date_line+sizeof("Date: ")-1; n !=0; s++, --n, d++) {
+          *d = *s;
+        }
+        date_line[sizeof("Date: ") -1 + RSTRING_LEN(val_obj)] = 13;
+        date_line[sizeof("Date: ") -1 + RSTRING_LEN(val_obj) + 1] = 10;
+        v[1].iov_base = date_line;
+        v[1].iov_len = sizeof("Date: ") -1 + RSTRING_LEN(val_obj) + 2;
         date_pushed = 1;
+        continue;
       }
+      if ( strncasecmp(key,"Server",key_len) == 0 ) {
+        strcpy(server_line, "Server: ");
+        for ( s=RSTRING_PTR(val_obj), n = RSTRING_LEN(val_obj), d=server_line+sizeof("Server: ")-1; n !=0; s++, --n, d++) {
+          *d = *s;
+        }
+        server_line[sizeof("Server: ") -1 + RSTRING_LEN(val_obj)] = 13;
+        server_line[sizeof("Server: ") -1 + RSTRING_LEN(val_obj) + 1] = 10;
+        v[2].iov_base = server_line;
+        v[2].iov_len = sizeof("Server: ") -1 + RSTRING_LEN(val_obj) + 2;
+        continue;
+      }
+
       v[iovcnt].iov_base = key;
       v[iovcnt].iov_len = key_len;
       iovcnt++;
@@ -747,8 +777,6 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
       iovcnt++;
 
       /* value */
-      i++;
-      val_obj = rb_ary_entry(harr, i);
       v[iovcnt].iov_base = RSTRING_PTR(val_obj);
       v[iovcnt].iov_len = RSTRING_LEN(val_obj);
       iovcnt++;
@@ -758,13 +786,12 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
     }
 
     if ( date_pushed == 0 ) {
-      v[iovcnt].iov_len = _date_line(date_line);
-      v[iovcnt].iov_base = date_line;
-      iovcnt++;
+      v[1].iov_len = _date_line(date_line);
+      v[1].iov_base = date_line;
     }
 
-    v[iovcnt].iov_base = "\r\n";
-    v[iovcnt].iov_len = sizeof("\r\n") - 1;
+    v[iovcnt].iov_base = "Connection: close\r\n\r\n";
+    v[iovcnt].iov_len = sizeof("Connection: close\r\n\r\n") - 1;
     iovcnt++;
 
     for ( i=0; i<blen; i++) {

data/lib/rhebok/version.rb

@@ -1,3 +1,3 @@
 class Rhebok
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/rhebok.gemspec

@@ -19,6 +19,7 @@ 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.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "bacon"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="