Skip to content

Commit

Permalink
Merge pull request #2370 from MSP-Greg/fix-2368
Browse files Browse the repository at this point in the history
Fix my errors in 2368 [changelog skip]
  • Loading branch information
MSP-Greg committed Sep 17, 2020
2 parents 038a0d9 + b895566 commit 4be4069
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/puma/binder.rb
Expand Up @@ -53,7 +53,7 @@ def initialize(events, conf = Configuration.new)
attr_reader :ios

# @version 5.0.0
attr_reader :activated_sockets, :envs, :inherited_fds, :listeners, :proto_env, , :unix_paths
attr_reader :activated_sockets, :envs, :inherited_fds, :listeners, :proto_env, :unix_paths

# @version 5.0.0
attr_writer :ios, :listeners
Expand Down
2 changes: 1 addition & 1 deletion lib/puma/dsl.rb
Expand Up @@ -17,7 +17,7 @@ module Puma
# puts config.options[:binds] # => "tcp://127.0.0.1:3001"
#
# Used to load file:
#
#
# $ cat puma_config.rb
# port 3002
#
Expand Down
2 changes: 1 addition & 1 deletion lib/puma/minissl.rb
Expand Up @@ -139,7 +139,7 @@ def write(data)

# This is a temporary fix to deal with websockets code using
# write_nonblock.

# The problem with implementing it properly
# is that it means we'd have to have the ability to rewind
# an engine because after we write+extract, the socket
Expand Down

0 comments on commit 4be4069

Please sign in to comment.