RubyGems - bossan - Versions diffs - 0.1.4 → 0.1.5 - Mend

bossan 0.1.4 → 0.1.5

Files changed (16) hide show

@@ -10,18 +10,20 @@
 #include <inttypes.h>
 #include <arpa/inet.h>
 #include <signal.h>
-#include <sys/sendfile.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#ifdef linux
+#include <sys/sendfile.h>
 #include <sys/prctl.h>
+#elif defined(__APPLE__) || defined(__FreeBSD__)
+#include <sys/uio.h>
+#endif
 #include <sys/un.h>
 #include <sys/stat.h>
 #include <sys/file.h>
-#include <sys/uio.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <netdb.h>
 #include "time_cache.h"
 #include "http_parser.h"
 #include "picoev.h"
@@ -59,7 +61,7 @@
 #define MSG_413 ("HTTP/1.0 413 Request Entity Too Large\r\nContent-Type: text/html\r\nServer: " SERVER "\r\n\r\n<html><head><title>Request Entity Too Large</title></head><body><p>Request Entity Too Large.</p></body></html>")
-#define SERVER "bossan/0.1.4"
+#define SERVER "bossan/0.1.5"
 VALUE server; // Bossan
@@ -205,7 +207,7 @@ typedef struct {
   uint32_t total_size;
 } write_bucket;
-inline buffer *
+ buffer *
 new_buffer(size_t buf_size, size_t limit)
 {
   buffer *buf;
@@ -221,7 +223,7 @@ new_buffer(size_t buf_size, size_t limit)
   return buf;
 }
-inline buffer_result
+ buffer_result
 write2buf(buffer *buf, const char *c, size_t  l) {
   size_t newl;
   char *newbuf;
@@ -248,14 +250,14 @@ write2buf(buffer *buf, const char *c, size_t  l) {
   return ret;
 }
-inline void
+ void
 free_buffer(buffer *buf)
 {
   ruby_xfree(buf->buf);
   ruby_xfree(buf);
 }
-inline VALUE
+ VALUE
 getRbString(buffer *buf)
 {
   VALUE o;
@@ -264,7 +266,7 @@ getRbString(buffer *buf)
   return o;
 }
-inline char *
+ char *
 getString(buffer *buf)
 {
   buf->buf[buf->len] = '\0';
@@ -277,7 +279,7 @@ open_log_file(const char *path)
   return open(path, O_CREAT|O_APPEND|O_WRONLY, 0744);
 }
-static inline int
+static  int
 write_log(const char *new_path, int fd, const char *data, size_t len)
 {
   int openfd;
@@ -356,7 +358,7 @@ write_access_log(client_t *cli, int log_fd, const char *log_path)
   return 0;
 }
-static inline int
+static  int
 blocking_write(client_t *client, char *data, size_t len)
 {
   size_t r = 0, send_len = len;
@@ -425,7 +427,7 @@ send_error_page(client_t *client)
   client->keep_alive = 0;
 }
-static inline void
+static  void
 extent_sndbuf(client_t *client)
 {
   int bufsize = 1024 * 1024 * 2, r;
@@ -433,15 +435,19 @@ extent_sndbuf(client_t *client)
   assert(r == 0);
 }
-static inline void
+static  void
 enable_cork(client_t *client)
 {
   int on = 1, r;
+#ifdef linux
   r = setsockopt(client->fd, IPPROTO_TCP, TCP_CORK, &on, sizeof(on));
+#elif defined(__APPLE__) || defined(__FreeBSD__)
+  r = setsockopt(client->fd, IPPROTO_TCP, TCP_NOPUSH, &on, sizeof(on));
+#endif
   assert(r == 0);
 }
-static inline write_bucket *
+static  write_bucket *
 new_write_bucket(int fd, int cnt)
 {
   write_bucket *bucket;
@@ -454,14 +460,14 @@ new_write_bucket(int fd, int cnt)
   return bucket;
 }
-static inline void
+static  void
 free_write_bucket(write_bucket *bucket)
 {
   ruby_xfree(bucket->iov);
   ruby_xfree(bucket);
 }
-static inline void
+static  void
 set2bucket(write_bucket *bucket, char *buf, size_t len)
 {
   bucket->iov[bucket->iov_cnt].iov_base = buf;
@@ -471,7 +477,7 @@ set2bucket(write_bucket *bucket, char *buf, size_t len)
   bucket->total_size += len;
 }
-static inline void
+static  void
 add_header(write_bucket *bucket, char *key, size_t keylen, char *val, size_t vallen)
 {
   set2bucket(bucket, key, keylen);
@@ -480,7 +486,7 @@ add_header(write_bucket *bucket, char *key, size_t keylen, char *val, size_t val
   set2bucket(bucket, CRLF, 2);
 }
-static inline int
+static  int
 writev_bucket(write_bucket *data)
 {
   size_t w;
@@ -528,7 +534,7 @@ writev_bucket(write_bucket *data)
   return 1;
 }
-static inline int
+static  int
 write_headers(client_t *client)
 {
   if(client->header_done){
@@ -645,7 +651,7 @@ write_headers(client_t *client)
   return -1;
 }
-/* static inline int */
+/* static  int */
 /* write_sendfile(int out_fd, int in_fd, size_t count) */
 /* { */
 /*   int size = (int)count; */
@@ -664,7 +670,7 @@ write_headers(client_t *client)
 /*   return sendfile(out_fd, in_fd, NULL, count); */
 /* } */
-static inline void
+static  void
 close_response(client_t *client)
 {
   //send all response
@@ -682,7 +688,7 @@ collect_body(VALUE i, VALUE str, int argc, VALUE *argv)
   return Qnil;
 }
-static inline int
+static  int
 processs_write(client_t *client)
 {
   VALUE iterator = NULL;
@@ -736,7 +742,7 @@ processs_write(client_t *client)
   return 1;
 }
-inline int
+ int
 process_body(client_t *client)
 {
   int ret;
@@ -759,7 +765,7 @@ process_body(client_t *client)
   return ret;
 }
-static inline int
+static  int
 start_response_write(client_t *client)
 {
   VALUE iterator;
@@ -788,7 +794,7 @@ start_response_write(client_t *client)
   return write_headers(client);
 }
-inline int
+ int
 response_start(client_t *client)
 {
   int ret;
@@ -807,7 +813,7 @@ response_start(client_t *client)
   return ret;
 }
-inline request *
+ request *
 new_request(void)
 {
   request *req = (request *)ruby_xmalloc(sizeof(request));
@@ -815,7 +821,7 @@ new_request(void)
   return req;
 }
-inline header *
+ header *
 new_header(size_t fsize, size_t flimit, size_t vsize, size_t vlimit)
 {
   header *h;
@@ -825,13 +831,13 @@ new_header(size_t fsize, size_t flimit, size_t vsize, size_t vlimit)
   return h;
 }
-inline void
+ void
 free_header(header *h)
 {
   ruby_xfree(h);
 }
-inline void
+ void
 free_request(request *req)
 {
   uint32_t i;
@@ -864,7 +870,7 @@ free_request(request *req)
   ruby_xfree(req);
 }
-static inline void
+static  void
 key_upper(char *s, const char *key, size_t len)
 {
   int i = 0;
@@ -883,7 +889,7 @@ key_upper(char *s, const char *key, size_t len)
   }
 }
-static inline int
+static  int
 write_body2file(client_t *client, const char *buffer, size_t buffer_len)
 {
   FILE *tmp = (FILE *)client->body;
@@ -895,7 +901,7 @@ write_body2file(client_t *client, const char *buffer, size_t buffer_len)
   return client->body_readed;
 }
-static inline int
+static  int
 write_body2mem(client_t *client, const char *buffer, size_t buffer_len)
 {
   printf("body2mem called\n");
@@ -908,7 +914,7 @@ write_body2mem(client_t *client, const char *buffer, size_t buffer_len)
   return client->body_readed;
 }
-static inline int
+static  int
 write_body(client_t *cli, const char *buffer, size_t buffer_len)
 {
   return write_body2mem(cli, buffer, buffer_len);
@@ -920,7 +926,7 @@ typedef enum{
   OTHER
 } rack_header_type;
-static inline rack_header_type
+static  rack_header_type
 check_header_type(const char *buf)
 {
   if(*buf++ != 'C'){
@@ -956,7 +962,7 @@ check_header_type(const char *buf)
   return OTHER;
 }
-static inline client_t *
+static  client_t *
 get_client(http_parser *p)
 {
   return (client_t *)p->data;
@@ -1319,7 +1325,7 @@ static http_parser_settings settings =
   ,.on_message_complete = message_complete_cb
   };
-inline int
+ int
 init_parser(client_t *cli, const char *name, const short port)
 {
   register VALUE object;
@@ -1360,19 +1366,19 @@ init_parser(client_t *cli, const char *name, const short port)
   return 0;
 }
-inline size_t
+ size_t
 execute_parse(client_t *cli, const char *data, size_t len)
 {
   return http_parser_execute(cli->http, &settings, data, len);
 }
-inline int
+ int
 parser_finish(client_t *cli)
 {
   return cli->complete;
 }
-inline void
+ void
 setup_static_env(char *name, int port)
 {
   version_val = rb_obj_freeze(rb_ary_new3(2, INT2FIX(1), INT2FIX(1)));
@@ -1418,7 +1424,7 @@ setup_static_env(char *name, int port)
   http_user_agent = rb_obj_freeze(rb_str_new2("HTTP_USER_AGENT"));
 }
-static inline int
+static  int
 setsig(int sig, void* handler)
 {
   struct sigaction context, ocontext;
@@ -1428,7 +1434,7 @@ setsig(int sig, void* handler)
   return sigaction(sig, &context, &ocontext);
 }
-static inline void
+static  void
 setup_sock(int fd)
 {
   int on = 1, r;
@@ -1438,19 +1444,22 @@ setup_sock(int fd)
   assert(r == 0);
 }
-static inline void
+static  void
 disable_cork(client_t *client)
 {
   int off = 0;
   int on = 1, r;
+#ifdef linux
   r = setsockopt(client->fd, IPPROTO_TCP, TCP_CORK, &off, sizeof(off));
+#elif defined(__APPLE__) || defined(__FreeBSD__)
+  r = setsockopt(client->fd, IPPROTO_TCP, TCP_NOPUSH, &off, sizeof(off));
+#endif
   assert(r == 0);
   r = setsockopt(client->fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
   assert(r == 0);
 }
-static inline client_t *
+static  client_t *
 new_client_t(int client_fd, struct sockaddr_in client_addr){
   client_t *client;
@@ -1469,7 +1478,7 @@ new_client_t(int client_fd, struct sockaddr_in client_addr){
   return client;
 }
-static inline void
+static  void
 clean_cli(client_t *client)
 {
   write_access_log(client, log_fd, log_path);
@@ -1484,7 +1493,7 @@ clean_cli(client_t *client)
   }
 }
-static inline void
+static  void
 close_conn(client_t *cli, picoev_loop* loop)
 {
   if(!cli->keep_alive){
@@ -1515,7 +1524,7 @@ close_conn(client_t *cli, picoev_loop* loop)
   }
 }
-static inline int
+static  int
 process_rack_app(client_t *cli)
 {
   VALUE args = NULL;
@@ -1587,7 +1596,7 @@ w_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
   }
 }
-static inline void
+static  void
 call_rack_app(client_t *client, picoev_loop* loop)
 {
   int ret;
@@ -1622,7 +1631,7 @@ call_rack_app(client_t *client, picoev_loop* loop)
   }
 }
-static inline void
+static  void
 prepare_call_rack(client_t *client)
 {
   VALUE input = NULL, object = NULL, c = NULL;
@@ -1744,7 +1753,8 @@ accept_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
     return;
   }else if ((events & PICOEV_READ) != 0) {
     socklen_t client_len = sizeof(client_addr);
-    client_fd = accept4(fd, (struct sockaddr *)&client_addr, &client_len, SOCK_NONBLOCK | SOCK_CLOEXEC);
+    //client_fd = accept4(fd, (struct sockaddr *)&client_addr, &client_len, SOCK_NONBLOCK | SOCK_CLOEXEC);
+    client_fd = accept(fd, (struct sockaddr *)&client_addr, &client_len);
     if (client_fd != -1) {
 #ifdef DEBUG
       printf("accept fd %d \n", client_fd);
@@ -1771,7 +1781,7 @@ accept_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
   }
 }
-static inline void
+static  void
 setup_server_env(void)
 {
   setup_sock(listen_sock);
@@ -1780,7 +1790,7 @@ setup_server_env(void)
   setup_static_env(server_name, server_port);
 }
-static inline int
+static  int
 inet_listen(void)
 {
   struct addrinfo hints, *servinfo, *p;
@@ -1849,7 +1859,7 @@ inet_listen(void)
   return 1;
 }
-static inline int
+static  int
 check_unix_sockpath(char *sock_name)
 {
   if(!access(sock_name, F_OK)){
@@ -1860,7 +1870,7 @@ check_unix_sockpath(char *sock_name)
   return 1;
 }
-static inline int
+static  int
 unix_listen(char *sock_name)
 {
   int flag = 1;

data/ext/bossan/http_parser.c CHANGED

@@ -1,7 +1,4 @@
 /* Copyright 2009,2010 Ryan Dahl <ry@tinyclouds.org>
- *
- * Some parts of this source file were taken from NGINX
- * (src/http/ngx_http_parser.c) copyright (C) 2002-2009 Igor Sysoev.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -122,18 +119,44 @@ static const char *method_strings[] =
   };
-static const char lowcase[256] =
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  " \0\0\0\0\0\0\0\0\0\0\0\0-\0\0" "0123456789\0\0\0\0\0\0"
-  "\0abcdefghijklmnopqrstuvwxyz\0\0\0\0_"
-  "\0abcdefghijklmnopqrstuvwxyz\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-static const int unhex[] =
+/* ' ', '_', '-' and all alpha-numeric ascii characters are accepted by acceptable_header.
+   The 'A'-'Z' are lower-cased.  */
+static const char acceptable_header[256] = {
+/*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
+       ' ',      0,       0,       0,       0,       0,       0,       0,
+/*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
+        0,       0,       0,       0,       0,      '-',      0,       0,
+/*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
+       '0',     '1',     '2',     '3',     '4',     '5',     '6',     '7',
+/*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
+       '8',     '9',      0,       0,       0,       0,       0,       0,
+/*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
+        0,      'a',     'b',     'c',     'd',     'e',     'f',     'g',
+/*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
+       'h',     'i',     'j',     'k',     'l',     'm',     'n',     'o',
+/*  80  P    81  Q    82  R    83  S    84  T    85  U    86  V    87  W  */
+       'p',     'q',     'r',     's',     't',     'u',     'v',     'w',
+/*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
+       'x',     'y',     'z',      0,       0,       0,       0,      '_',
+/*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
+        0,      'a',     'b',     'c',     'd',     'e',     'f',     'g',
+/* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
+       'h',     'i',     'j',     'k',     'l',     'm',     'n',     'o',
+/* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
+       'p',     'q',     'r',     's',     't',     'u',     'v',     'w',
+/* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
+       'x',     'y',     'z',      0,       0,       0,       0,       0 };
+static const int8_t unhex[256] =
   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
   ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
   ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
@@ -145,26 +168,39 @@ static const int unhex[] =
   };
-static const uint32_t  usual[] = {
-    0xffffdbfe, /* 1111 1111 1111 1111  1101 1011 1111 1110 */
-                /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
-    0x7ffffff6, /* 0111 1111 1111 1111  1111 1111 1111 0110 */
-                /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
-    0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-                /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-    0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-    0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-    0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-    0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-    0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-};
-#define USUAL(c) (usual[c >> 5] & (1 << (c & 0x1f)))
+static const uint8_t normal_url_char[256] = {
+/*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
+        0,       1,       1,       0,       1,       1,       1,       1,
+/*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
+        1,       1,       1,       1,       1,       1,       1,       1,
+/*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
+        1,       1,       1,       1,       1,       1,       1,       1,
+/*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
+        1,       1,       1,       1,       1,       1,       1,       0,
+/*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
+        1,       1,       1,       1,       1,       1,       1,       1,
+/*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
+        1,       1,       1,       1,       1,       1,       1,       1,
+/*  80  P    81  Q    82  R    83  S    84  T    85  U    86  V    87  W  */
+        1,       1,       1,       1,       1,       1,       1,       1,
+/*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
+        1,       1,       1,       1,       1,       1,       1,       1,
+/*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
+        1,       1,       1,       1,       1,       1,       1,       1,
+/* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
+        1,       1,       1,       1,       1,       1,       1,       1,
+/* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
+        1,       1,       1,       1,       1,       1,       1,       1,
+/* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
+        1,       1,       1,       1,       1,       1,       1,       0 };
 enum state
@@ -705,7 +741,7 @@ size_t http_parser_execute (http_parser *parser,
       case s_req_path:
       {
-        if (USUAL(ch)) break;
+        if (normal_url_char[(unsigned char)ch]) break;
         switch (ch) {
           case ' ':
@@ -741,7 +777,7 @@ size_t http_parser_execute (http_parser *parser,
       case s_req_query_string_start:
       {
-        if (USUAL(ch)) {
+        if (normal_url_char[(unsigned char)ch]) {
           MARK(query_string);
           state = s_req_query_string;
           break;
@@ -775,7 +811,7 @@ size_t http_parser_execute (http_parser *parser,
       case s_req_query_string:
       {
-        if (USUAL(ch)) break;
+        if (normal_url_char[(unsigned char)ch]) break;
         switch (ch) {
           case '?':
@@ -810,7 +846,7 @@ size_t http_parser_execute (http_parser *parser,
       case s_req_fragment_start:
       {
-        if (USUAL(ch)) {
+        if (normal_url_char[(unsigned char)ch]) {
           MARK(fragment);
           state = s_req_fragment;
           break;
@@ -845,7 +881,7 @@ size_t http_parser_execute (http_parser *parser,
       case s_req_fragment:
       {
-        if (USUAL(ch)) break;
+        if (normal_url_char[(unsigned char)ch]) break;
         switch (ch) {
           case ' ':
@@ -1021,7 +1057,7 @@ size_t http_parser_execute (http_parser *parser,
       case s_header_field:
       {
-        c = lowcase[(unsigned char)ch];
+        c = acceptable_header[(unsigned char)ch];
         if (c) {
           switch (header_state) {
@@ -1158,7 +1194,7 @@ size_t http_parser_execute (http_parser *parser,
         state = s_header_value;
         index = 0;
-        c = lowcase[(unsigned char)ch];
+        c = acceptable_header[(unsigned char)ch];
         if (!c) {
           if (ch == CR) {
@@ -1221,7 +1257,7 @@ size_t http_parser_execute (http_parser *parser,
       case s_header_value:
       {
-        c = lowcase[(unsigned char)ch];
+        c = acceptable_header[(unsigned char)ch];
         if (!c) {
           if (ch == CR) {
@@ -1428,7 +1464,7 @@ size_t http_parser_execute (http_parser *parser,
       {
         assert(parser->flags & F_CHUNKED);
-        c = unhex[(int)ch];
+        c = unhex[(unsigned char)ch];
         if (c == -1) goto error;
         parser->content_length = c;
         state = s_chunk_size;
@@ -1444,7 +1480,7 @@ size_t http_parser_execute (http_parser *parser,
           break;
         }
-        c = unhex[(int)ch];
+        c = unhex[(unsigned char)ch];
         if (c == -1) {
           if (ch == ';' || ch == ' ') {
@@ -1575,4 +1611,5 @@ http_parser_init (http_parser *parser, enum http_parser_type t)
   parser->nread = 0;
   parser->upgrade = 0;
   parser->flags = 0;
+  parser->method = 0;
 }

data/ext/bossan/http_parser.h CHANGED

@@ -100,15 +100,14 @@ enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE, HTTP_BOTH };
 struct http_parser {
   /** PRIVATE **/
-  unsigned char type;
+  unsigned char type : 2;
+  unsigned char flags : 6;
   unsigned char state;
   unsigned char header_state;
   unsigned char index;
   char maybe_ml;
-  char flags;
-  uint64_t nread;
+  uint32_t nread;
   int64_t content_length;
   /** READ-ONLY **/

data/ext/bossan/picoev_epoll.c CHANGED

@@ -64,7 +64,8 @@ picoev_loop* picoev_create_loop(int max_timeout)
     free(loop);
     return NULL;
   }
+  loop->loop.now = time(NULL);
   return &loop->loop;
 }

data/lib/bossan/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Bossan
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bossan
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease:
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
-dependencies: []
+date: 2013-01-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: high performance asynchronous rack web server
 email:
 - kubo39@gmail.com
@@ -19,28 +35,18 @@ extensions:
 - ext/bossan/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- Gemfile
 - LICENSE.txt
-- README.md
-- Rakefile
-- bossan.gemspec
-- examples/config.ru
-- examples/hello.rb
-- examples/sinatra_app.rb
-- examples/views/index.haml
-- examples/views_sample.rb
-- ext/bossan/bossan_ext.c
-- ext/bossan/extconf.rb
-- ext/bossan/http_parser.c
+- lib/bossan/version.rb
+- lib/rack/handler/bossan.rb
+- lib/bossan.rb
 - ext/bossan/http_parser.h
-- ext/bossan/picoev.h
 - ext/bossan/picoev_epoll.c
 - ext/bossan/time_cache.c
+- ext/bossan/picoev.h
 - ext/bossan/time_cache.h
-- lib/bossan.rb
-- lib/bossan/version.rb
-- lib/rack/handler/bossan.rb
+- ext/bossan/bossan_ext.c
+- ext/bossan/extconf.rb
+- ext/bossan/http_parser.c
 homepage: https://github.com/kubo39/bossan
 licenses: []
 post_install_message:
@@ -53,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/.gitignore DELETED

@@ -1,19 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.o
-Makefile

data/Gemfile DELETED

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-# Specify your gem's dependencies in bossan.gemspec
-gemspec

data/README.md DELETED

@@ -1,50 +0,0 @@
-# Bossan
-Bossan is a high performance asynchronous rack web server.
-## Requirements
-Bossan requires Ruby 1.9.2 or later.
-Bossan supports Linux only.
-## Installation
-Add this line to your application's Gemfile:
-    gem 'bossan'
-And then execute:
-    $ bundle
-Or install it yourself as:
-    $ gem install bossan
-## Usage
-simple rack app:
-``` ruby
-require 'bossan'
-Bossan.run('127.0.0.1', 8000, proc {|env|
-  [
-   200,          # Status code
-   {             # Response headers
-     'Content-Type' => 'text/html',
-     'Content-Length' => '13',
-   },
-   ['hello, world!']        # Response body
-  ]
-})
-```
-## Contributing
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/Rakefile DELETED

@@ -1,15 +0,0 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
-task :default => [:compile, :clean]
-task :compile do
-  Dir.chdir File.expand_path("../ext/bossan", __FILE__)
-  system "ruby extconf.rb"
-  system "make"
-end
-task :clean do
-  Dir.chdir File.expand_path("../ext/bossan", __FILE__)
-  system "rm -f *.o Makefile"
-end

data/bossan.gemspec DELETED

@@ -1,16 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/bossan/version', __FILE__)
-Gem::Specification.new do |gem|
-  gem.name          = "bossan"
-  gem.version       = Bossan::VERSION
-  gem.authors       = ["Hiroki Noda"]
-  gem.email         = ["kubo39@gmail.com"]
-  gem.description   = %q{high performance asynchronous rack web server}
-  gem.summary       = gem.description
-  gem.homepage      = "https://github.com/kubo39/bossan"
-  gem.files         = `git ls-files`.split($/)
-  gem.extensions    = ["ext/bossan/extconf.rb"]
-  gem.require_paths = ["lib", "ext"]
-end

data/examples/config.ru DELETED

@@ -1,19 +0,0 @@
-require 'bossan'
-require 'pp'
-class MyApp
-  def call env
-    body = ['hi!']
-    # pp env
-    [
-     200, # Status code
-     { 'Content-Type' => 'text/html',
-       'Content-Length' => body.join.size.to_s,
-     }, # Reponse headers
-     body # Body of the response
-    ]
-  end
-end
-# Rack::Handler::Bossan.run MyApp.new
-run MyApp.new

data/examples/hello.rb DELETED

@@ -1,12 +0,0 @@
-require 'bossan'
-Bossan.run('127.0.0.1', 8000, proc {|env|
-  [
-   200,          # Status code
-   {             # Response headers
-     'Content-Type' => 'text/html',
-     'Content-Length' => '13',
-   },
-   ['hello, world!']        # Response body
-  ]
-})

data/examples/sinatra_app.rb DELETED

@@ -1,11 +0,0 @@
-require 'bossan'
-require 'sinatra/base'
-class App < Sinatra::Base
-  get '/' do
-    'Hello world!'
-  end
-end
-Bossan.run('127.0.0.1', 8000, App)

data/examples/views/index.haml DELETED

@@ -1,10 +0,0 @@
-!!!
-%html
-  %head
-    %title Hello, Bossan!
-  %body
-    #header
-      %h1 Hello, Bossan!
-    #content
-      %p
-        Hello, World!

data/examples/views_sample.rb DELETED

@@ -1,11 +0,0 @@
-require 'bossan'
-require 'sinatra/base'
-require 'haml'
-class App < Sinatra::Base
-  get '/' do
-    haml :index
-  end
-end
-Bossan.run('127.0.0.1', 8000, App)