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

bossan 0.1.5 → 0.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

data/ext/bossan/bossan_ext.c CHANGED

@@ -61,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.5"
+#define SERVER "bossan/0.1.6"
 VALUE server; // Bossan
@@ -99,6 +99,7 @@ static VALUE http_connection;
 static VALUE empty_string;
 static VALUE http_user_agent;
+static VALUE http_referer;
 static VALUE i_keys;
 static VALUE i_call;
@@ -107,7 +108,7 @@ static VALUE i_key;
 static VALUE i_each;
 static VALUE i_close;
-static char *server_name = "127.0.0.1";
+static const char *server_name = "127.0.0.1";
 static short server_port = 8000;
 static int listen_sock;  // listen socket
@@ -116,7 +117,7 @@ static char *unix_sock_name = NULL;
 static int loop_done; // main loop flag
 static picoev_loop* main_loop; //main loop
-static VALUE rack_app = NULL; //rack app
+static VALUE rack_app; //rack app
 static char *log_path = NULL; //access log path
 static int log_fd = -1; //access log
@@ -207,7 +208,8 @@ typedef struct {
   uint32_t total_size;
 } write_bucket;
- buffer *
+buffer *
 new_buffer(size_t buf_size, size_t limit)
 {
   buffer *buf;
@@ -223,8 +225,10 @@ new_buffer(size_t buf_size, size_t limit)
   return buf;
 }
- buffer_result
-write2buf(buffer *buf, const char *c, size_t  l) {
+buffer_result
+write2buf(buffer *buf, const char *c, size_t l)
+{
   size_t newl;
   char *newbuf;
   buffer_result ret = WRITE_OK;
@@ -250,14 +254,16 @@ write2buf(buffer *buf, const char *c, size_t  l) {
   return ret;
 }
- void
+void
 free_buffer(buffer *buf)
 {
   ruby_xfree(buf->buf);
   ruby_xfree(buf);
 }
- VALUE
+VALUE
 getRbString(buffer *buf)
 {
   VALUE o;
@@ -266,20 +272,23 @@ getRbString(buffer *buf)
   return o;
 }
- char *
+char *
 getString(buffer *buf)
 {
   buf->buf[buf->len] = '\0';
   return buf->buf;
 }
 int
 open_log_file(const char *path)
 {
   return open(path, O_CREAT|O_APPEND|O_WRONLY, 0744);
 }
-static  int
+static int
 write_log(const char *new_path, int fd, const char *data, size_t len)
 {
   int openfd;
@@ -306,45 +315,54 @@ write_log(const char *new_path, int fd, const char *data, size_t len)
   return fd;
 }
 int
 write_access_log(client_t *cli, int log_fd, const char *log_path)
 {
-  char buf[1024];
+  char buf[1024*4];
   if(log_fd > 0){
     VALUE obj;
-    char *method, *path, *version, *ua;
+    char *method, *path, *version, *ua, *referer;
     obj = rb_hash_aref(cli->environ, request_method);
-    if(obj){
+    if(obj != Qnil){
       method = StringValuePtr(obj);
     }else{
       method = "-";
     }
     obj = rb_hash_aref(cli->environ, path_info);
-    if(obj){
+    if(obj != Qnil){
       path = StringValuePtr(obj);
     }else{
       path = "-";
     }
     obj = rb_hash_aref(cli->environ, server_protocol);
-    if(obj){
+    if(obj != Qnil){
       version = StringValuePtr(obj);
     }else{
       version = "-";
     }
     obj = rb_hash_aref(cli->environ, http_user_agent);
-    if(obj){
+    if(obj != Qnil){
       ua = StringValuePtr(obj);
     }else{
       ua = "-";
     }
+    obj = rb_hash_aref(cli->environ, http_referer);
+    if(obj != Qnil){
+      referer = StringValuePtr(obj);
+    }else{
+      referer = "-";
+    }
     //update
     cache_time_update();
-    sprintf(buf, "%s - - [%s] \"%s %s %s\" %d %d \"-\" \"%s\"\n",
+    sprintf(buf, "%s - - [%s] \"%s %s %s\" %d %d \"%s\" \"%s\"\n",
 	    cli->remote_addr,
 	    http_log_time,
 	    method,
@@ -352,13 +370,15 @@ write_access_log(client_t *cli, int log_fd, const char *log_path)
 	    version,
 	    cli->status_code,
 	    cli->write_bytes,
+	    referer,
 	    ua);
     return write_log(log_path, log_fd, buf, strlen(buf));
   }
   return 0;
 }
-static  int
+static int
 blocking_write(client_t *client, char *data, size_t len)
 {
   size_t r = 0, send_len = len;
@@ -373,19 +393,26 @@ blocking_write(client_t *client, char *data, size_t len)
       break;
     case -1:
       if (errno == EAGAIN || errno == EWOULDBLOCK) { /* try again later */
-	//printf("EAGAIN \n");
 	usleep(500); //TODO try again later
 	break;
       }else{
 	// fatal error
 	//close
-	rb_raise(rb_eException, "fatal error");
-	// TODO:
-	// raise exception from errno
-	/* rb_raise(rb_eIOError); */
-	/* write_error_log(__FILE__, __LINE__); */
-	client->keep_alive = 0;
+	if(errno == EPIPE){
+	  // Connection reset by peer
+	  client->keep_alive = 0;
+	  client->status_code = 500;
+	  client->header_done = 1;
+	  client->response_closed = 1;
+	}else{
+	  // TODO:
+	  // raise exception from errno
+	  /* write_error_log(__FILE__, __LINE__); */
+	  client->keep_alive = 0;
+	}
 	return -1;
       }
     default:
@@ -397,6 +424,7 @@ blocking_write(client_t *client, char *data, size_t len)
   return 1;
 }
 void
 send_error_page(client_t *client)
 {
@@ -425,9 +453,12 @@ send_error_page(client_t *client)
     break;
   }
   client->keep_alive = 0;
+  client->header_done = 1;
+  client->response_closed = 1;
 }
-static  void
+static void
 extent_sndbuf(client_t *client)
 {
   int bufsize = 1024 * 1024 * 2, r;
@@ -435,7 +466,8 @@ extent_sndbuf(client_t *client)
   assert(r == 0);
 }
-static  void
+static void
 enable_cork(client_t *client)
 {
   int on = 1, r;
@@ -447,7 +479,8 @@ enable_cork(client_t *client)
   assert(r == 0);
 }
-static  write_bucket *
+static write_bucket *
 new_write_bucket(int fd, int cnt)
 {
   write_bucket *bucket;
@@ -460,14 +493,16 @@ new_write_bucket(int fd, int cnt)
   return bucket;
 }
-static  void
+static void
 free_write_bucket(write_bucket *bucket)
 {
   ruby_xfree(bucket->iov);
   ruby_xfree(bucket);
 }
-static  void
+static void
 set2bucket(write_bucket *bucket, char *buf, size_t len)
 {
   bucket->iov[bucket->iov_cnt].iov_base = buf;
@@ -477,7 +512,8 @@ set2bucket(write_bucket *bucket, char *buf, size_t len)
   bucket->total_size += len;
 }
-static  void
+static void
 add_header(write_bucket *bucket, char *key, size_t keylen, char *val, size_t vallen)
 {
   set2bucket(bucket, key, keylen);
@@ -486,10 +522,11 @@ add_header(write_bucket *bucket, char *key, size_t keylen, char *val, size_t val
   set2bucket(bucket, CRLF, 2);
 }
-static  int
+static int
 writev_bucket(write_bucket *data)
 {
-  size_t w;
+  ssize_t w;
   int i = 0;
   w = writev(data->fd, data->iov, data->iov_cnt);
   if(w == -1){
@@ -499,7 +536,6 @@ writev_bucket(write_bucket *data)
       return 0;
     }else{
       //ERROR
-      rb_raise(rb_eException, "fatal error");
       // TODO:
       // raise exception from errno
@@ -534,7 +570,8 @@ writev_bucket(write_bucket *data)
   return 1;
 }
-static  int
+static int
 write_headers(client_t *client)
 {
   if(client->header_done){
@@ -543,8 +580,8 @@ write_headers(client_t *client)
   write_bucket *bucket;
   uint32_t i = 0, hlen = 0;
-  VALUE arr = NULL;
-  VALUE object = NULL;
+  VALUE arr;
+  VALUE object;
   char *name = NULL;
   ssize_t namelen;
   char *value = NULL;
@@ -651,7 +688,8 @@ write_headers(client_t *client)
   return -1;
 }
-/* static  int */
+/* static int */
 /* write_sendfile(int out_fd, int in_fd, size_t count) */
 /* { */
 /*   int size = (int)count; */
@@ -670,7 +708,8 @@ write_headers(client_t *client)
 /*   return sendfile(out_fd, in_fd, NULL, count); */
 /* } */
-static  void
+static void
 close_response(client_t *client)
 {
   //send all response
@@ -678,6 +717,7 @@ close_response(client_t *client)
   client->response_closed = 1;
 }
 static VALUE
 collect_body(VALUE i, VALUE str, int argc, VALUE *argv)
 {
@@ -688,21 +728,22 @@ collect_body(VALUE i, VALUE str, int argc, VALUE *argv)
   return Qnil;
 }
-static  int
+static int
 processs_write(client_t *client)
 {
-  VALUE iterator = NULL;
+  VALUE iterator;
   VALUE v_body;
   VALUE item;
   char *buf;
-  ssize_t buflen;
+  size_t buflen;
   write_bucket *bucket;
   int ret;
   // body
   iterator = client->response_iter;
-  if(iterator != NULL){
+  if(iterator != Qnil){
     if (TYPE(iterator) != T_ARRAY || RARRAY_LEN(iterator) != 3){
       return -1;
     }
@@ -742,7 +783,8 @@ processs_write(client_t *client)
   return 1;
 }
- int
+int
 process_body(client_t *client)
 {
   int ret;
@@ -765,7 +807,8 @@ process_body(client_t *client)
   return ret;
 }
-static  int
+static int
 start_response_write(client_t *client)
 {
   VALUE iterator;
@@ -794,7 +837,8 @@ start_response_write(client_t *client)
   return write_headers(client);
 }
- int
+int
 response_start(client_t *client)
 {
   int ret;
@@ -813,7 +857,8 @@ response_start(client_t *client)
   return ret;
 }
- request *
+request *
 new_request(void)
 {
   request *req = (request *)ruby_xmalloc(sizeof(request));
@@ -821,7 +866,8 @@ new_request(void)
   return req;
 }
- header *
+header *
 new_header(size_t fsize, size_t flimit, size_t vsize, size_t vlimit)
 {
   header *h;
@@ -831,13 +877,15 @@ new_header(size_t fsize, size_t flimit, size_t vsize, size_t vlimit)
   return h;
 }
- void
+void
 free_header(header *h)
 {
   ruby_xfree(h);
 }
- void
+void
 free_request(request *req)
 {
   uint32_t i;
@@ -870,7 +918,8 @@ free_request(request *req)
   ruby_xfree(req);
 }
-static  void
+static void
 key_upper(char *s, const char *key, size_t len)
 {
   int i = 0;
@@ -889,7 +938,8 @@ key_upper(char *s, const char *key, size_t len)
   }
 }
-static  int
+static int
 write_body2file(client_t *client, const char *buffer, size_t buffer_len)
 {
   FILE *tmp = (FILE *)client->body;
@@ -901,10 +951,11 @@ write_body2file(client_t *client, const char *buffer, size_t buffer_len)
   return client->body_readed;
 }
-static  int
+static int
 write_body2mem(client_t *client, const char *buffer, size_t buffer_len)
 {
-  printf("body2mem called\n");
+  /* printf("body2mem called\n"); */
   VALUE obj = (VALUE)client->body;
   rb_str_concat(obj, rb_str_new(buffer, buffer_len));
   client->body_readed += buffer_len;
@@ -914,18 +965,21 @@ write_body2mem(client_t *client, const char *buffer, size_t buffer_len)
   return client->body_readed;
 }
-static  int
+static int
 write_body(client_t *cli, const char *buffer, size_t buffer_len)
 {
   return write_body2mem(cli, buffer, buffer_len);
 }
 typedef enum{
   CONTENT_TYPE,
   CONTENT_LENGTH,
   OTHER
 } rack_header_type;
 static  rack_header_type
 check_header_type(const char *buf)
 {
@@ -962,25 +1016,28 @@ check_header_type(const char *buf)
   return OTHER;
 }
-static  client_t *
+static client_t *
 get_client(http_parser *p)
 {
   return (client_t *)p->data;
 }
 int
 message_begin_cb(http_parser *p)
 {
   return 0;
 }
 int
 header_field_cb (http_parser *p, const char *buf, size_t len, char partial)
 {
   uint32_t i;
-  register header *h;
+  header *h;
   client_t *client = get_client(p);
-  register request *req = client->req;
+  request *req = client->req;
   char temp[len];
   buffer_result ret = MEMORY_ERROR;
@@ -1020,13 +1077,14 @@ header_field_cb (http_parser *p, const char *buf, size_t len, char partial)
   return 0;
 }
 int
 header_value_cb (http_parser *p, const char *buf, size_t len, char partial)
 {
   uint32_t i;
-  register header *h;
+  header *h;
   client_t *client = get_client(p);
-  register request *req = client->req;
+  request *req = client->req;
   buffer_result ret = MEMORY_ERROR;
   i = req->num_headers;
@@ -1049,11 +1107,12 @@ header_value_cb (http_parser *p, const char *buf, size_t len, char partial)
   return 0;
 }
 int
 request_path_cb (http_parser *p, const char *buf, size_t len, char partial)
 {
   client_t *client = get_client(p);
-  register request *req = client->req;
+  request *req = client->req;
   buffer_result ret = MEMORY_ERROR;
   if(req->path){
@@ -1075,6 +1134,7 @@ request_path_cb (http_parser *p, const char *buf, size_t len, char partial)
   return 0;
 }
 int
 request_uri_cb (http_parser *p, const char *buf, size_t len, char partial)
 {
@@ -1101,11 +1161,12 @@ request_uri_cb (http_parser *p, const char *buf, size_t len, char partial)
   return 0;
 }
 int
 query_string_cb (http_parser *p, const char *buf, size_t len, char partial)
 {
   client_t *client = get_client(p);
-  register request *req = client->req;
+  request *req = client->req;
   buffer_result ret = MEMORY_ERROR;
   if(req->query_string){
@@ -1127,6 +1188,7 @@ query_string_cb (http_parser *p, const char *buf, size_t len, char partial)
   return 0;
 }
 int
 fragment_cb (http_parser *p, const char *buf, size_t len, char partial)
 {
@@ -1153,6 +1215,7 @@ fragment_cb (http_parser *p, const char *buf, size_t len, char partial)
   return 0;
 }
 int
 body_cb (http_parser *p, const char *buf, size_t len, char partial)
 {
@@ -1180,15 +1243,16 @@ body_cb (http_parser *p, const char *buf, size_t len, char partial)
   return 0;
 }
 int
 headers_complete_cb(http_parser *p)
 {
-  register VALUE obj, key;
+  VALUE obj, key;
   client_t *client = get_client(p);
   request *req = client->req;
-  register VALUE env = client->environ;
-  register uint32_t i = 0;
-  register header *h;
+  VALUE env = client->environ;
+  uint32_t i = 0;
+  header *h;
   if(max_content_length < p->content_length){
     client->bad_request_code = 413;
@@ -1304,6 +1368,7 @@ headers_complete_cb(http_parser *p)
   return 0;
 }
 int
 message_complete_cb (http_parser *p)
 {
@@ -1312,6 +1377,7 @@ message_complete_cb (http_parser *p)
   return 0;
 }
 static http_parser_settings settings =
   {.on_message_begin = message_begin_cb
   ,.on_header_field = header_field_cb
@@ -1325,20 +1391,18 @@ static http_parser_settings settings =
   ,.on_message_complete = message_complete_cb
   };
- int
+int
 init_parser(client_t *cli, const char *name, const short port)
 {
-  register VALUE object;
+  VALUE object;
+  char r_port[7];
   cli->http = (http_parser*)ruby_xmalloc(sizeof(http_parser));
   memset(cli->http, 0, sizeof(http_parser));
   cli->environ = rb_hash_new();
-  if (cli->environ == NULL) {
-    return -1;
-  }
   rb_hash_aset(cli->environ, version_key, version_val);
   rb_hash_aset(cli->environ, scheme_key, scheme_val);
   rb_hash_aset(cli->environ, errors_key, errors_val);
@@ -1355,7 +1419,6 @@ init_parser(client_t *cli, const char *name, const short port)
   object = rb_str_new2(cli->remote_addr);
   rb_hash_aset(cli->environ, rb_remote_addr, object);
-  char r_port[6];
   sprintf(r_port, "%d", cli->remote_port);
   object = rb_str_new2(r_port);
   rb_hash_aset(cli->environ, rb_remote_port, object);
@@ -1366,21 +1429,26 @@ init_parser(client_t *cli, const char *name, const short port)
   return 0;
 }
- size_t
+size_t
 execute_parse(client_t *cli, const char *data, size_t len)
 {
   return http_parser_execute(cli->http, &settings, data, len);
 }
- int
+int
 parser_finish(client_t *cli)
 {
   return cli->complete;
 }
- void
+void
 setup_static_env(char *name, int port)
 {
+  char vport[7];
   version_val = rb_obj_freeze(rb_ary_new3(2, INT2FIX(1), INT2FIX(1)));
   version_key = rb_obj_freeze(rb_str_new2("rack.version"));
@@ -1405,7 +1473,6 @@ setup_static_env(char *name, int port)
   server_name_val = rb_obj_freeze(rb_str_new2(name));
   server_name_key = rb_obj_freeze(rb_str_new2("SERVER_NAME"));
-  char vport[6];
   sprintf(vport, "%d", port);
   server_port_val = rb_obj_freeze(rb_str_new2(vport));
   server_port_key = rb_obj_freeze(rb_str_new2("SERVER_PORT"));
@@ -1422,9 +1489,11 @@ setup_static_env(char *name, int port)
   http_connection = rb_obj_freeze(rb_str_new2("HTTP_CONNECTION"));
   http_user_agent = rb_obj_freeze(rb_str_new2("HTTP_USER_AGENT"));
+  http_referer = rb_obj_freeze(rb_str_new2("HTTP_REFERER"));
 }
-static  int
+static int
 setsig(int sig, void* handler)
 {
   struct sigaction context, ocontext;
@@ -1434,7 +1503,8 @@ setsig(int sig, void* handler)
   return sigaction(sig, &context, &ocontext);
 }
-static  void
+static void
 setup_sock(int fd)
 {
   int on = 1, r;
@@ -1444,7 +1514,8 @@ setup_sock(int fd)
   assert(r == 0);
 }
-static  void
+static void
 disable_cork(client_t *client)
 {
   int off = 0;
@@ -1459,7 +1530,8 @@ disable_cork(client_t *client)
   assert(r == 0);
 }
-static  client_t *
+static client_t *
 new_client_t(int client_fd, struct sockaddr_in client_addr){
   client_t *client;
@@ -1478,7 +1550,8 @@ new_client_t(int client_fd, struct sockaddr_in client_addr){
   return client;
 }
-static  void
+static void
 clean_cli(client_t *client)
 {
   write_access_log(client, log_fd, log_path);
@@ -1486,6 +1559,12 @@ clean_cli(client_t *client)
     free_request(client->req);
     client->req = NULL;
   }
+#ifdef DEBUG
+  printf("close environ %p \n", client->environ);
+#endif
+  // force clear
+  client->environ = rb_hash_new();
   if(client->http != NULL){
     ruby_xfree(client->http);
@@ -1493,7 +1572,8 @@ clean_cli(client_t *client)
   }
 }
-static  void
+static void
 close_conn(client_t *cli, picoev_loop* loop)
 {
   if(!cli->keep_alive){
@@ -1508,13 +1588,13 @@ close_conn(client_t *cli, picoev_loop* loop)
     clean_cli(cli);
     disable_cork(cli);
     cli->keep_alive = 1;
-    cli->environ = NULL;
-    cli->http_status = NULL;
-    cli->headers = NULL;
+    cli->environ = Qnil;
+    cli->http_status = Qnil;
+    cli->headers = Qnil;
     cli->header_done = 0;
     cli->body_type = BODY_TYPE_NONE;
     cli->status_code = 0;
-    cli->response = NULL;
+    cli->response = Qnil;
     cli->content_length_set = 0;
     cli->content_length = 0;
     cli->write_bytes = 0;
@@ -1524,10 +1604,11 @@ close_conn(client_t *cli, picoev_loop* loop)
   }
 }
-static  int
+static int
 process_rack_app(client_t *cli)
 {
-  VALUE args = NULL;
+  VALUE args;
   char *status;
   args = cli->environ;
@@ -1567,6 +1648,7 @@ process_rack_app(client_t *cli)
   return 1;
 }
 static void
 w_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
 {
@@ -1596,7 +1678,8 @@ w_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
   }
 }
-static  void
+static void
 call_rack_app(client_t *client, picoev_loop* loop)
 {
   int ret;
@@ -1623,6 +1706,8 @@ call_rack_app(client_t *client, picoev_loop* loop)
 #ifdef DEBUG
     printf("set write callback %d \n", ret);
 #endif
+    //clear event
+    picoev_del(loop, client->fd);
     picoev_add(loop, client->fd, PICOEV_WRITE, WRITE_TIMEOUT_SECS, w_callback, (void *)client);
     return;
   default:
@@ -1631,21 +1716,22 @@ call_rack_app(client_t *client, picoev_loop* loop)
   }
 }
-static  void
+static void
 prepare_call_rack(client_t *client)
 {
-  VALUE input = NULL, object = NULL, c = NULL;
+  VALUE input, object, c;
   char *val;
   object = rb_str_new2("");
   input = rb_funcall(StringIO, i_new, 1, object);
-  rb_hash_aset((VALUE)client->environ, rack_input, input);
+  rb_hash_aset(client->environ, rack_input, input);
   client->body = object;
   if(is_keep_alive){
     //support keep-alive
     c = rb_hash_aref(client->environ, http_connection);
-    if(c){
+    if(c != Qnil){
       val = StringValuePtr(c);
       if(!strcasecmp(val, "keep-alive")){
 	client->keep_alive = 1;
@@ -1658,6 +1744,7 @@ prepare_call_rack(client_t *client)
   }
 }
 static void
 r_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
 {
@@ -1741,6 +1828,7 @@ r_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
   }
 }
 static void
 accept_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
 {
@@ -1753,8 +1841,11 @@ 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);
+#ifdef linux
+    client_fd = accept4(fd, (struct sockaddr *)&client_addr, &client_len, SOCK_NONBLOCK | SOCK_CLOEXEC);
+#else
     client_fd = accept(fd, (struct sockaddr *)&client_addr, &client_len);
+#endif
     if (client_fd != -1) {
 #ifdef DEBUG
       printf("accept fd %d \n", client_fd);
@@ -1781,7 +1872,8 @@ accept_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
   }
 }
-static  void
+static void
 setup_server_env(void)
 {
   setup_sock(listen_sock);
@@ -1790,7 +1882,8 @@ setup_server_env(void)
   setup_static_env(server_name, server_port);
 }
-static  int
+static int
 inet_listen(void)
 {
   struct addrinfo hints, *servinfo, *p;
@@ -1859,7 +1952,8 @@ inet_listen(void)
   return 1;
 }
-static  int
+static int
 check_unix_sockpath(char *sock_name)
 {
   if(!access(sock_name, F_OK)){
@@ -1870,7 +1964,8 @@ check_unix_sockpath(char *sock_name)
   return 1;
 }
-static  int
+static int
 unix_listen(char *sock_name)
 {
   int flag = 1;
@@ -1914,6 +2009,7 @@ unix_listen(char *sock_name)
   return 1;
 }
 static void
 sigint_cb(int signum)
 {
@@ -1921,11 +2017,13 @@ sigint_cb(int signum)
   /* rb_interrupt(); */
 }
 static void
 sigpipe_cb(int signum)
 {
 }
 static VALUE
 bossan_stop(VALUE self)
 {
@@ -1933,6 +2031,7 @@ bossan_stop(VALUE self)
   return Qnil;
 }
 static VALUE
 bossan_access_log(VALUE self, VALUE args)
 {
@@ -1941,6 +2040,17 @@ bossan_access_log(VALUE self, VALUE args)
   if(log_fd > 0){
     close(log_fd);
   }
+  if(!strcasecmp(log_path, "stdout")){
+    log_fd = 1;
+    return Qnil;
+  }
+  if(!strcasecmp(log_path, "stderr")){
+    log_fd = 2;
+    return Qnil;
+  }
   log_fd = open_log_file(log_path);
   if(log_fd < 0){
@@ -1949,6 +2059,7 @@ bossan_access_log(VALUE self, VALUE args)
   return Qnil;
 }
 static VALUE
 bossan_run_loop(int argc, VALUE *argv, VALUE self)
 {
@@ -1978,7 +2089,7 @@ bossan_run_loop(int argc, VALUE *argv, VALUE self)
     rack_app = args3;
   } else {
     Check_Type(args1, T_STRING);
-    ret = unix_listen(args1);
+    ret = unix_listen(StringValuePtr(args1));
     rack_app = args2;
   }
@@ -2014,6 +2125,7 @@ bossan_run_loop(int argc, VALUE *argv, VALUE self)
   return Qnil;
 }
 VALUE
 bossan_set_max_content_length(VALUE self, VALUE args)
 {
@@ -2021,12 +2133,14 @@ bossan_set_max_content_length(VALUE self, VALUE args)
   return Qnil;
 }
 VALUE
 bossan_get_max_content_length(VALUE self)
 {
   return INT2NUM(max_content_length);
 }
 void
 Init_bossan_ext(void)
 {
@@ -2062,6 +2176,7 @@ Init_bossan_ext(void)
   rb_gc_register_address(&http_connection);
   rb_gc_register_address(&http_user_agent);
+  rb_gc_register_address(&http_referer);
   empty_string = rb_obj_freeze(rb_str_new2(""));
   rb_gc_register_address(&empty_string);

data/lib/bossan/version.rb CHANGED

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

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bossan
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack