bossan 0.1.6 → 0.1.7

data/.gitignore

@@ -0,0 +1,23 @@
+*.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
+*.so
+Makefile
+*.log
+*.db
+TAGS

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3

data/Gemfile

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

data/README.md

@@ -0,0 +1,52 @@
+# Bossan
+
+[![Build Status](https://secure.travis-ci.org/kubo39/bossan.png?branch=master)](http://travis-ci.org/kubo39/bossan)
+
+Bossan is a high performance asynchronous ruby's rack-compliant web server.
+
+## Requirements
+
+Bossan requires Ruby 1.9.2 or later.
+
+Bossan supports Linux, FreeBSD and Mac OS X(need gcc>=4.2).
+
+## Installation
+
+from rubygems
+
+`gem install bossan`
+
+or from source:
+
+```
+git clone git://github.com/kubo39/bossan.git
+cd bossan
+rake
+```
+
+## 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

@@ -0,0 +1,22 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require "rbconfig"
+
+task :default => [:compile, :clean, :test]
+
+task :compile do
+  Dir.chdir File.expand_path("../ext/bossan", __FILE__)
+  sh "ruby extconf.rb"
+  sh "make"
+  sh "mv bossan_ext.#{RbConfig::CONFIG['DLEXT']} ../../lib/bossan/"
+end
+
+task :clean do
+  Dir.chdir File.expand_path("../ext/bossan", __FILE__)
+  sh "rm -f *.o Makefile"
+end
+
+task :test do
+  Dir.chdir File.expand_path("../test", __FILE__)
+  sh "ruby test_rack_spec.rb"
+end

data/bossan.gemspec

@@ -0,0 +1,20 @@
+# -*- 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"]
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split($/)
+ 
+  gem.required_ruby_version = ">= 1.9.2"
+  gem.add_dependency "rack", ["~> 1.2"]
+end

data/examples/blog/README.md

@@ -0,0 +1,19 @@
+# This is a simple microblog powered by sqlite.
+
+### Requirements some extension
+
+ * ActiveRecord (ORM)
+ * eRuby        (Template)
+ * SQLite       (Database)
+
+
+#### fire up a irb(pry)
+
+    require './app'; init_db
+
+
+### Run
+
+    rackup config.ru -s bossan
+
+visit http://0.0.0.0:9292

data/examples/blog/app.rb

@@ -0,0 +1,77 @@
+require 'sinatra'
+require 'active_record'
+require 'erb'
+
+enable :sessions
+
+DATABASE = './db/sinatr.db'
+SECRET_KEY = 'development_key'
+USERNAME = 'admin'
+PASSWORD = 'default'
+
+ActiveRecord::Base.establish_connection(
+  :adapter => 'sqlite3',
+  :database =>  DATABASE
+)
+
+get '/' do
+  @entries = Entries.find(:all).map do |row|
+    {:title => row.title,
+      :text => row.text }
+  end
+  @entries ||= []
+  erb :show_entries
+end
+
+post '/add' do
+  halt(401) if session.include?([:logged_in])
+  Entries.create(:title => params[:title],
+                 :text => params[:text])
+  redirect '/'
+end
+
+post '/login' do
+  @err = nil
+  if params[:username] != USERNAME
+    @err = "Invalid username #{params[:username]}"
+  elsif params[:password] != PASSWORD
+    @err = "Invalid password"
+  else
+    session[:logged_in] = params[:username]
+    redirect '/'
+  end
+  erb :login
+end
+
+get '/login' do
+  erb :login
+end
+
+get '/logout' do
+  session.delete :logged_in
+  erb :show_entries
+end
+
+class Schema < ActiveRecord::Migration
+  def self.up
+    create_table :entries do |t|
+      t.column :title, :string, :null => false
+      t.column :text, :string, :null => false
+    end
+  end
+
+  def self.down
+    drop_table :entries
+  end
+end
+
+class Entries < ActiveRecord::Base
+end
+
+def init_db
+  Schema.migrate :up
+end
+
+def drop_db
+  Schema.migrate :down
+end

data/examples/blog/config.ru

@@ -0,0 +1,4 @@
+require 'rubygems'
+require './app'
+
+run Sinatra::Application

data/examples/blog/public/style.css

@@ -0,0 +1,18 @@
+body            { font-family: sans-serif; background: #eee; }
+a, h1, h2       { color: #377BA8; }
+h1, h2          { font-family: 'Georgia', serif; margin: 0; }
+h1              { border-bottom: 2px solid #eee; }
+h2              { font-size: 1.2em; }
+
+.page           { margin: 2em auto; width: 35em; border: 5px solid #ccc;
+                  padding: 0.8em; background: white; }
+.entries        { list-style: none; margin: 0; padding: 0; }
+.entries li     { margin: 0.8em 1.2em; }
+.entries li h2  { margin-left: -1em; }
+.add-entry      { font-size: 0.9em; border-bottom: 1px solid #ccc; }
+.add-entry dl   { font-weight: bold; }
+.metanav        { text-align: right; font-size: 0.8em; padding: 0.3em;
+                  margin-bottom: 1em; background: #fafafa; }
+.flash          { background: #CEE5F5; padding: 0.5em;
+                  border: 1px solid #AACBE2; }
+.error          { background: #F0D6D6; padding: 0.5em; }

data/examples/blog/views/login.erb

@@ -0,0 +1,23 @@
+<!doctype html>
+<html>
+  <head>
+  <title>Sinatr</title>
+  <link rel="stylesheet" type="text/css" href="/static/style.css">
+  </head>
+  <body>
+  <div class="page">
+    <h2>Login</h2>
+    <% if @err %>
+    <p class="error"><h2>Error:</h2>
+    <%= @err %>
+    <% end %>
+    <form action="/login" method="POST">
+      <h3>Username:</h3>
+      <input type="text" name="username">
+      <h3>Password:</h3>
+      <input type="password" name="password">
+      <input type="submit" value="Login">
+    </form>
+  </div>
+  </body>
+</html>

data/examples/blog/views/show_entries.erb

@@ -0,0 +1,38 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Sinatr</title>
+    <link rel="stylesheet" type="text/css" href="/static/style.css"/>
+  </head>
+  <body>
+    <div class="page">
+    <h1>Sinatr</h1>
+    <div class="metanav">
+   <% unless session.include?(:logged_in) %>
+    <a href="/login">log in</a>
+  <% else %>
+    <a href="/logout">log out</a>
+  <% end %>
+  </div>
+</div>
+  <% if session.include?(:logged_in) %>
+    <form action="/add" method="POST" class="add">
+      
+        <h3>Title:</h3>
+        <input type="text" size="30" name="title">
+        <h3>Text:</h3>
+        <textarea name="text" rows="5" cols="40"></textarea>
+        <input type="submit" value="Share">
+      
+    </form>
+  <% end %>
+  <ul class="entries">
+  <% unless (@entries == [] || @entries == nil) %>
+  <% @entries.each do |entry| %>
+    <h2><%= entry[:title] %></h2>
+    <%= entry[:text] %>
+  <% end %>
+  <% end %>
+  </ul>
+</body>
+<html>

data/examples/config.ru

@@ -0,0 +1,19 @@
+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

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

data/examples/sinatra_app.rb

@@ -0,0 +1,11 @@
+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

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

data/examples/views_sample.rb

@@ -0,0 +1,11 @@
+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)

data/ext/bossan/bossan_ext.c

@@ -4,10 +4,6 @@
 #include <stddef.h> 
 #include <unistd.h>
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
 #include <arpa/inet.h>
 #include <signal.h>
 #include <sys/socket.h>
@@ -24,9 +20,12 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <netdb.h>
+
 #include "time_cache.h"
 #include "http_parser.h"
 #include "picoev.h"
+#include "buffer.h"
+#include "client.h"
 
 #define MAX_FDS 1024 * 8
 #define ACCEPT_TIMEOUT_SECS 1
@@ -38,18 +37,8 @@
 #define MAX_BUFSIZE 1024 * 8
 #define INPUT_BUF_SIZE 1024 * 8
 
-#define LIMIT_MAX 1024 * 1024 * 1024
-
 #define LIMIT_SIZE 1024 * 512
 
-#define LIMIT_PATH 1024 * 4
-#define LIMIT_FRAGMENT 1024
-#define LIMIT_URI 1024 * 4
-#define LIMIT_QUERY_STRING 1024 * 8
-
-#define LIMIT_REQUEST_FIELDS 30 
-#define LIMIT_REQUEST_FIELD_SIZE 1024 * 8 
-
 #define CRLF "\r\n"
 #define DELIM ": "
 
@@ -61,7 +50,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.6"
+#define SERVER "bossan/0.1.7"
 
 VALUE server; // Bossan
 
@@ -129,74 +118,6 @@ int max_content_length = 1024 * 1024 * 16; //max_content_length
 
 static VALUE StringIO;
 
-typedef enum {
-  WRITE_OK,
-  MEMORY_ERROR,
-  LIMIT_OVER,
-} buffer_result;
-
-typedef struct {
-  char *buf;
-  size_t buf_size;
-  size_t len;
-  size_t limit;
-} buffer;
-
-typedef enum {
-  FIELD,
-  VAL,
-} field_type;
-
-typedef struct {
-  buffer *field;
-  buffer *value;
-} header;
-
-typedef struct {
-  buffer *path;
-  buffer *uri;
-  buffer *query_string;
-  buffer *fragment;
-  header *headers[LIMIT_REQUEST_FIELDS];
-  uint32_t num_headers;
-  field_type last_header_element;   
-} request;
-
-typedef enum {
-  BODY_TYPE_NONE,
-  BODY_TYPE_TMPFILE,
-  BODY_TYPE_BUFFER
-} request_body_type;
-
-typedef struct _client {
-  int fd;
-  char *remote_addr;
-  uint32_t remote_port;
-  uint8_t keep_alive;
-  request *req;
-  uint32_t body_length;
-  int body_readed;
-  void *body;
-  int bad_request_code;
-  request_body_type body_type;    
-  uint8_t complete;
-
-  http_parser *http;          // http req parser
-  VALUE environ;              // rack environ
-  int status_code;            // response status code
-    
-  VALUE http_status;             // response status line
-  VALUE headers;                 // http response headers
-  uint8_t header_done;            // header write status
-  VALUE response;                // rack response object
-  VALUE response_iter;           // rack response object
-  uint8_t content_length_set;     // content_length_set flag
-  uint32_t content_length;         // content_length
-  uint32_t write_bytes;            // send body length
-  void *bucket;               //write_data
-  uint8_t response_closed;    //response closed flag
-} client_t;
-
 typedef struct iovec iovec_t;
 
 typedef struct {
@@ -209,78 +130,6 @@ typedef struct {
 } write_bucket;
 
 
-buffer *
-new_buffer(size_t buf_size, size_t limit)
-{
-  buffer *buf;
-  buf = ruby_xmalloc(sizeof(buffer));
-  memset(buf, 0, sizeof(buffer));
-  buf->buf = ruby_xmalloc(sizeof(char) * buf_size);
-  buf->buf_size = buf_size;
-  if(limit){
-    buf->limit = limit;
-  }else{
-    buf->limit = LIMIT_MAX;
-  }
-  return buf;
-}
-
-
-buffer_result
-write2buf(buffer *buf, const char *c, size_t l)
-{
-  size_t newl;
-  char *newbuf;
-  buffer_result ret = WRITE_OK;
-  newl = buf->len + l;
-    
-  if (newl >= buf->buf_size) {
-    buf->buf_size *= 2;
-    if(buf->buf_size <= newl) {
-      buf->buf_size = (int)(newl + 1);
-    }
-    if(buf->buf_size > buf->limit){
-      buf->buf_size = buf->limit + 1;
-    }
-    newbuf = (char*)ruby_xrealloc(buf->buf, buf->buf_size);
-    buf->buf = newbuf;
-  }
-  if(newl >= buf->buf_size){
-    l = buf->buf_size - buf->len -1;
-    ret = LIMIT_OVER;
-  }
-  memcpy(buf->buf + buf->len, c , l);
-  buf->len += (int)l;
-  return ret;
-}
-
-
-void
-free_buffer(buffer *buf)
-{
-  ruby_xfree(buf->buf);
-  ruby_xfree(buf);
-}
-
-
-VALUE
-getRbString(buffer *buf)
-{
-  VALUE o;
-  o = rb_str_new(buf->buf, buf->len);
-  free_buffer(buf);
-  return o;
-}
-
-
-char *
-getString(buffer *buf)
-{
-  buf->buf[buf->len] = '\0';
-  return buf->buf;
-}
-
-
 int
 open_log_file(const char *path)
 {
@@ -858,67 +707,6 @@ response_start(client_t *client)
 }
 
 
-request *
-new_request(void)
-{
-  request *req = (request *)ruby_xmalloc(sizeof(request));
-  memset(req, 0, sizeof(request));
-  return req;
-}
-
-
-header *
-new_header(size_t fsize, size_t flimit, size_t vsize, size_t vlimit)
-{
-  header *h;
-  h = ruby_xmalloc(sizeof(header));
-  h->field = new_buffer(fsize, flimit);
-  h->value = new_buffer(vsize, vlimit);
-  return h;
-}
-
-
-void
-free_header(header *h)
-{
-  ruby_xfree(h);
-}
-
-
-void
-free_request(request *req)
-{
-  uint32_t i;
-  header *h;
-  if(req->path){
-    free_buffer(req->path);
-    req->path = NULL;
-  }
-  if(req->uri){
-    free_buffer(req->uri); 
-    req->uri = NULL;
-  }
-  if(req->query_string){
-    free_buffer(req->query_string); 
-    req->query_string = NULL;
-  }
-  if(req->fragment){
-    free_buffer(req->fragment); 
-    req->fragment = NULL;
-  }
-  for(i = 0; i < req->num_headers+1; i++){
-    h = req->headers[i];
-    if(h){
-      free_buffer(h->field);
-      free_buffer(h->value);
-      free_header(h);
-      req->headers[i] = NULL;
-    }
-  }
-  ruby_xfree(req);
-}
-
-
 static void
 key_upper(char *s, const char *key, size_t len)
 {
@@ -955,9 +743,10 @@ write_body2file(client_t *client, const char *buffer, size_t buffer_len)
 static int
 write_body2mem(client_t *client, const char *buffer, size_t buffer_len)
 {
+  VALUE obj;
   /* printf("body2mem called\n"); */
-  VALUE obj = (VALUE)client->body;
-  rb_str_concat(obj, rb_str_new(buffer, buffer_len));
+
+  rb_funcall((VALUE)client->body, rb_intern("write"), 1, rb_str_new(buffer, buffer_len));
   client->body_readed += buffer_len;
 #ifdef DEBUG
   printf("write_body2mem %d bytes \n", buffer_len);
@@ -1234,6 +1023,7 @@ body_cb (http_parser *p, const char *buf, size_t len, char partial)
 #ifdef DEBUG
     printf("client->body_length %d \n", client->body_length);
 #endif
+    client->body = rb_funcall(StringIO, i_new, 1, rb_str_new2(""));
     client->body_type = BODY_TYPE_BUFFER;
 #ifdef DEBUG
     printf("BODY_TYPE_BUFFER \n");
@@ -1723,10 +1513,18 @@ prepare_call_rack(client_t *client)
   VALUE input, object, c;
   char *val;
 
-  object = rb_str_new2("");
-  input = rb_funcall(StringIO, i_new, 1, object);
-  rb_hash_aset(client->environ, rack_input, input);
-  client->body = object;
+  if(client->body_type == BODY_TYPE_BUFFER) {
+    /* rb_p( rb_funcall((VALUE)client->body, rb_intern("gets"), 0) ); */
+    rb_p( rb_funcall((VALUE)client->body, rb_intern("seek"), 1, INT2NUM(0)) );
+    rb_hash_aset(client->environ, rack_input, (VALUE)client->body);
+  } else {
+    object = rb_str_new2("");
+    input = rb_funcall(StringIO, i_new, 1, object);
+    rb_gc_register_address(&input);
+    rb_hash_aset(client->environ, rack_input, input);
+    /* client->body = object; */
+    client->body = input;
+  }
 
   if(is_keep_alive){
     //support keep-alive