bossan 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 943923d13677bcb0574eae13e2bfe1145af1fd0a
-  data.tar.gz: b16bc4e09fb61dca0f8f84a4f011f744e1a15ed6
+  metadata.gz: e969be8e7c6867dcf66c449d02c4972699230b18
+  data.tar.gz: 2ac87fd5dc7533b0d48ef502223c6bb3f4406033
 SHA512:
-  metadata.gz: dfc563ed9e3ba7221fb7099b2ccfdc5cc2e20588b34fbf967a31f7cf2d89423851c60033679a699d2290f1350f9d890caa353ab4bd09bb0bae589c2684d57ca6
-  data.tar.gz: 0164c6c0bee4469c55077a81a1e6457c913fec1c4cb31b1ebba099530b329670f58305482489607de785cdf99011ea86c29deaf24a058c95e2c076709bd0ea44
+  metadata.gz: 09880b9fd1622640b6f1eaada5e2b6d62c1f282fa5f0e0810495bc7a7bd4cfa8362318bc753b9c679c6466f26dea164e0dd3fae5d5d5df1cf1c5c1cea929aed8
+  data.tar.gz: 9c042fb1d4d6593a237883af46d14bbeb72e03a4ef095295420a62ae310a4f77c5a0969f61b38b5b4e9feb5a36b65d322122d0f4f540c167ca6c1e3a43dc7dbf

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+### v0.4.3
+
+(Bug release. release 2013-07-27)
+
+* fix keepalive
+
 ### v0.4.2
 
 (Bug release. release 2013-07-25)

data/README.md

@@ -2,7 +2,7 @@
 
 [![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.
+Bossan is a high performance asynchronous ruby's rack web server.
 
 ## Requirements
 
@@ -12,16 +12,17 @@ Bossan supports Linux, FreeBSD and MacOSX(need gcc>=4.2).
 
 ## Installation
 
-from rubygems
+Install from rubygems:
 
 `gem install bossan`
 
-from source(github)
+Install from source(github):
 
 ```
 git clone git://github.com/kubo39/bossan.git
 cd bossan
 rake
+rake install
 ```
 
 ## Usage
@@ -45,6 +46,10 @@ Bossan.run(proc {|env|
 })
 ```
 
+with rackup:
+
+`$ rackup config.ru -s bossan`
+
 ## Contributing
 
 1. Fork it

data/examples/inifinity.rb

@@ -0,0 +1,17 @@
+require_relative '../lib/bossan'
+
+
+app = lambda do |env|
+  body = (1..Float::INFINITY).lazy.map(&:to_s)
+  [
+   200,          # Status code
+   {             # Response headers
+     'Content-Type' => 'text/html',
+   },
+   body        # Response body
+  ]
+end
+
+Bossan.set_keepalive(10)
+Bossan.listen('127.0.0.1', 8000)
+Bossan.run(app)

data/ext/bossan/bossan_ext.c

@@ -23,7 +23,7 @@
 #define CRLF "\r\n"
 #define DELIM ": "
 
-#define SERVER "bossan/0.4.2"
+#define SERVER "bossan/0.4.3"
 
 #define H_MSG_500 "HTTP/1.0 500 Internal Server Error\r\nContent-Type: text/html\r\nServer:  " SERVER "\r\n\r\n"
 
@@ -701,12 +701,15 @@ write_headers(client_t *client, char *data, size_t datalen)
 }
 
 
-static void
+response_status
 close_response(client_t *client)
 {
-  //send all response
-  //closing reponse object
-  client->response_closed = 1;
+  if (!client->response_closed) {
+    //send all response
+    //closing reponse object
+    client->response_closed = 1;
+  }
+  return STATUS_OK;
 }
 
 
@@ -784,21 +787,21 @@ processs_write(client_t *client)
 	break;
       }
     }
+  }
 
-    if(client->chunked_response){
-      DEBUG("write last chunk");
-      //last packet
-      bucket = new_write_bucket(client->fd, 3);
-      if(bucket == NULL){
-	return STATUS_ERROR;
-      }
-      set_last_chunked_data(bucket);
-      writev_bucket(bucket);
-      free_write_bucket(bucket);
+  if(client->chunked_response){
+    DEBUG("write last chunk");
+    //last packet
+    bucket = new_write_bucket(client->fd, 3);
+    if(bucket == NULL){
+      return STATUS_ERROR;
     }
-    close_response(client);
+    set_last_chunked_data(bucket);
+    writev_bucket(bucket);
+    free_write_bucket(bucket);
+    return close_response(client);
   }
-  return STATUS_OK;
+  return close_response(client);
 }
 
 

data/lib/bossan/version.rb

@@ -1,3 +1,3 @@
 module Bossan
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/test/test_rack_chunk_response.rb

@@ -1,8 +1,8 @@
 require_relative '../lib/bossan'
+require_relative './util'
 require 'minitest/unit'
 require 'test/unit/testcase'
 require 'uri'
-require 'net/http'
 
 
 DEFAULT_HOST = "localhost"
@@ -38,20 +38,6 @@ class RackChunkResponseTest < Test::Unit::TestCase
 end
 
 
-def server_is_wake_up? n=100
-  n.times {
-    begin
-      Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT)
-    rescue
-      next
-    end
-    $stderr.puts "*** running success ***"
-    return true
-  }
-  return false
-end
-
-
 begin
   $stderr.puts RUBY_DESCRIPTION
 

data/test/test_rack_env_simple_get.rb

@@ -22,8 +22,7 @@ class RackEnvSimpleGetTest < Test::Unit::TestCase
                    # I have no idea how to check this two values..
                    @env.delete "rack.input"
                    @env.delete "rack.errors"
-                   # pp @env
-                   w.write @env
+                   w.write Marshal.dump(@env)
                    w.close
                    body = RESPONSE
                    [200,
@@ -43,12 +42,9 @@ class RackEnvSimpleGetTest < Test::Unit::TestCase
     }
 
     w.close
-    env = r.read
+    env = Marshal.load(r.read)
     r.close
 
-    env = eval "Hash[" + env + "]"
-    # pp env
-
     assert_equal(env["PATH_INFO"], "/")
     assert_equal(env["SCRIPT_NAME"], "")
     assert_equal(env["QUERY_STRING"], "")

data/test/test_rack_env_simple_query.rb

@@ -22,7 +22,7 @@ class RackEnvSimpleQueryTest < Test::Unit::TestCase
                    # I have no idea how to check this two values..
                    @env.delete "rack.input"
                    @env.delete "rack.errors"
-                   w.write @env
+                   w.write Marshal.dump(@env)
                    w.close
                    body = RESPONSE
                    [200,
@@ -42,12 +42,9 @@ class RackEnvSimpleQueryTest < Test::Unit::TestCase
     }
 
     w.close
-    env = r.read
+    env = Marshal.load(r.read)
     r.close
 
-    # env = eval "Hash[" + env.gsub("\"", "'") + "]"
-    env = eval "Hash[" + env + "]"
-
     assert_equal(env["PATH_INFO"], "/ABC/DEF")
     assert_equal(env["QUERY_STRING"], "a=1234&bbbb=ccc")
   ensure

data/test/test_rack_err_spec.rb

@@ -1,7 +1,7 @@
 require_relative '../lib/bossan'
+require_relative './util'
 require 'minitest/unit'
 require 'test/unit/testcase'
-require 'net/http'
 
 
 DEFAULT_HOST = "localhost"
@@ -34,21 +34,6 @@ class RackErrSpecTest < Test::Unit::TestCase
 end
 
 
-def server_is_wake_up? n=100
-  n.times {
-    begin
-      Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT)
-    rescue
-      next
-    end
-    $stderr.puts "*** running success ***"
-    return true
-  }
-  return false
-end
-
-
-
 begin
   $stderr.puts RUBY_DESCRIPTION
   pid = fork do

data/test/test_rack_evil.rb

@@ -1,8 +1,8 @@
 require_relative '../lib/bossan'
+require_relative './util'
 require 'minitest/unit'
 require 'test/unit/testcase'
 require 'socket'
-require 'net/http'
 
 
 ASSERT_RESPONSE = "Hello world!"
@@ -93,20 +93,6 @@ class BadHttpMethodTest < Test::Unit::TestCase
 end
 
 
-def server_is_wake_up? n=100
-  n.times {
-    begin
-      Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT)
-    rescue
-      next
-    end
-    $stderr.puts "*** running success ***"
-    return true
-  }
-  return false
-end
-
-
 begin
   $stderr.puts RUBY_DESCRIPTION
 

data/test/test_rack_spec.rb

@@ -1,8 +1,8 @@
 require_relative '../lib/bossan'
+require_relative './util'
 require 'minitest/unit'
 require 'test/unit/testcase'
 require 'uri'
-require 'net/http'
 
 
 DEFAULT_HOST = "localhost"
@@ -45,20 +45,6 @@ class RackSpecTest < Test::Unit::TestCase
 end
 
 
-def server_is_wake_up? n=100
-  n.times {
-    begin
-      Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT)
-    rescue
-      next
-    end
-    $stderr.puts "*** running success ***"
-    return true
-  }
-  return false
-end
-
-
 begin
   $stderr.puts RUBY_DESCRIPTION
   pid = fork do

data/test/util.rb

@@ -0,0 +1,14 @@
+require 'net/http'
+
+def server_is_wake_up? n=100
+  n.times {
+    begin
+      Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT)
+    rescue
+      next
+    end
+    $stderr.puts "*** running success ***"
+    return true
+  }
+  return false
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bossan
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Hiroki Noda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -49,8 +49,8 @@ files:
 - examples/config.ru
 - examples/fork_sample.rb
 - examples/hello.rb
+- examples/inifinity.rb
 - examples/sinatra_app.rb
-- examples/uploads.rb
 - examples/views/index.haml
 - examples/views_sample.rb
 - ext/bossan/bossan.h
@@ -78,6 +78,7 @@ files:
 - test/test_rack_err_spec.rb
 - test/test_rack_evil.rb
 - test/test_rack_spec.rb
+- test/util.rb
 homepage: https://github.com/kubo39/bossan
 licenses:
 - BSD

data/examples/uploads.rb

@@ -1,55 +0,0 @@
-require_relative '../lib/bossan'
-require 'rack'
-require 'tempfile'
-
-
-def view_file req
-  tempfile = Tempfile.new('raw-upload.')
-  req.env['rack.input'].each do |chunk|
-    if chunk.respond_to?(:force_encoding)
-      tempfile << chunk.force_encoding('UTF-8')
-    else
-      tempfile << chunk
-    end
-  end
-
-  req.env['rack.input'].rewind
-
-  tempfile.flush
-  tempfile.rewind
-
-  return Rack::Response.new(tempfile,
-                            200,
-                            { "Content-Length" => req.env["CONTENT_LENGTH"],
-                              "Content-Type" => 'image/jpeg'})
-end
-
-
-def upload_file req
-  return Rack::Response.new([<<-EOF
-<h1>Upload File</h1>
-<form action="" method="post" enctype="multipart/form-data">
-  <input type="file" name="uploaded_file"><input type="submit" value="Upload">
-</form>
-EOF
-                            ],
-                            200,
-                            )
-end
-
-
-app = ->(env) {
-  req = Rack::Request.new(env)
-  resp = if req.request_method == 'POST'
-           view_file req
-         else
-           upload_file req
-         end
-  # p resp
-  return resp
-}
-
-
-Bossan.set_max_content_length(1024 * 1024 * 1024)
-Bossan.listen('localhost', 8000)
-Bossan.run(app)