puma 2.13.2-java → 2.13.3-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/History.txt +7 -0
  3. data/lib/puma/configuration.rb +3 -2
  4. data/lib/puma/const.rb +1 -1
  5. data/lib/puma/puma_http11.jar +0 -0
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 950f4fe0ed3173494763fb949c742a88319e967b
4
- data.tar.gz: 446b77c596561c9216e2c587d55487e9d6f4dba8
3
+ metadata.gz: a5c0945e389a866a64b4dd9bc94a08539b3a935a
4
+ data.tar.gz: d1b1ceda7c15edd2986d0dfc6456ea9634a8a928
5
5
  SHA512:
6
- metadata.gz: 18faef328bce6b2bfc01c3082f8c62f900b19ac845602fc6badda73d0f6e6bdc284ad3c03664a0a0dd7913cc82b2bad8dcb90c288aecb46c2c1283ab6f38035f
7
- data.tar.gz: a82e87b419e711eca07826176ed38cfde67747c15219005c76ddaf3623a7e8c056e0eed9fa17b1a4a506c93b09e441e225fb3038eb48fe1fdfcf1003dca8547d
6
+ metadata.gz: 7ae8486d2f8a55345cd89f3d80bfee4d1c523b0dad25e2829b79a91bd669182f4a7ece7bde6f6090f3142f77a7dec7e82a48351923766adef07ac7966c19fd52
7
+ data.tar.gz: 80e87121752da9cf03c2fe64fcdd9df7e9fcb8980d45d93e39676ae8e2e5f86da6f80d7b20d358c9573fd78dfa6eb56ca06ef672d71bd69cf65c24e35f0dd620
data/History.txt CHANGED
@@ -1,3 +1,10 @@
1
+ === 2.13.3 / 2015-08-15
2
+
3
+ Seriously, I need to revamp config with tests.
4
+
5
+ * 1 bug fix:
6
+ * Fix preserving options before cleaning for state. Fixes #769
7
+
1
8
  === 2.13.2 / 2015-08-15
2
9
 
3
10
  The "clearly I don't have enough tests for the config" release.
data/lib/puma/configuration.rb CHANGED
@@ -35,7 +35,9 @@ module Puma
35
35
  attr_reader :options
36
36
 
37
37
  def initialize_copy(other)
38
- @conf = @conf.dup
38
+ @conf = nil
39
+ @cli_options = nil
40
+ @options = @options.dup
39
41
  end
40
42
 
41
43
  def default_options
@@ -55,7 +57,6 @@ module Puma
55
57
 
56
58
  # Load the options in the right priority
57
59
  #
58
- @options = {}
59
60
  @options.merge! default_options
60
61
  @options.merge! @conf
61
62
  @options.merge! @cli_options
data/lib/puma/const.rb CHANGED
@@ -99,7 +99,7 @@ module Puma
99
99
  # too taxing on performance.
100
100
  module Const
101
101
 
102
- PUMA_VERSION = VERSION = "2.13.2".freeze
102
+ PUMA_VERSION = VERSION = "2.13.3".freeze
103
103
  CODE_NAME = "A Midsummer Code's Dream".freeze
104
104
 
105
105
  FAST_TRACK_KA_TIMEOUT = 0.2
data/lib/puma/puma_http11.jar CHANGED
Binary file
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puma
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.13.2
4
+ version: 2.13.3
5
5
  platform: java
6
6
  authors:
7
7
  - Evan Phoenix
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-08-15 00:00:00.000000000 Z
11
+ date: 2015-08-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement