thin 1.6.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59e48abc41d2a88e89281a8902c419f1eecfb5ac
-  data.tar.gz: 2a10974b8d31419469cee3940e9a206f8217f4de
+  metadata.gz: 4541fb4ab6d2f90d8ca0053e41103ba2faed4f83
+  data.tar.gz: 0e68ce58e93e07f3bd93a51ab180bc1c64b2757c
 SHA512:
-  metadata.gz: 19c24955dc648213173e227df391a325c4de88b48d59c37929977b5524e9cdc834717430cfb6b294fa9d0b59f4205776a2918a64db4f3985fe5d5c6ea0b62708
-  data.tar.gz: 98e01afb757f4e7258b73799bee4a83daf05786edf771025da785b354d12be70444aae73f222d9c19859f9574e1a4002b3fbea934e178b841a5dbb8fbd08a8fa
+  metadata.gz: be8f1c6914e4f6ae498718595841ee682bc7c41590e0c8128ff2f5233621932e242542502bd4881b24b617b37503c98bb619fdd8c2dec0a0cc5a6b2c3a7de561
+  data.tar.gz: 5f86ca62b6088e2a778fa8d9b777e7e60ceeea6bd7dfc21a6420e04ded91b03f03dc11c9a988099e11cab9d30e2a809330129b6ae74e974815348c55398c9989

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 1.7.0 Dunder Mifflin
+ * Rack 2 support
+ * Ensure Response body.close is called in the same thread
+   Fixes issues with ActiveRecord connection management [#307]
+ * Fix TCP/IP Backend reports incorrect port when asked to bind to 0 [meschbach]
+ * Work with ruby 2.3's --enable-frozen-string-literal [jeremyevans]
+
 == 1.6.4 Gob Bluth
  * Increase REQUEST_PATH to 2048 symbols [X2rdas]
  * Fix warning in logger [tenderlove]

data/README.md

@@ -64,7 +64,7 @@ Thin is quite flexible in that many options can be specified at the command line
 
 ### Configuration files
 
-You can create configuration files in yaml format and feed them to thin using `thin -C config.yml`.  Here is an example config file:
+You can create configuration files in yaml format and feed them to thin using `thin start -C config.yml`.  Here is an example config file:
 
 ```yaml
 --- 

data/ext/thin_parser/parser.c

@@ -1437,11 +1437,6 @@ int thin_http_parser_is_finished(http_parser *parser) {
 
 int thin_http_parser_finish(http_parser *parser)
 {
-  int cs = parser->cs;
-
-
-  parser->cs = cs;
-
   if (thin_http_parser_has_error(parser) ) {
     return -1;
   } else if (thin_http_parser_is_finished(parser) ) {

data/ext/thin_parser/parser.rl

@@ -142,11 +142,6 @@ int thin_http_parser_is_finished(http_parser *parser) {
 
 int thin_http_parser_finish(http_parser *parser)
 {
-  int cs = parser->cs;
-
-
-  parser->cs = cs;
-
   if (thin_http_parser_has_error(parser) ) {
     return -1;
   } else if (thin_http_parser_is_finished(parser) ) {

data/lib/thin/backends/tcp_server.rb

@@ -4,26 +4,31 @@ module Thin
     class TcpServer < Base
       # Address and port on which the server is listening for connections.
       attr_accessor :host, :port
-      
+
       def initialize(host, port)
         @host = host
         @port = port
         super()
       end
-      
+
       # Connect the server
       def connect
         @signature = EventMachine.start_server(@host, @port, Connection, &method(:initialize_connection))
+        binary_name = EventMachine.get_sockname( @signature )
+        port_name = Socket.unpack_sockaddr_in( binary_name )
+        @port = port_name[0]
+        @host = port_name[1]
+        @signature
       end
-      
+
       # Stops the server
       def disconnect
         EventMachine.stop_server(@signature)
       end
-            
+
       def to_s
         "#{@host}:#{@port}"
       end
     end
   end
-end
+end

data/lib/thin/connection.rb

@@ -47,7 +47,7 @@ module Thin
     def process
       if threaded?
         @request.threaded = true
-        EventMachine.defer(method(:pre_process), method(:post_process))
+        EventMachine.defer { post_process(pre_process) }
       else
         @request.threaded = false
         post_process(pre_process)

data/lib/thin/request.rb

@@ -13,7 +13,7 @@ module Thin
     BODY_TMPFILE      = 'thin-body'.freeze
     MAX_HEADER        = 1024 * (80 + 32)
 
-    INITIAL_BODY      = ''
+    INITIAL_BODY      = String.new
     # Force external_encoding of request's body to ASCII_8BIT
     INITIAL_BODY.encode!(Encoding::ASCII_8BIT) if INITIAL_BODY.respond_to?(:encode!) && defined?(Encoding::ASCII_8BIT)
 
@@ -52,7 +52,7 @@ module Thin
 
     def initialize
       @parser   = Thin::HttpParser.new
-      @data     = ''
+      @data     = String.new
       @nparsed  = 0
       @body     = StringIO.new(INITIAL_BODY.dup)
       @env      = {

data/lib/thin/server.rb

@@ -1,10 +1,10 @@
 module Thin
-  # The uterly famous Thin HTTP server.
-  # It listen for incoming request through a given +backend+
-  # and forward all request to +app+.
+  # The utterly famous Thin HTTP server.
+  # It listens for incoming requests through a given +backend+
+  # and forwards all requests to +app+.
   #
   # == TCP server
-  # Create a new TCP server on bound to <tt>host:port</tt> by specifiying +host+
+  # Create a new TCP server bound to <tt>host:port</tt> by specifiying +host+
   # and +port+ as the first 2 arguments.
   #
   #   Thin::Server.start('0.0.0.0', 3000, app)
@@ -18,12 +18,12 @@ module Thin
   #
   # == Using a custom backend
   # You can implement your own way to connect the server to its client by creating your
-  # own Backend class and pass it as the :backend option.
+  # own Backend class and passing it as the :backend option.
   #
   #   Thin::Server.start('galaxy://faraway', 1345, app, :backend => Thin::Backends::MyFancyBackend)
   #
   # == Rack application (+app+)
-  # All requests will be processed through +app+ that must be a valid Rack adapter.
+  # All requests will be processed through +app+, which must be a valid Rack adapter.
   # A valid Rack adapter (application) must respond to <tt>call(env#Hash)</tt> and
   # return an array of <tt>[status, headers, body]</tt>.
   #
@@ -76,10 +76,10 @@ module Thin
     # Maximum number of file or socket descriptors that the server may open.
     def_delegators :backend, :maximum_connections, :maximum_connections=
     
-    # Maximum number of connection that can be persistent at the same time.
-    # Most browser never close the connection so most of the time they are closed
-    # when the timeout occur. If we don't control the number of persistent connection,
-    # if would be very easy to overflow the server for a DoS attack.
+    # Maximum number of connections that can be persistent at the same time.
+    # Most browsers never close the connection so most of the time they are closed
+    # when the timeout occurs. If we don't control the number of persistent connections,
+    # it would be very easy to overflow the server for a DoS attack.
     def_delegators :backend, :maximum_persistent_connections, :maximum_persistent_connections=
     
     # Allow using threads in the backend.
@@ -166,7 +166,7 @@ module Thin
     # == Gracefull shutdown
     # Stops the server after processing all current connections.
     # As soon as this method is called, the server stops accepting
-    # new requests and wait for all current connections to finish.
+    # new requests and waits for all current connections to finish.
     # Calling twice is the equivalent of calling <tt>stop!</tt>.
     def stop
       if running?

data/lib/thin/version.rb

@@ -5,12 +5,12 @@ module Thin
   
   module VERSION #:nodoc:
     MAJOR    = 1
-    MINOR    = 6
-    TINY     = 4
+    MINOR    = 7
+    TINY     = 0
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Gob Bluth".freeze
+    CODENAME = "Dunder Mifflin".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: thin
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.7.0
 platform: ruby
 authors:
 - Marc-Andre Cournoyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-19 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement