puma 4.1.1 → 5.0.0

data/lib/rack/handler/puma.rb

@@ -30,8 +30,6 @@ module Rack
         end
 
         conf = ::Puma::Configuration.new(options, default_options) do |user_config, file_config, default_config|
-          user_config.quiet
-
           if options.delete(:Verbose)
             app = Rack::CommonLogger.new(app, STDOUT)
           end
@@ -61,9 +59,7 @@ module Rack
         conf
       end
 
-
-
-      def self.run(app, options = {})
+      def self.run(app, **options)
         conf   = self.config(app, options)
 
         events = options.delete(:Silent) ? ::Puma::Events.strings : ::Puma::Events.stdio

data/tools/Dockerfile

@@ -0,0 +1,16 @@
+# Use this Dockerfile to create minimal reproductions of issues
+
+FROM ruby:2.6
+
+# throw errors if Gemfile has been modified since Gemfile.lock
+RUN bundle config --global frozen 1
+
+WORKDIR /usr/src/app
+
+COPY . .
+RUN gem install bundler
+RUN bundle install
+RUN bundle exec rake compile
+
+EXPOSE 9292
+CMD bundle exec bin/puma test/rackup/hello.ru

data/tools/trickletest.rb

@@ -38,7 +38,6 @@ ARGV[1].to_i.times do
     do_test(st, size)
   end
 
-  t.abort_on_exception = true
   threads << t
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Evan Phoenix
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -45,9 +45,17 @@ files:
 - bin/pumactl
 - docs/architecture.md
 - docs/deployment.md
+- docs/fork_worker.md
 - docs/images/puma-connection-flow-no-reactor.png
 - docs/images/puma-connection-flow.png
 - docs/images/puma-general-arch.png
+- docs/jungle/README.md
+- docs/jungle/rc.d/README.md
+- docs/jungle/rc.d/puma
+- docs/jungle/rc.d/puma.conf
+- docs/jungle/upstart/README.md
+- docs/jungle/upstart/puma-manager.conf
+- docs/jungle/upstart/puma.conf
 - docs/nginx.md
 - docs/plugins.md
 - docs/restart.md
@@ -61,11 +69,10 @@ files:
 - 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/no_ssl/PumaHttp11Service.java
 - ext/puma_http11/org/jruby/puma/Http11.java
 - ext/puma_http11/org/jruby/puma/Http11Parser.java
-- ext/puma_http11/org/jruby/puma/IOBuffer.java
 - ext/puma_http11/org/jruby/puma/MiniSSL.java
 - ext/puma_http11/puma_http11.c
 - lib/puma.rb
@@ -79,16 +86,15 @@ files:
 - lib/puma/configuration.rb
 - lib/puma/const.rb
 - lib/puma/control_cli.rb
-- lib/puma/convenient.rb
-- lib/puma/daemon_ext.rb
-- lib/puma/delegation.rb
 - lib/puma/detect.rb
 - lib/puma/dsl.rb
+- lib/puma/error_logger.rb
 - lib/puma/events.rb
 - lib/puma/io_buffer.rb
 - lib/puma/jruby_restart.rb
 - lib/puma/launcher.rb
 - lib/puma/minissl.rb
+- lib/puma/minissl/context_builder.rb
 - lib/puma/null_io.rb
 - lib/puma/plugin.rb
 - lib/puma/plugin/tmp_restart.rb
@@ -100,27 +106,20 @@ files:
 - lib/puma/server.rb
 - lib/puma/single.rb
 - lib/puma/state_file.rb
-- lib/puma/tcp_logger.rb
 - lib/puma/thread_pool.rb
 - lib/puma/util.rb
 - lib/rack/handler/puma.rb
-- tools/jungle/README.md
-- tools/jungle/init.d/README.md
-- tools/jungle/init.d/puma
-- tools/jungle/init.d/run-puma
-- tools/jungle/rc.d/README.md
-- tools/jungle/rc.d/puma
-- tools/jungle/rc.d/puma.conf
-- tools/jungle/upstart/README.md
-- tools/jungle/upstart/puma-manager.conf
-- tools/jungle/upstart/puma.conf
+- tools/Dockerfile
 - tools/trickletest.rb
-homepage: http://puma.io
+homepage: https://puma.io
 licenses:
 - BSD-3-Clause
 metadata:
-  msys2_mingw_dependencies: openssl
-post_install_message: 
+  bug_tracker_uri: https://github.com/puma/puma/issues
+  changelog_uri: https://github.com/puma/puma/blob/master/History.md
+  homepage_uri: https://puma.io
+  source_code_uri: https://github.com/puma/puma
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,8 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
   Ruby/Rack applications

data/ext/puma_http11/io_buffer.c

@@ -1,155 +0,0 @@
-#define RSTRING_NOT_MODIFIED 1
-#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) {
-  xfree(internal->top);
-  xfree(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 = ALLOC_N(uint8_t, 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 = ALLOC_N(uint8_t, new_size);
-    old = b->top;
-    memcpy(top, old, used);
-    b->top = top;
-    b->cur = top + used;
-    b->size = new_size;
-    xfree(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 = ALLOC_N(uint8_t, new_size);
-    old = b->top;
-    memcpy(top, old, used);
-    b->top = top;
-    b->cur = top + used;
-    b->size = new_size;
-    xfree(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((const char*)(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/ext/puma_http11/org/jruby/puma/IOBuffer.java

@@ -1,72 +0,0 @@
-package org.jruby.puma;
-
-import org.jruby.*;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.util.ByteList;
-
-/**
- * @author kares
- */
-public class IOBuffer extends RubyObject {
-
-    private static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new IOBuffer(runtime, klass);
-        }
-    };
-
-    public static void createIOBuffer(Ruby runtime) {
-        RubyModule mPuma = runtime.defineModule("Puma");
-        RubyClass cIOBuffer = mPuma.defineClassUnder("IOBuffer", runtime.getObject(), ALLOCATOR);
-        cIOBuffer.defineAnnotatedMethods(IOBuffer.class);
-    }
-
-    private static final int DEFAULT_SIZE = 4096;
-
-    final ByteList buffer = new ByteList(DEFAULT_SIZE);
-
-    IOBuffer(Ruby runtime, RubyClass klass) {
-        super(runtime, klass);
-    }
-
-    @JRubyMethod
-    public RubyInteger used(ThreadContext context) {
-        return context.runtime.newFixnum(buffer.getRealSize());
-    }
-
-    @JRubyMethod
-    public RubyInteger capacity(ThreadContext context) {
-        return context.runtime.newFixnum(buffer.unsafeBytes().length);
-    }
-
-    @JRubyMethod
-    public IRubyObject reset() {
-        buffer.setRealSize(0);
-        return this;
-    }
-
-    @JRubyMethod(name = { "to_s", "to_str" })
-    public RubyString to_s(ThreadContext context) {
-        return RubyString.newStringShared(context.runtime, buffer.unsafeBytes(), 0, buffer.getRealSize());
-    }
-
-    @JRubyMethod(name = "<<")
-    public IRubyObject add(IRubyObject str) {
-        addImpl(str.convertToString());
-        return this;
-    }
-
-    @JRubyMethod(rest = true)
-    public IRubyObject append(IRubyObject[] strs) {
-        for (IRubyObject str : strs) addImpl(str.convertToString());
-        return this;
-    }
-
-    private void addImpl(RubyString str) {
-        buffer.append(str.getByteList());
-    }
-
-}

data/lib/puma/convenient.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'puma/launcher'
-require 'puma/configuration'
-
-module Puma
-  def self.run(opts={})
-    cfg = Puma::Configuration.new do |user_config|
-      if port = opts[:port]
-        user_config.port port
-      end
-
-      user_config.quiet
-
-      yield c
-    end
-
-    cfg.clamp
-
-    events = Puma::Events.null
-
-    launcher = Puma::Launcher.new cfg, :events => events
-    launcher.run
-  end
-end

data/lib/puma/daemon_ext.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Process
-
-  # This overrides the default version because it is broken if it
-  # exists.
-
-  if respond_to? :daemon
-    class << self
-      remove_method :daemon
-    end
-  end
-
-  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
-      STDIN.reopen File.open("/dev/null", "r")
-
-      null_out = File.open "/dev/null", "w"
-      STDOUT.reopen null_out
-      STDERR.reopen null_out
-    end
-
-    0
-  end
-end

data/lib/puma/delegation.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Puma
-  module Delegation
-    def forward(what, who)
-      module_eval <<-CODE
-        def #{what}(*args, &block)
-          #{who}.#{what}(*args, &block)
-        end
-      CODE
-    end
-  end
-end