jun-puma 1.0.0-java → 1.0.1-java

data/lib/puma/error_logger.rb

@@ -15,14 +15,14 @@ module Puma
 
     LOG_QUEUE = Queue.new
 
-    def initialize(ioerr, env: ENV)
+    def initialize(ioerr)
       @ioerr = ioerr
 
-      @debug = env.key?('PUMA_DEBUG')
+      @debug = ENV.key? 'PUMA_DEBUG'
     end
 
-    def self.stdio(env: ENV)
-      new($stderr, env: env)
+    def self.stdio
+      new $stderr
     end
 
     # Print occurred error details.

data/lib/puma/jruby_restart.rb

@@ -6,6 +6,22 @@ module Puma
   module JRubyRestart
     extend FFI::Library
     ffi_lib 'c'
+
+    attach_function :execlp, [:string, :varargs], :int
     attach_function :chdir, [:string], :int
+    attach_function :fork, [], :int
+    attach_function :exit, [:int], :void
+    attach_function :setsid, [], :int
+
+    def self.chdir_exec(dir, argv)
+      chdir(dir)
+      cmd = argv.first
+      argv = ([:string] * argv.size).zip(argv)
+      argv.flatten!
+      argv << :string
+      argv << nil
+      execlp(cmd, *argv)
+      raise SystemCallError.new(FFI.errno)
+    end
   end
 end

data/lib/puma/launcher.rb

@@ -46,8 +46,6 @@ module Puma
       @original_argv = @argv.dup
       @config        = conf
 
-      env = launcher_args.delete(:env) || ENV
-
       @config.options[:log_writer] = @log_writer
 
       # Advertise the Configuration
@@ -64,7 +62,7 @@ module Puma
       # Load the systemd integration if we detect systemd's NOTIFY_SOCKET.
       # Skip this on JRuby though, because it is incompatible with the systemd
       # integration due to https://github.com/jruby/jruby/issues/6504
-      if ENV["NOTIFY_SOCKET"] && !Puma.jruby? && !ENV["PUMA_SKIP_SYSTEMD"]
+      if ENV["NOTIFY_SOCKET"] && !Puma.jruby?
         @config.plugins.create('systemd')
       end
 
@@ -107,7 +105,7 @@ module Puma
 
       @status = :run
 
-      log_config if env['PUMA_LOG_CONFIG']
+      log_config if ENV['PUMA_LOG_CONFIG']
     end
 
     attr_reader :binder, :log_writer, :events, :config, :options, :restart_dir
@@ -289,9 +287,7 @@ module Puma
         close_binder_listeners
 
         require_relative 'jruby_restart'
-        argv = restart_args
-        JRubyRestart.chdir(@restart_dir)
-        Kernel.exec(*argv)
+        JRubyRestart.chdir_exec(@restart_dir, restart_args)
       elsif Puma.windows?
         close_binder_listeners
 

data/lib/puma/log_writer.rb

@@ -31,31 +31,31 @@ module Puma
     attr_accessor :formatter, :custom_logger
 
     # Create a LogWriter that prints to +stdout+ and +stderr+.
-    def initialize(stdout, stderr, env: ENV)
+    def initialize(stdout, stderr)
       @formatter = DefaultFormatter.new
       @custom_logger = nil
       @stdout = stdout
       @stderr = stderr
 
-      @debug = env.key?('PUMA_DEBUG')
-      @error_logger = ErrorLogger.new(@stderr, env: env)
+      @debug = ENV.key?('PUMA_DEBUG')
+      @error_logger = ErrorLogger.new(@stderr)
     end
 
     DEFAULT = new(STDOUT, STDERR)
 
     # Returns an LogWriter object which writes its status to
     # two StringIO objects.
-    def self.strings(env: ENV)
-      LogWriter.new(StringIO.new, StringIO.new, env: env)
+    def self.strings
+      LogWriter.new(StringIO.new, StringIO.new)
     end
 
-    def self.stdio(env: ENV)
-      LogWriter.new($stdout, $stderr, env: env)
+    def self.stdio
+      LogWriter.new($stdout, $stderr)
     end
 
-    def self.null(env: ENV)
+    def self.null
       n = NullIO.new
-      LogWriter.new(n, n, env: env)
+      LogWriter.new(n, n)
     end
 
     # Write +str+ to +@stdout+

data/lib/puma/minissl/context_builder.rb

@@ -57,7 +57,6 @@ module Puma
 
           ctx.ca = params['ca'] if params['ca']
           ctx.ssl_cipher_filter = params['ssl_cipher_filter'] if params['ssl_cipher_filter']
-          ctx.ssl_ciphersuites = params['ssl_ciphersuites'] if params['ssl_ciphersuites'] && HAS_TLS1_3
 
           ctx.reuse = params['reuse'] if params['reuse']
         end

data/lib/puma/minissl.rb

@@ -289,7 +289,6 @@ module Puma
         attr_reader :cert_pem
         attr_reader :key_pem
         attr_accessor :ssl_cipher_filter
-        attr_accessor :ssl_ciphersuites
         attr_accessor :verification_flags
 
         attr_reader :reuse, :reuse_cache_size, :reuse_timeout

data/lib/puma/null_io.rb

@@ -16,38 +16,15 @@ module Puma
     def each
     end
 
-    def pos
-      0
-    end
-
     # Mimics IO#read with no data.
     #
-    def read(length = nil, buffer = nil)
-      if length.to_i < 0
-        raise ArgumentError, "(negative length #{length} given)"
-      end
-
-      buffer = if buffer.nil?
-        "".b
-      else
-        String.try_convert(buffer) or raise TypeError, "no implicit conversion of #{buffer.class} into String"
-      end
-      buffer.clear
-      if length.to_i > 0
-        nil
-      else
-        buffer
-      end
+    def read(count = nil, _buffer = nil)
+      count && count > 0 ? nil : ""
     end
 
     def rewind
     end
 
-    def seek(pos, whence = 0)
-      raise ArgumentError, "negative length #{pos} given" if pos.negative?
-      0
-    end
-
     def close
     end
 

data/lib/puma/request.rb

@@ -53,6 +53,7 @@ module Puma
       socket  = client.io   # io may be a MiniSSL::Socket
       app_body = nil
 
+
       return false if closed_socket?(socket)
 
       if client.http_content_length_limit_exceeded
@@ -134,7 +135,7 @@ module Puma
       io_buffer.reset
       uncork_socket client.io
       app_body.close if app_body.respond_to? :close
-      client&.tempfile_close
+      client.tempfile&.unlink
       after_reply = env[RACK_AFTER_REPLY] || []
       begin
         after_reply.each { |o| o.call }
@@ -164,14 +165,9 @@ module Puma
       # if the server is at capacity and the listener has a new connection ready.
       # This allows Puma to service connections fairly when the number
       # of concurrent connections exceeds the size of the threadpool.
-      force_keep_alive = if @enable_keep_alives
-        requests < @max_fast_inline ||
+      force_keep_alive = requests < @max_fast_inline ||
         @thread_pool.busy_threads < @max_threads ||
         !client.listener.to_io.wait_readable(0)
-      else
-        # Always set force_keep_alive to false if the server has keep-alives not enabled.
-        false
-      end
 
       resp_info = str_headers(env, status, headers, res_body, io_buffer, force_keep_alive)
 
@@ -499,11 +495,6 @@ module Puma
     # compatibility, we'll convert them back. This code is written to
     # avoid allocation in the common case (ie there are no headers
     # with `,` in their names), that's why it has the extra conditionals.
-    #
-    # @note If a normalized version of a `,` header already exists, we ignore
-    #       the `,` version. This prevents clobbering headers managed by proxies
-    #       but not by clients (Like X-Forwarded-For).
-    #
     # @param env [Hash] see Puma::Client#env, from request, modifies in place
     # @version 5.0.3
     #
@@ -512,31 +503,23 @@ module Puma
       to_add = nil
 
       env.each do |k,v|
-        if k.start_with?("HTTP_") && k.include?(",") && !UNMASKABLE_HEADERS.key?(k)
+        if k.start_with?("HTTP_") && k.include?(",") && k != "HTTP_TRANSFER,ENCODING"
           if to_delete
             to_delete << k
           else
             to_delete = [k]
           end
 
-          new_k = k.tr(",", "_")
-          if env.key?(new_k)
-            next
-          end
-
           unless to_add
             to_add = {}
           end
 
-          to_add[new_k] = v
+          to_add[k.tr(",", "_")] = v
         end
       end
 
-      if to_delete # rubocop:disable Style/SafeNavigation
+      if to_delete
         to_delete.each { |k| env.delete(k) }
-      end
-
-      if to_add
         env.merge! to_add
       end
     end

data/lib/puma/runner.rb

@@ -27,7 +27,7 @@ module Puma
     def wakeup!
       return unless @wakeup
 
-      @wakeup.write Puma::Const::PipeRequest::WAKEUP unless @wakeup.closed?
+      @wakeup.write "!" unless @wakeup.closed?
 
     rescue SystemCallError, IOError
       Puma::Util.purge_interrupt_queue

data/lib/puma/server.rb

@@ -18,9 +18,6 @@ require 'io/wait' unless Puma::HAS_NATIVE_IO_WAIT
 
 module Puma
 
-  # This method was private on Ruby 2.4 but became public on Ruby 2.5+:
-  Thread.send(:attr_accessor, :puma_server)
-
   # The HTTP Server itself. Serves out a single Rack app.
   #
   # This class is used by the `Puma::Single` and `Puma::Cluster` classes
@@ -35,12 +32,12 @@ module Puma
     include Puma::Const
     include Request
 
-    attr_reader :options
     attr_reader :thread
     attr_reader :log_writer
     attr_reader :events
     attr_reader :min_threads, :max_threads  # for #stats
     attr_reader :requests_count             # @version 5.0.0
+    attr_reader :idle_timeout_reached
 
     # @todo the following may be deprecated in the future
     attr_reader :auto_trim_time, :early_hints, :first_data_timeout,
@@ -50,6 +47,7 @@ module Puma
     attr_accessor :app
     attr_accessor :binder
 
+    THREAD_LOCAL_KEY = :puma_server
 
     # Create a server for the rack app +app+.
     #
@@ -84,8 +82,6 @@ module Puma
         UserFileDefaultOptions.new(options, Configuration::DEFAULTS)
       end
 
-      @clustered                 = (@options.fetch :workers, 0) > 0
-      @worker_write              = @options[:worker_write]
       @log_writer                = @options.fetch :log_writer, LogWriter.stdio
       @early_hints               = @options[:early_hints]
       @first_data_timeout        = @options[:first_data_timeout]
@@ -95,7 +91,6 @@ module Puma
       @max_threads               = @options[:max_threads]
       @queue_requests            = @options[:queue_requests]
       @max_fast_inline           = @options[:max_fast_inline]
-      @enable_keep_alives        = @options[:enable_keep_alives]
       @io_selector_backend       = @options[:io_selector_backend]
       @http_content_length_limit = @options[:http_content_length_limit]
 
@@ -134,7 +129,7 @@ module Puma
     class << self
       # @!attribute [r] current
       def current
-        Thread.current.puma_server
+        Thread.current[THREAD_LOCAL_KEY]
       end
 
       # :nodoc:
@@ -246,7 +241,7 @@ module Puma
 
       @status = :run
 
-      @thread_pool = ThreadPool.new(thread_name, options) { |client| process_client client }
+      @thread_pool = ThreadPool.new(thread_name, @options) { |client| process_client client }
 
       if @queue_requests
         @reactor = Reactor.new(@io_selector_backend) { |c| reactor_wakeup c }
@@ -254,8 +249,8 @@ module Puma
       end
 
 
-      @thread_pool.auto_reap! if options[:reaping_time]
-      @thread_pool.auto_trim! if options[:auto_trim_time]
+      @thread_pool.auto_reap! if @options[:reaping_time]
+      @thread_pool.auto_trim! if @options[:auto_trim_time]
 
       @check, @notify = Puma::Util.pipe unless @notify
 
@@ -319,15 +314,15 @@ module Puma
         sockets = [check] + @binder.ios
         pool = @thread_pool
         queue_requests = @queue_requests
-        drain = options[:drain_on_shutdown] ? 0 : nil
+        drain = @options[:drain_on_shutdown] ? 0 : nil
 
-        addr_send_name, addr_value = case options[:remote_address]
+        addr_send_name, addr_value = case @options[:remote_address]
         when :value
-          [:peerip=, options[:remote_address_value]]
+          [:peerip=, @options[:remote_address_value]]
         when :header
-          [:remote_addr_header=, options[:remote_address_header]]
+          [:remote_addr_header=, @options[:remote_address_header]]
         when :proxy_protocol
-          [:expect_proxy_proto=, options[:remote_address_proxy_protocol]]
+          [:expect_proxy_proto=, @options[:remote_address_proxy_protocol]]
         else
           [nil, nil]
         end
@@ -338,30 +333,18 @@ module Puma
             unless ios
               unless shutting_down?
                 @idle_timeout_reached = true
-
-                if @clustered
-                  @worker_write << "#{PipeRequest::IDLE}#{Process.pid}\n" rescue nil
-                  next
-                else
-                  @log_writer.log "- Idle timeout reached"
-                  @status = :stop
-                end
+                @status = :stop
               end
 
               break
             end
 
-            if @idle_timeout_reached && @clustered
-              @idle_timeout_reached = false
-              @worker_write << "#{PipeRequest::IDLE}#{Process.pid}\n" rescue nil
-            end
-
             ios.first.each do |sock|
               if sock == check
                 break if handle_check
               else
                 pool.wait_until_not_full
-                pool.wait_for_less_busy_worker(options[:wait_for_less_busy_worker])
+                pool.wait_for_less_busy_worker(@options[:wait_for_less_busy_worker])
 
                 io = begin
                   sock.accept_nonblock
@@ -441,9 +424,9 @@ module Puma
     # Return true if one or more requests were processed.
     def process_client(client)
       # Advertise this server into the thread
-      Thread.current.puma_server = self
+      Thread.current[THREAD_LOCAL_KEY] = self
 
-      clean_thread_locals = options[:clean_thread_locals]
+      clean_thread_locals = @options[:clean_thread_locals]
       close_socket = true
 
       requests = 0
@@ -552,7 +535,7 @@ module Puma
     # A fallback rack response if +@app+ raises as exception.
     #
     def lowlevel_error(e, env, status=500)
-      if handler = options[:lowlevel_error_handler]
+      if handler = @options[:lowlevel_error_handler]
         if handler.arity == 1
           return handler.call(e)
         elsif handler.arity == 2
@@ -573,13 +556,14 @@ module Puma
     def response_to_error(client, requests, err, status_code)
       status, headers, res_body = lowlevel_error(err, client.env, status_code)
       prepare_response(status, headers, res_body, requests, client)
+      client.write_error(status_code)
     end
     private :response_to_error
 
     # Wait for all outstanding requests to finish.
     #
     def graceful_shutdown
-      if options[:shutdown_debug]
+      if @options[:shutdown_debug]
         threads = Thread.list
         total = threads.size
 
@@ -599,7 +583,7 @@ module Puma
       end
 
       if @thread_pool
-        if timeout = options[:force_shutdown_after]
+        if timeout = @options[:force_shutdown_after]
           @thread_pool.shutdown timeout.to_f
         else
           @thread_pool.shutdown

data/lib/puma/state_file.rb

@@ -56,11 +56,11 @@ module Puma
     end
 
     ALLOWED_FIELDS.each do |f|
-      define_method f.to_sym do
+      define_method f do
         @options[f]
       end
 
-      define_method :"#{f}=" do |v|
+      define_method "#{f}=" do |v|
         @options[f] = v
       end
     end

data/lib/puma/util.rb

@@ -11,7 +11,7 @@ module Puma
     end
 
     # An instance method on Thread has been provided to address https://bugs.ruby-lang.org/issues/13632,
-    # which currently affects some older versions of Ruby: 2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1
+    # which currently effects some older versions of Ruby: 2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1
     # Additional context: https://github.com/puma/puma/pull/1345
     def purge_interrupt_queue
       Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue

data/lib/rack/handler/puma.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
+# This module is used as an 'include' file in code at bottom of file
 module Puma
-
-  # This module is used as an 'include' file in code at bottom of file. It loads
-  # into either `Rackup::Handler::Puma` or `Rack::Handler::Puma`.
-
   module RackHandler
     DEFAULT_OPTIONS = {
       :Verbose => false,
@@ -96,9 +93,9 @@ module Puma
     def set_host_port_to_config(host, port, config)
       config.clear_binds! if host || port
 
-      if host&.start_with? '.', '/', '@'
+      if host && (host[0,1] == '.' || host[0,1] == '/')
         config.bind "unix://#{host}"
-      elsif host&.start_with? 'ssl://'
+      elsif host && host =~ /^ssl:\/\//
         uri = URI.parse(host)
         uri.port ||= port || ::Puma::Configuration::DEFAULTS[:tcp_port]
         config.bind uri.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jun-puma
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: java
 authors:
 - Evan Phoenix
@@ -24,11 +24,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: |
-  Puma is a simple, fast, multi-threaded, and highly parallel HTTP 1.1 server
-  for Ruby/Rack applications. Puma is intended for use in both development and
-  production environments. It's great for highly parallel Ruby implementations such as
-  JRuby and TruffleRuby as well as as providing process worker support to support CRuby well.
+description: Puma is a simple, fast, threaded, and highly parallel HTTP 1.1 server
+  for Ruby/Rack applications. Puma is intended for use in both development and production
+  environments. It's great for highly parallel Ruby implementations such as Rubinius
+  and JRuby as well as as providing process worker support to support CRuby well.
 email:
 - evan@phx.io
 executables:
@@ -146,8 +145,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
-summary: A Ruby/Rack web server built for parallelism.
+summary: Puma is a simple, fast, threaded, and highly parallel HTTP 1.1 server for
+  Ruby/Rack applications
 test_files: []