puma 2.2.0 → 8.0.2

data/ext/puma_http11/io_buffer.c

@@ -1,154 +0,0 @@
-#include "ruby.h"
-
-#include <sys/types.h>
-
-struct buf_int {
-  uint8_t* top;
-  uint8_t* cur;
-
-  size_t size;
-};
-
-#define BUF_DEFAULT_SIZE 4096
-#define BUF_TOLERANCE 32
-
-static void buf_free(struct buf_int* internal) {
-  free(internal->top);
-  free(internal);
-}
-
-static VALUE buf_alloc(VALUE self) {
-  VALUE buf;
-  struct buf_int* internal;
-
-  buf = Data_Make_Struct(self, struct buf_int, 0, buf_free, internal);
-
-  internal->size = BUF_DEFAULT_SIZE;
-  internal->top = malloc(BUF_DEFAULT_SIZE);
-  internal->cur = internal->top;
-
-  return buf;
-}
-
-static VALUE buf_append(VALUE self, VALUE str) {
-  struct buf_int* b;
-  size_t used, str_len, new_size;
-
-  Data_Get_Struct(self, struct buf_int, b);
-
-  used = b->cur - b->top;
-
-  StringValue(str);
-  str_len = RSTRING_LEN(str);
-
-  new_size = used + str_len;
-
-  if(new_size > b->size) {
-    size_t n = b->size + (b->size / 2);
-    uint8_t* top;
-    uint8_t* old;
-
-    new_size = (n > new_size ? n : new_size + BUF_TOLERANCE);
-
-    top = malloc(new_size);
-    old = b->top;
-    memcpy(top, old, used);
-    b->top = top;
-    b->cur = top + used;
-    b->size = new_size;
-    free(old);
-  }
-
-  memcpy(b->cur, RSTRING_PTR(str), str_len);
-  b->cur += str_len;
-
-  return self;
-}
-
-static VALUE buf_append2(int argc, VALUE* argv, VALUE self) {
-  struct buf_int* b;
-  size_t used, new_size;
-  int i;
-  VALUE str;
-
-  Data_Get_Struct(self, struct buf_int, b);
-
-  used = b->cur - b->top;
-  new_size = used;
-
-  for(i = 0; i < argc; i++) {
-    StringValue(argv[i]);
-
-    str = argv[i];
-
-    new_size += RSTRING_LEN(str);
-  }
-
-  if(new_size > b->size) {
-    size_t n = b->size + (b->size / 2);
-    uint8_t* top;
-    uint8_t* old;
-
-    new_size = (n > new_size ? n : new_size + BUF_TOLERANCE);
-
-    top = malloc(new_size);
-    old = b->top;
-    memcpy(top, old, used);
-    b->top = top;
-    b->cur = top + used;
-    b->size = new_size;
-    free(old);
-  }
-
-  for(i = 0; i < argc; i++) {
-    long str_len;
-    str = argv[i];
-    str_len = RSTRING_LEN(str);
-    memcpy(b->cur, RSTRING_PTR(str), str_len);
-    b->cur += str_len;
-  }
-
-  return self;
-}
-
-static VALUE buf_to_str(VALUE self) {
-  struct buf_int* b;
-  Data_Get_Struct(self, struct buf_int, b);
-
-  return rb_str_new(b->top, b->cur - b->top);
-}
-
-static VALUE buf_used(VALUE self) {
-  struct buf_int* b;
-  Data_Get_Struct(self, struct buf_int, b);
-
-  return INT2FIX(b->cur - b->top);
-}
-
-static VALUE buf_capa(VALUE self) {
-  struct buf_int* b;
-  Data_Get_Struct(self, struct buf_int, b);
-
-  return INT2FIX(b->size);
-}
-
-static VALUE buf_reset(VALUE self) {
-  struct buf_int* b;
-  Data_Get_Struct(self, struct buf_int, b);
-
-  b->cur = b->top;
-  return self;
-}
-
-void Init_io_buffer(VALUE puma) {
-  VALUE buf = rb_define_class_under(puma, "IOBuffer", rb_cObject);
-
-  rb_define_alloc_func(buf, buf_alloc);
-  rb_define_method(buf, "<<", buf_append, 1);
-  rb_define_method(buf, "append", buf_append2, -1);
-  rb_define_method(buf, "to_str", buf_to_str, 0);
-  rb_define_method(buf, "to_s", buf_to_str, 0);
-  rb_define_method(buf, "used", buf_used, 0);
-  rb_define_method(buf, "capacity", buf_capa, 0);
-  rb_define_method(buf, "reset", buf_reset, 0);
-}

data/lib/puma/accept_nonblock.rb

@@ -1,23 +0,0 @@
-require 'openssl'
-
-module OpenSSL
-  module SSL
-    class SSLServer
-      unless public_method_defined? :accept_nonblock
-        def accept_nonblock
-          sock = @svr.accept_nonblock
-
-          begin
-            ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
-            ssl.sync_close = true
-            ssl.accept if @start_immediately
-            ssl
-          rescue SSLError => ex
-            sock.close
-            raise ex
-          end
-        end
-      end
-    end
-  end
-end

data/lib/puma/capistrano.rb

@@ -1,34 +0,0 @@
-Capistrano::Configuration.instance.load do
-  after 'deploy:stop', 'puma:stop'
-  after 'deploy:start', 'puma:start'
-  after 'deploy:restart', 'puma:restart'
-
-  # Ensure the tmp/sockets directory is created by the deploy:setup task and
-  # symlinked in by the deploy:update task. This is not handled by Capistrano
-  # v2 but is fixed in v3.
-  shared_children.push('tmp/sockets')
-
-  _cset(:puma_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec puma" }
-  _cset(:pumactl_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec pumactl" }
-  _cset(:puma_state) { "#{shared_path}/sockets/puma.state" }
-  _cset(:puma_socket) { "unix://#{shared_path}/sockets/puma.sock" }
-  _cset(:puma_role) { :app }
-
-  namespace :puma do
-    desc 'Start puma'
-    task :start, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      puma_env = fetch(:rack_env, fetch(:rails_env, 'production'))
-      run "cd #{current_path} && #{fetch(:puma_cmd)} -q -d -e #{puma_env} -b '#{fetch(:puma_socket)}' -S #{fetch(:puma_state)} --control 'unix://#{shared_path}/sockets/pumactl.sock'", :pty => false
-    end
-
-    desc 'Stop puma'
-    task :stop, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S #{fetch(:puma_state)} stop"
-    end
-
-    desc 'Restart puma'
-    task :restart, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S #{fetch(:puma_state)} restart"
-    end
-  end
-end

data/lib/puma/compat.rb

@@ -1,11 +0,0 @@
-# Provides code to work properly on 1.8 and 1.9
-
-class String
-  unless method_defined? :bytesize
-    alias_method :bytesize, :size
-  end
-
-  unless method_defined? :byteslice
-    alias_method :byteslice, :[]
-  end
-end

data/lib/puma/daemon_ext.rb

@@ -1,20 +0,0 @@
-module Process
-  def self.daemon(nochdir=false, noclose=false)
-    exit if fork                     # Parent exits, child continues.
-
-    Process.setsid                   # Become session leader.
-
-    exit if fork                     # Zap session leader. See [1].
-
-    Dir.chdir "/" unless nochdir     # Release old working directory.
-
-    if !noclose
-      null = File.open "/dev/null", "w+"
-      STDIN.reopen null
-      STDOUT.reopen null
-      STDERR.reopen null
-    end
-
-    0
-  end unless respond_to?(:daemon)
-end

data/lib/puma/delegation.rb

@@ -1,11 +0,0 @@
-module Puma
-  module Delegation
-    def forward(what, who)
-      module_eval <<-CODE
-        def #{what}(*args, &blk)
-          #{who}.#{what}(*args, &blk)
-        end
-      CODE
-    end
-  end
-end

data/lib/puma/java_io_buffer.rb

@@ -1,45 +0,0 @@
-require 'java'
-
-# Conservative native JRuby/Java implementation of IOBuffer
-# backed by a ByteArrayOutputStream and conversion between
-# Ruby String and Java bytes
-module Puma
-  class JavaIOBuffer < java.io.ByteArrayOutputStream
-    field_reader :buf
-  end
-
-  class IOBuffer
-    BUF_DEFAULT_SIZE = 4096
-
-    def initialize
-      @buf = JavaIOBuffer.new(BUF_DEFAULT_SIZE)
-    end
-
-    def reset
-      @buf.reset
-    end
-
-    def <<(str)
-      bytes = str.to_java_bytes
-      @buf.write(bytes, 0, bytes.length)
-    end
-
-    def append(*strs)
-      strs.each { |s| self << s; }
-    end
-
-    def to_s
-      String.from_java_bytes @buf.to_byte_array
-    end
-
-    alias_method :to_str, :to_s
-
-    def used
-      @buf.size
-    end
-
-    def capacity
-      @buf.buf.length
-    end
-  end
-end

data/lib/puma/rack_patch.rb

@@ -1,25 +0,0 @@
-require 'rack/commonlogger'
-
-module Rack
-  # Patch CommonLogger to use after_reply.
-  #
-  # Simply request this file and CommonLogger will be a bit more 
-  # efficient.
-  class CommonLogger
-    remove_method :call
-
-    def call(env)
-      began_at = Time.now
-      status, header, body = @app.call(env)
-      header = Utils::HeaderHash.new(header)
-
-      if ary = env['rack.after_reply']
-        ary << lambda { log(env, status, header, began_at) }
-      else
-        body = BodyProxy.new(body) { log(env, status, header, began_at) }
-      end
-
-      [status, header, body]
-    end
-  end
-end

data/puma.gemspec

@@ -1,45 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "puma"
-  s.version = "2.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Evan Phoenix"]
-  s.date = "2013-07-02"
-  s.description = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. In order to get the best throughput, it is highly recommended that you use a  Ruby implementation with real threads like Rubinius or JRuby."
-  s.email = ["evan@phx.io"]
-  s.executables = ["puma", "pumactl"]
-  s.extensions = ["ext/puma_http11/extconf.rb"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.md", "docs/config.md", "docs/nginx.md", "tools/jungle/init.d/README.md", "tools/jungle/upstart/README.md"]
-  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "docs/config.md", "docs/nginx.md", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/io_buffer.c", "ext/puma_http11/mini_ssl.c", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/org/jruby/puma/MiniSSL.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/accept_nonblock.rb", "lib/puma/app/status.rb", "lib/puma/binder.rb", "lib/puma/capistrano.rb", "lib/puma/cli.rb", "lib/puma/client.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/daemon_ext.rb", "lib/puma/delegation.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/io_buffer.rb", "lib/puma/java_io_buffer.rb", "lib/puma/jruby_restart.rb", "lib/puma/minissl.rb", "lib/puma/null_io.rb", "lib/puma/rack_default.rb", "lib/puma/rack_patch.rb", "lib/puma/reactor.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/puma/util.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tools/jungle/init.d/README.md", "tools/jungle/init.d/puma", "tools/jungle/init.d/run-puma", "tools/jungle/upstart/README.md", "tools/jungle/upstart/puma-manager.conf", "tools/jungle/upstart/puma.conf", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
-  s.homepage = "http://puma.io"
-  s.rdoc_options = ["--main", "README.md"]
-  s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubyforge_project = "puma"
-  s.rubygems_version = "1.8.25"
-  s.summary = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications"
-  s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, ["< 2.0", ">= 1.1"])
-      s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.6"])
-    else
-      s.add_dependency(%q<rack>, ["< 2.0", ">= 1.1"])
-      s.add_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.6"])
-    end
-  else
-    s.add_dependency(%q<rack>, ["< 2.0", ">= 1.1"])
-    s.add_dependency(%q<rdoc>, ["~> 4.0"])
-    s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.6"])
-  end
-end

data/test/test_app_status.rb

@@ -1,88 +0,0 @@
-require 'test/unit'
-require 'rack'
-require 'puma/app/status'
-
-class TestAppStatus < Test::Unit::TestCase
-  class FakeServer
-    def initialize
-      @status = :running
-      @backlog = 0
-      @running = 0
-    end
-
-    attr_reader :status
-    attr_accessor :backlog, :running
-
-    def stop
-      @status = :stop
-    end
-
-    def halt
-      @status = :halt
-    end
-  end
-
-  def setup
-    @server = FakeServer.new
-    @app = Puma::App::Status.new(@server, @server)
-    @app.auth_token = nil
-  end
-
-  def lint(uri)
-    app = Rack::Lint.new @app
-    mock_env = Rack::MockRequest.env_for uri
-    app.call mock_env
-  end
-
-  def test_bad_token
-    @app.auth_token = "abcdef"
-
-    status, _, _ = lint('/whatever')
-
-    assert_equal 403, status
-  end
-
-  def test_good_token
-    @app.auth_token = "abcdef"
-
-    status, _, _ = lint('/whatever?token=abcdef')
-
-    assert_equal 404, status
-  end
-
-  def test_unsupported
-    status, _, _ = lint('/not-real')
-
-    assert_equal 404, status
-  end
-
-  def test_stop
-    status, _ , app = lint('/stop')
-
-    assert_equal :stop, @server.status
-    assert_equal 200, status
-    assert_equal ['{ "status": "ok" }'], app.enum_for.to_a
-  end
-
-  def test_halt
-    status, _ , app = lint('/halt')
-
-    assert_equal :halt, @server.status
-    assert_equal 200, status
-    assert_equal ['{ "status": "ok" }'], app.enum_for.to_a
-  end
-
-  def test_stats
-    @server.backlog = 1
-    @server.running = 9
-    status, _ , app = lint('/stats')
-
-    assert_equal 200, status
-    assert_equal ['{ "backlog": 1, "running": 9 }'], app.enum_for.to_a
-  end
-
-  def test_alternate_location
-    status, _ , _ = lint('__alternatE_location_/stats')
-    assert_equal 200, status
-  end
-end

data/test/test_cli.rb

@@ -1,171 +0,0 @@
-require "rbconfig"
-require 'test/unit'
-require 'puma/cli'
-require 'tempfile'
-
-class TestCLI < Test::Unit::TestCase
-  def setup
-    @environment = 'production'
-    @tmp_file = Tempfile.new("puma-test")
-    @tmp_path = @tmp_file.path
-    @tmp_file.close!
-
-    @tmp_path2 = "#{@tmp_path}2"
-
-    File.unlink @tmp_path if File.exist? @tmp_path
-    File.unlink @tmp_path2 if File.exist? @tmp_path2
-  end
-
-  def teardown
-    File.unlink @tmp_path if File.exist? @tmp_path
-    File.unlink @tmp_path2 if File.exist? @tmp_path2
-  end
-
-  def test_pid_file
-    cli = Puma::CLI.new ["--pidfile", @tmp_path]
-    cli.parse_options
-    cli.write_pid
-
-    assert_equal File.read(@tmp_path).strip.to_i, Process.pid
-
-    cli.stop
-    assert !File.exist?(@tmp_path), "Pid file shouldn't exist anymore"
-  end
-
-  def test_control_for_tcp
-    url = "tcp://127.0.0.1:9877/"
-    sin = StringIO.new
-    sout = StringIO.new
-    cli = Puma::CLI.new ["-b", "tcp://127.0.0.1:9876",
-                         "--control", url,
-                         "--control-token", "",
-                         "test/lobster.ru"], sin, sout
-    cli.parse_options
-
-    thread_exception = nil
-    t = Thread.new do
-      begin
-        cli.run
-      rescue Exception => e
-        thread_exception = e
-      end
-    end 
-
-    sleep 1
-
-    s = TCPSocket.new "127.0.0.1", 9877
-    s << "GET /stats HTTP/1.0\r\n\r\n"
-    body = s.read
-    assert_equal '{ "backlog": 0, "running": 0 }', body.split("\r\n").last
-
-    cli.stop
-    t.join
-    assert_equal nil, thread_exception
-  end
-
-  unless defined?(JRUBY_VERSION) || RbConfig::CONFIG["host_os"] =~ /mingw|mswin/
-  def test_control
-    url = "unix://#{@tmp_path}"
-
-    sin = StringIO.new
-    sout = StringIO.new
-
-    cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}",
-                         "--control", url,
-                         "--control-token", "",
-                         "test/lobster.ru"], sin, sout
-    cli.parse_options
-
-    t = Thread.new { cli.run }
-
-    sleep 1
-
-    s = UNIXSocket.new @tmp_path
-    s << "GET /stats HTTP/1.0\r\n\r\n"
-    body = s.read
-
-    assert_equal '{ "backlog": 0, "running": 0 }', body.split("\r\n").last
-
-    cli.stop
-    t.join
-  end
-
-  def test_control_stop
-    url = "unix://#{@tmp_path}"
-
-    sin = StringIO.new
-    sout = StringIO.new
-
-    cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}",
-                         "--control", url,
-                         "--control-token", "",
-                         "test/lobster.ru"], sin, sout
-    cli.parse_options
-
-    t = Thread.new { cli.run }
-
-    sleep 1
-
-    s = UNIXSocket.new @tmp_path
-    s << "GET /stop HTTP/1.0\r\n\r\n"
-    body = s.read
-
-    assert_equal '{ "status": "ok" }', body.split("\r\n").last
-
-    t.join
-  end
-
-  def test_tmp_control
-    url = "tcp://127.0.0.1:8232"
-    cli = Puma::CLI.new ["--state", @tmp_path, "--control", "auto"]
-    cli.parse_options
-    cli.write_state
-
-    data = YAML.load File.read(@tmp_path)
-
-    assert_equal Process.pid, data["pid"]
-
-    url = data["config"].options[:control_url]
-
-    m = %r!unix://(.*)!.match(url)
-
-    assert m, "'#{url}' is not a URL"
-  end
-  end # JRUBY or Windows
-
-  def test_state
-    url = "tcp://127.0.0.1:8232"
-    cli = Puma::CLI.new ["--state", @tmp_path, "--control", url]
-    cli.parse_options
-    cli.write_state
-
-    data = YAML.load File.read(@tmp_path)
-
-    assert_equal Process.pid, data["pid"]
-    assert_equal url, data["config"].options[:control_url]
-  end
-
-  def test_load_path
-    cli = Puma::CLI.new ["--include", 'foo/bar']
-    cli.parse_options
-
-    assert_equal 'foo/bar', $LOAD_PATH[0]
-    $LOAD_PATH.shift
-
-    cli = Puma::CLI.new ["--include", 'foo/bar:baz/qux']
-    cli.parse_options
-
-    assert_equal 'foo/bar', $LOAD_PATH[0]
-    $LOAD_PATH.shift
-    assert_equal 'baz/qux', $LOAD_PATH[0]
-    $LOAD_PATH.shift
-  end
-
-  def test_environment
-    cli = Puma::CLI.new ["--environment", @environment]
-    cli.parse_options
-    cli.set_rack_environment
-
-    assert_equal ENV['RACK_ENV'], @environment 
-  end
-end

data/test/test_config.rb

@@ -1,16 +0,0 @@
-require 'test/unit'
-
-require 'puma'
-require 'puma/configuration'
-
-class TestConfigFile < Test::Unit::TestCase
-  def test_app_from_app_DSL
-    opts = { :config_file => "test/config/app.rb" }
-    conf = Puma::Configuration.new opts
-    conf.load
-
-    app = conf.app
-
-    assert_equal [200, {}, ["embedded app"]], app.call({})
-  end
-end

data/test/test_http10.rb

@@ -1,27 +0,0 @@
-require 'test/testhelp'
-
-class Http10ParserTest < Test::Unit::TestCase
-  include Puma
-
-  def test_parse_simple
-    parser = HttpParser.new
-    req = {}
-    http = "GET / HTTP/1.0\r\n\r\n"
-    nread = parser.execute(req, http, 0)
-
-    assert nread == http.length, "Failed to parse the full HTTP request"
-    assert parser.finished?, "Parser didn't finish"
-    assert !parser.error?, "Parser had error"
-    assert nread == parser.nread, "Number read returned from execute does not match"
-
-    assert_equal '/', req['REQUEST_PATH']
-    assert_equal 'HTTP/1.0', req['HTTP_VERSION']
-    assert_equal '/', req['REQUEST_URI']
-    assert_equal 'GET', req['REQUEST_METHOD']    
-    assert_nil req['FRAGMENT']
-    assert_nil req['QUERY_STRING']
-    
-    parser.reset
-    assert parser.nread == 0, "Number read after reset should be 0"
-  end
-end