rhebok 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd12b50300a5e3b8b0c520c1780e4c4739914624
-  data.tar.gz: 3ed92d6cb499a00830b9b26e2ce97ec401c85252
+  metadata.gz: 7cf21a4ceaeeaf1c6e72a19f59555508984ee6c6
+  data.tar.gz: 29b1d23eebdd7837be2af68adb2b6dabefea2590
 SHA512:
-  metadata.gz: aacc1363c0c7d17800c0789c144cf688d492043f190bb3d2674f48ea8233382e024775d8e7e9777c34acebe70e4c8faa6f4a29b55abf729ad032605dc4d49654
-  data.tar.gz: de67014ec7944a6b575ac8fc6a7a9a9120d519b8d53a7ac524d751e2a0f7bd8e41b37da261c98182444f81d0cd6e709372b13e94eecac979aa4375509022e81d
+  metadata.gz: ce57b5d0c2dc1f2c880f81255f2424f5157ffab68eff12bb2c898c4acfd5b478e4dc23b0cfe38ea9157cce6214c6e68ec28a597afe13eb887aa5446d2b18ef57
+  data.tar.gz: d590aec96108ede772c81176c385c3bb4a15d98b8ea41a527e5316cc9bfb86dbc954ca2fffc62bf4be2af931739e63b746ec0569e0aa369d644eabce558af940

data/Changes

@@ -1,3 +1,7 @@
+0.9.2 2015-12-24T00:31:23
+
+    - optimize a bit
+
 0.9.1 2015-12-07T10:37:51
 
     - disable chunked transfer by default

data/README.md

@@ -1,6 +1,11 @@
 # Rhebok
 
-Rhebok is High Performance Rack Handler/Web Server. 2x performance when compared against Unicorn. 
+![rhebok logo](https://s3-ap-northeast-1.amazonaws.com/softwarearchives/rhebookfix-350.png)
+
+
+[![Build Status](https://travis-ci.org/kazeburo/rhebok.svg?branch=master)](https://travis-ci.org/kazeburo/rhebok)
+
+Rhebok is High Performance Rack Handler/Web Server. 2x performance when compared against Unicorn.
 
 Rhebok supports following features.
 
@@ -9,7 +14,7 @@ Rhebok supports following features.
 - uses writev(2) for output responses
 - prefork and graceful shutdown using [prefork_engine](https://rubygems.org/gems/prefork_engine)
 - hot deploy using [start_server](https://metacpan.org/release/Server-Starter) ([here](https://github.com/lestrrat/go-server-starter) is golang version by lestrrat-san)
-- supports HTTP/1.1. But does not have Keepalive
+- supports HTTP/1.1 except for KeepAlive
 - supports OobGC
 
 This server is suitable for running HTTP application servers behind a reverse proxy like nginx.
@@ -211,11 +216,11 @@ ruby version
 nginx.conf
 
     worker_processes  16;
-    
+
     events {
       worker_connections  50000;
     }
-    
+
     http {
       include     mime.types;
       access_log  off;
@@ -289,8 +294,8 @@ unicorn.rb
 command to run
 
     $ bundle exec unicorn -c unicorn.rb -E production config.ru
- 
-#### Hello World/Rack Application 
+
+#### Hello World/Rack Application
 
     $ ./wrk -t 4 -c 500 -d 30  http://localhost/
     Running 30s test @ http://localhost/
@@ -328,7 +333,7 @@ command to run
 
 ### Server Environment
 
-I used EC2 for benchmarking. Instance type if c3.8xlarge(32cores). A benchmark tool and web servers were executed at same hosts. Before benchmark, increase somaxconn and nfiles. 
+I used EC2 for benchmarking. Instance type if c3.8xlarge(32cores). A benchmark tool and web servers were executed at same hosts. Before benchmark, increase somaxconn and nfiles.
 
 ## See Also
 

data/ext/rhebok/rhebok.c

@@ -35,6 +35,7 @@
 #define EXPECT_FAILED "HTTP/1.1 417 Expectation Failed\r\nContent-Type: text/plain\r\nConnection: close\r\n\r\nExpectation Failed\r\n"
 #define READ_BUF 16384
 #define TOU(ch) (('a' <= ch && ch <= 'z') ? ch - ('a' - 'A') : ch)
+#define RETURN_STATUS_MESSAGE(s, l) l = sizeof(s) - 1; return s;
 
 static const char *DoW[] = {
   "Sun","Mon","Tue","Wed","Thu","Fri","Sat"
@@ -49,84 +50,84 @@ static const char xdigit[16] = {'0','1','2','3','4','5','6','7','8','9','a','b',
 /* Unmarked codes are from RFC 2616 */
 /* See also: http://en.wikipedia.org/wiki/List_of_HTTP_status_codes */
 static const char *
-status_message (int code) {
+status_message (int code, size_t *mlen) {
   switch (code) {
-    case 100: return "Continue";
-    case 101: return "Switching Protocols";
-    case 102: return "Processing";                      /* RFC 2518 (WebDAV) */
-    case 200: return "OK";
-    case 201: return "Created";
-    case 202: return "Accepted";
-    case 203: return "Non-Authoritative Information";
-    case 204: return "No Content";
-    case 205: return "Reset Content";
-    case 206: return "Partial Content";
-    case 207: return "Multi-Status";                    /* RFC 2518 (WebDAV) */
-    case 208: return "Already Reported";              /* RFC 5842 */
-    case 300: return "Multiple Choices";
-    case 301: return "Moved Permanently";
-    case 302: return "Found";
-    case 303: return "See Other";
-    case 304: return "Not Modified";
-    case 305: return "Use Proxy";
-    case 307: return "Temporary Redirect";
-    case 400: return "Bad Request";
-    case 401: return "Unauthorized";
-    case 402: return "Payment Required";
-    case 403: return "Forbidden";
-    case 404: return "Not Found";
-    case 405: return "Method Not Allowed";
-    case 406: return "Not Acceptable";
-    case 407: return "Proxy Authentication Required";
-    case 408: return "Request Timeout";
-    case 409: return "Conflict";
-    case 410: return "Gone";
-    case 411: return "Length Required";
-    case 412: return "Precondition Failed";
-    case 413: return "Request Entity Too Large";
-    case 414: return "Request-URI Too Large";
-    case 415: return "Unsupported Media Type";
-    case 416: return "Request Range Not Satisfiable";
-    case 417: return "Expectation Failed";
-    case 418: return "I'm a teapot";              /* RFC 2324 */
-    case 422: return "Unprocessable Entity";            /* RFC 2518 (WebDAV) */
-    case 423: return "Locked";                          /* RFC 2518 (WebDAV) */
-    case 424: return "Failed Dependency";               /* RFC 2518 (WebDAV) */
-    case 425: return "No code";                         /* WebDAV Advanced Collections */
-    case 426: return "Upgrade Required";                /* RFC 2817 */
-    case 428: return "Precondition Required";
-    case 429: return "Too Many Requests";
-    case 431: return "Request Header Fields Too Large";
-    case 449: return "Retry with";                      /* unofficial Microsoft */
-    case 500: return "Internal Server Error";
-    case 501: return "Not Implemented";
-    case 502: return "Bad Gateway";
-    case 503: return "Service Unavailable";
-    case 504: return "Gateway Timeout";
-    case 505: return "HTTP Version Not Supported";
-    case 506: return "Variant Also Negotiates";         /* RFC 2295 */
-    case 507: return "Insufficient Storage";            /* RFC 2518 (WebDAV) */
-    case 509: return "Bandwidth Limit Exceeded";        /* unofficial */
-    case 510: return "Not Extended";                    /* RFC 2774 */
-    case 511: return "Network Authentication Required";
+    case 100: RETURN_STATUS_MESSAGE("Continue", *mlen);
+    case 101: RETURN_STATUS_MESSAGE("Switching Protocols", *mlen);
+    case 102: RETURN_STATUS_MESSAGE("Processing", *mlen);                      /* RFC 2518 (WebDAV) */
+    case 200: RETURN_STATUS_MESSAGE("OK", *mlen);
+    case 201: RETURN_STATUS_MESSAGE("Created", *mlen);
+    case 202: RETURN_STATUS_MESSAGE("Accepted", *mlen);
+    case 203: RETURN_STATUS_MESSAGE("Non-Authoritative Information", *mlen);
+    case 204: RETURN_STATUS_MESSAGE("No Content", *mlen);
+    case 205: RETURN_STATUS_MESSAGE("Reset Content", *mlen);
+    case 206: RETURN_STATUS_MESSAGE("Partial Content", *mlen);
+    case 207: RETURN_STATUS_MESSAGE("Multi-Status", *mlen);                    /* RFC 2518 (WebDAV) */
+    case 208: RETURN_STATUS_MESSAGE("Already Reported", *mlen);                /* RFC 5842 */
+    case 300: RETURN_STATUS_MESSAGE("Multiple Choices", *mlen);
+    case 301: RETURN_STATUS_MESSAGE("Moved Permanently", *mlen);
+    case 302: RETURN_STATUS_MESSAGE("Found", *mlen);
+    case 303: RETURN_STATUS_MESSAGE("See Other", *mlen);
+    case 304: RETURN_STATUS_MESSAGE("Not Modified", *mlen);
+    case 305: RETURN_STATUS_MESSAGE("Use Proxy", *mlen);
+    case 307: RETURN_STATUS_MESSAGE("Temporary Redirect", *mlen);
+    case 400: RETURN_STATUS_MESSAGE("Bad Request", *mlen);
+    case 401: RETURN_STATUS_MESSAGE("Unauthorized", *mlen);
+    case 402: RETURN_STATUS_MESSAGE("Payment Required", *mlen);
+    case 403: RETURN_STATUS_MESSAGE("Forbidden", *mlen);
+    case 404: RETURN_STATUS_MESSAGE("Not Found", *mlen);
+    case 405: RETURN_STATUS_MESSAGE("Method Not Allowed", *mlen);
+    case 406: RETURN_STATUS_MESSAGE("Not Acceptable", *mlen);
+    case 407: RETURN_STATUS_MESSAGE("Proxy Authentication Required", *mlen);
+    case 408: RETURN_STATUS_MESSAGE("Request Timeout", *mlen);
+    case 409: RETURN_STATUS_MESSAGE("Conflict", *mlen);
+    case 410: RETURN_STATUS_MESSAGE("Gone", *mlen);
+    case 411: RETURN_STATUS_MESSAGE("Length Required", *mlen);
+    case 412: RETURN_STATUS_MESSAGE("Precondition Failed", *mlen);
+    case 413: RETURN_STATUS_MESSAGE("Request Entity Too Large", *mlen);
+    case 414: RETURN_STATUS_MESSAGE("Request-URI Too Large", *mlen);
+    case 415: RETURN_STATUS_MESSAGE("Unsupported Media Type", *mlen);
+    case 416: RETURN_STATUS_MESSAGE("Request Range Not Satisfiable", *mlen);
+    case 417: RETURN_STATUS_MESSAGE("Expectation Failed", *mlen);
+    case 418: RETURN_STATUS_MESSAGE("I'm a teapot", *mlen);                    /* RFC 2324 */
+    case 422: RETURN_STATUS_MESSAGE("Unprocessable Entity", *mlen);            /* RFC 2518 (WebDAV) */
+    case 423: RETURN_STATUS_MESSAGE("Locked", *mlen);                          /* RFC 2518 (WebDAV) */
+    case 424: RETURN_STATUS_MESSAGE("Failed Dependency", *mlen);               /* RFC 2518 (WebDAV) */
+    case 425: RETURN_STATUS_MESSAGE("No code", *mlen);                         /* WebDAV Advanced Collections */
+    case 426: RETURN_STATUS_MESSAGE("Upgrade Required", *mlen);                /* RFC 2817 */
+    case 428: RETURN_STATUS_MESSAGE("Precondition Required", *mlen);
+    case 429: RETURN_STATUS_MESSAGE("Too Many Requests", *mlen);
+    case 431: RETURN_STATUS_MESSAGE("Request Header Fields Too Large", *mlen);
+    case 449: RETURN_STATUS_MESSAGE("Retry with", *mlen);                      /* unofficial Microsoft */
+    case 500: RETURN_STATUS_MESSAGE("Internal Server Error", *mlen);
+    case 501: RETURN_STATUS_MESSAGE("Not Implemented", *mlen);
+    case 502: RETURN_STATUS_MESSAGE("Bad Gateway", *mlen);
+    case 503: RETURN_STATUS_MESSAGE("Service Unavailable", *mlen);
+    case 504: RETURN_STATUS_MESSAGE("Gateway Timeout", *mlen);
+    case 505: RETURN_STATUS_MESSAGE("HTTP Version Not Supported", *mlen);
+    case 506: RETURN_STATUS_MESSAGE("Variant Also Negotiates", *mlen);         /* RFC 2295 */
+    case 507: RETURN_STATUS_MESSAGE("Insufficient Storage", *mlen);            /* RFC 2518 (WebDAV) */
+    case 509: RETURN_STATUS_MESSAGE("Bandwidth Limit Exceeded", *mlen);        /* unofficial */
+    case 510: RETURN_STATUS_MESSAGE("Not Extended", *mlen);                    /* RFC 2774 */
+    case 511: RETURN_STATUS_MESSAGE("Network Authentication Required", *mlen);
     default: break;
   }
   /* default to the Nxx group names in RFC 2616 */
   if (100 <= code && code <= 199) {
-    return "Informational";
+    RETURN_STATUS_MESSAGE("Informational", *mlen);
   }
   else if (200 <= code && code <= 299) {
-    return "Success";
-    }
-    else if (300 <= code && code <= 399) {
-        return "Redirection";
-    }
-    else if (400 <= code && code <= 499) {
-        return "Client Error";
-    }
-    else {
-        return "Error";
-    }
+    RETURN_STATUS_MESSAGE("Success", *mlen);
+  }
+  else if (300 <= code && code <= 399) {
+    RETURN_STATUS_MESSAGE("Redirection", *mlen);
+  }
+  else if (400 <= code && code <= 499) {
+    RETURN_STATUS_MESSAGE("Client Error", *mlen);
+  }
+  else {
+    RETURN_STATUS_MESSAGE("Error", *mlen);
+  }
 }
 
 static VALUE cRhebok;
@@ -156,6 +157,8 @@ struct common_header {
 static int common_headers_num = 0;
 static struct common_header common_headers[20];
 
+static char date_buf[sizeof("Date: Sat, 19 Dec 2015 14:16:27 GMT\r\n")-1];
+
 static
 void set_common_header(const char * key, int key_len, const int raw)
 {
@@ -341,7 +344,8 @@ ssize_t _read_timeout(const int fileno, const double timeout, char * read_buf, c
  DO_READ:
   rfds[0].fd = fileno;
   rfds[0].events = POLLIN;
-  rv = read(fileno, read_buf, read_len);
+  //rv = read(fileno, read_buf, read_len);
+  rv = recvfrom(fileno, read_buf, read_len, 0, NULL, NULL);
   if ( rv >= 0 ) {
     return rv;
   }
@@ -438,39 +442,42 @@ int _chunked_header(char *buf, ssize_t len) {
 }
 
 static
-int _date_line(char * date_line) {
+char * _date_header(void) {
+  static time_t last;
   struct tm gtm;
   time_t lt;
   int i = 0;
   time(&lt);
+  if ( last == lt ) return date_buf;
+  last = lt;
   gmtime_r(&lt, &gtm);
-  date_line[i++] = 'D';
-  date_line[i++] = 'a';
-  date_line[i++] = 't';
-  date_line[i++] = 'e';
-  date_line[i++] = ':';
-  date_line[i++] = ' ';
-  str_s(date_line, &i, DoW[gtm.tm_wday], 3);
-  date_line[i++] = ',';
-  date_line[i++] = ' ';
-  str_i(date_line, &i, gtm.tm_mday, 2);
-  date_line[i++] = ' ';
-  str_s(date_line, &i, MoY[gtm.tm_mon], 3);
-  date_line[i++] = ' ';
-  str_i(date_line, &i, gtm.tm_year + 1900, 4);
-  date_line[i++] = ' ';
-  str_i(date_line, &i, gtm.tm_hour,2);
-  date_line[i++] = ':';
-  str_i(date_line, &i, gtm.tm_min,2);
-  date_line[i++] = ':';
-  str_i(date_line, &i, gtm.tm_sec,2);
-  date_line[i++] = ' ';
-  date_line[i++] = 'G';
-  date_line[i++] = 'M';
-  date_line[i++] = 'T';
-  date_line[i++] = 13;
-  date_line[i++] = 10;
-  return i;
+  date_buf[i++] = 'D';
+  date_buf[i++] = 'a';
+  date_buf[i++] = 't';
+  date_buf[i++] = 'e';
+  date_buf[i++] = ':';
+  date_buf[i++] = ' ';
+  str_s(date_buf, &i, DoW[gtm.tm_wday], 3);
+  date_buf[i++] = ',';
+  date_buf[i++] = ' ';
+  str_i(date_buf, &i, gtm.tm_mday, 2);
+  date_buf[i++] = ' ';
+  str_s(date_buf, &i, MoY[gtm.tm_mon], 3);
+  date_buf[i++] = ' ';
+  str_i(date_buf, &i, gtm.tm_year + 1900, 4);
+  date_buf[i++] = ' ';
+  str_i(date_buf, &i, gtm.tm_hour,2);
+  date_buf[i++] = ':';
+  str_i(date_buf, &i, gtm.tm_min,2);
+  date_buf[i++] = ':';
+  str_i(date_buf, &i, gtm.tm_sec,2);
+  date_buf[i++] = ' ';
+  date_buf[i++] = 'G';
+  date_buf[i++] = 'M';
+  date_buf[i++] = 'T';
+  date_buf[i++] = 13;
+  date_buf[i++] = 10;
+  return date_buf;
 }
 
 static
@@ -484,7 +491,7 @@ int _parse_http_request(char *buf, ssize_t buf_len, VALUE env) {
   size_t num_headers, question_at;
   size_t i;
   int ret;
-  char tmp[MAX_HEADER_NAME_LEN + sizeof("HTTP_") - 1];
+  char tmp[MAX_HEADER_NAME_LEN + sizeof("HTTP_") - 1] = "HTTP_";
   VALUE last_value;
 
   num_headers = MAX_HEADERS;
@@ -509,6 +516,7 @@ int _parse_http_request(char *buf, ssize_t buf_len, VALUE env) {
   if (question_at != path_len) ++question_at;
   rb_hash_aset(env, query_string_key, rb_str_new(path + question_at, path_len - question_at));
   last_value = Qnil;
+
   for (i = 0; i < num_headers; ++i) {
     if (headers[i].name != NULL) {
       const char* name;
@@ -516,7 +524,7 @@ int _parse_http_request(char *buf, ssize_t buf_len, VALUE env) {
       VALUE slot;
       VALUE env_key;
       env_key = find_common_header(headers + i);
-      if ( env_key == Qnil ) {
+      if ( NIL_P(env_key) ) {
         const char* s;
         char* d;
         size_t n;
@@ -525,7 +533,6 @@ int _parse_http_request(char *buf, ssize_t buf_len, VALUE env) {
           ret = -1;
           goto done;
         }
-        strcpy(tmp, "HTTP_");
         for (s = headers[i].name, n = headers[i].name_len, d = tmp + 5;
           n != 0;
           s++, --n, d++) {
@@ -536,7 +543,7 @@ int _parse_http_request(char *buf, ssize_t buf_len, VALUE env) {
         }
       }
       slot = rb_hash_aref(env, env_key);
-      if ( slot != Qnil ) {
+      if ( !NIL_P(slot) ) {
         rb_str_cat2(slot, ", ");
         rb_str_cat(slot, headers[i].value, headers[i].value_len);
       } else {
@@ -545,12 +552,11 @@ int _parse_http_request(char *buf, ssize_t buf_len, VALUE env) {
         last_value = slot;
       }
     } else {
-      /* continuing lines of a mulitiline header */
-      if ( last_value != Qnil )
-        rb_str_cat(last_value, headers[i].value, headers[i].value_len);
+      // continuing lines of a mulitiline header
+        if ( !NIL_P(last_value) )
+          rb_str_cat(last_value, headers[i].value, headers[i].value_len);
     }
   }
-
  done:
   return ret;
 }
@@ -622,8 +628,13 @@ VALUE rhe_accept(VALUE self, VALUE fileno, VALUE timeoutv, VALUE tcp, VALUE env)
     buf_len += rv;
   }
 
+  //rv = _write_timeout(fd, timeout, "HTTP/1.0 200 OK\r\nConnection: close\r\n\r\n200 OK\r\n",
+  //                    sizeof("HTTP/1.0 200 OK\r\nConnection: close\r\n\r\n200 OK\r\n") - 1);
+  //close(fd);
+  //goto badexit;
+
   VALUE expect_val = rb_hash_aref(env, expect_key);
-  if ( expect_val != Qnil ) {
+  if ( !NIL_P(expect_val) ) {
       if ( strncmp(RSTRING_PTR(expect_val), "100-continue", RSTRING_LEN(expect_val)) == 0 ) {
           rv = _write_timeout(fd, timeout, EXPECT_CONTINUE, sizeof(EXPECT_CONTINUE) - 1);
           if ( rv <= 0 ) {
@@ -813,10 +824,11 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   ssize_t count;
   int i;
   ssize_t remain;
-  char status_line[512];
-  char date_line[512];
-  char server_line[1032];
+  char status_line[512] = "HTTP/1.1 ";
+  char * date_line;
   int date_pushed = 0;
+  char * server_line;
+  int server_pushed = 0;
   VALUE harr;
   VALUE key_obj;
   VALUE val_obj;
@@ -835,7 +847,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   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;
@@ -847,28 +859,21 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   hlen = RARRAY_LEN(harr);
   blen = RARRAY_LEN(body);
   iovcnt = 10 + (hlen * 2) + blen;
-  if ( use_chunked )
+  if ( use_chunked ) {
       iovcnt += blen*2;
-  chunked_header_buf = ALLOC_N(char, 32 * blen);
+      chunked_header_buf = ALLOC_N(char, 32 * blen);
+  }
 
   {
     struct iovec v[iovcnt]; // Needs C99 compiler
+    size_t mlen;
     /* status line */
     iovcnt = 0;
-    i=0;
-    status_line[i++] = 'H';
-    status_line[i++] = 'T';
-    status_line[i++] = 'T';
-    status_line[i++] = 'P';
-    status_line[i++] = '/';
-    status_line[i++] = '1';
-    status_line[i++] = '.';
-    status_line[i++] = '1';
-    status_line[i++] = ' ';
+    i = sizeof("HTTP/1.1 ") - 1;
     str_i(status_line,&i,status_code,3);
     status_line[i++] = ' ';
-    message = status_message(status_code);
-    str_s(status_line, &i, message, strlen(message));
+    message = status_message(status_code, &mlen);
+    str_s(status_line, &i, message, mlen);
     status_line[i++] = 13;
     status_line[i++] = 10;
     v[iovcnt].iov_base = status_line;
@@ -883,6 +888,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
     iovcnt++;
 
     date_pushed = 0;
+
     for ( i = 0; i < hlen; i++ ) {
       key_obj = rb_ary_entry(harr, i);
       key = RSTRING_PTR(key_obj);
@@ -896,6 +902,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
       val_obj = rb_ary_entry(harr, i);
 
       if ( strncasecmp(key,"Date",key_len) == 0 ) {
+        date_line = ALLOC_N(char, sizeof("Date: ")-1 + RSTRING_LEN(val_obj) + sizeof("\r\n")-1);
         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;
@@ -908,6 +915,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
         continue;
       }
       if ( strncasecmp(key,"Server",key_len) == 0 ) {
+        server_line = ALLOC_N(char, sizeof("Server: ")-1 + RSTRING_LEN(val_obj) + sizeof("\r\n")-1);
         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;
@@ -916,6 +924,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
         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;
+        server_pushed = 1;
         continue;
       }
 
@@ -926,7 +935,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
       v[iovcnt].iov_len = sizeof(": ") - 1;
       iovcnt++;
 
-      /* value */
+      // value
       v[iovcnt].iov_base = RSTRING_PTR(val_obj);
       v[iovcnt].iov_len = RSTRING_LEN(val_obj);
       iovcnt++;
@@ -936,19 +945,20 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
     }
 
     if ( date_pushed == 0 ) {
-      v[1].iov_len = _date_line(date_line);
-      v[1].iov_base = date_line;
+        v[1].iov_len = sizeof("Date: Sat, 19 Dec 2015 14:16:27 GMT\r\n") - 1;
+        v[1].iov_base = _date_header();
     }
 
     if ( use_chunked ) {
-      v[iovcnt].iov_base = "Transfer-Encoding: chunked\r\n";
-      v[iovcnt].iov_len = sizeof("Transfer-Encoding: chunked\r\n") - 1;
+      v[iovcnt].iov_base = "Transfer-Encoding: chunked\r\nConnection: close\r\n\r\n";
+      v[iovcnt].iov_len = sizeof("Transfer-Encoding: chunked\r\nConnection: close\r\n\r\n") - 1;
       iovcnt++;
     }
-
-    v[iovcnt].iov_base = "Connection: close\r\n\r\n";
-    v[iovcnt].iov_len = sizeof("Connection: close\r\n\r\n") - 1;
-    iovcnt++;
+    else {
+        v[iovcnt].iov_base = "Connection: close\r\n\r\n";
+        v[iovcnt].iov_len = sizeof("Connection: close\r\n\r\n") - 1;
+        iovcnt++;
+    }
 
     ssize_t chb_offset = 0;
     for ( i=0; i<blen; i++) {
@@ -1002,7 +1012,12 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
       }
     }
   }
-  xfree(chunked_header_buf);
+  if ( use_chunked )
+      xfree(chunked_header_buf);
+  if ( server_pushed )
+      xfree(server_line);
+  if ( date_pushed )
+      xfree(date_line);
   if ( rv < 0 ) {
     return Qnil;
   }
@@ -1040,7 +1055,8 @@ void Init_rhebok()
 
   expect_key = rb_obj_freeze(rb_str_new2("HTTP_EXPECT"));
   rb_gc_register_address(&expect_key);
-  
+
+  set_common_header("HOST",sizeof("HOST") - 1, 0);
   set_common_header("ACCEPT",sizeof("ACCEPT") - 1, 0);
   set_common_header("ACCEPT-ENCODING",sizeof("ACCEPT-ENCODING") - 1, 0);
   set_common_header("ACCEPT-LANGUAGE",sizeof("ACCEPT-LANGUAGE") - 1, 0);
@@ -1049,7 +1065,6 @@ void Init_rhebok()
   set_common_header("CONTENT-LENGTH",sizeof("CONTENT-LENGTH") - 1, 1);
   set_common_header("CONTENT-TYPE",sizeof("CONTENT-TYPE") - 1, 1);
   set_common_header("COOKIE",sizeof("COOKIE") - 1, 0);
-  set_common_header("HOST",sizeof("HOST") - 1, 0);
   set_common_header("IF-MODIFIED-SINCE",sizeof("IF-MODIFIED-SINCE") - 1, 0);
   set_common_header("REFERER",sizeof("REFERER") - 1, 0);
   set_common_header("USER-AGENT",sizeof("USER-AGENT") - 1, 0);

data/lib/rhebok/version.rb

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

metadata

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