puma 2.13.4 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6d1f76be9cff6f4869f548f8a79ffd38f7aca1e
-  data.tar.gz: 9b9f96f22bddf25bda4781383ae1a27de6c14d79
+  metadata.gz: a1906e2cec23c83e7ed5a2e8fb54885809c8bfa1
+  data.tar.gz: 8cd1fb3dc9caeb4fe4aa4be995e746beebdaa4d0
 SHA512:
-  metadata.gz: 1cbeaf17fc7745c596966329be4d8b49b0b350764102cf59a11f7d921309c2372803183da84ee55acbd1e2682193b0bef6c933b73ccfaf75a04b0200adc71851
-  data.tar.gz: e0e9447ad29dd98c3bef95080ec873ba28238b0a54dc1c2ec2639dbdae7029f59bd302cfabb893d2649126b3bb34a6616402b927a49ada0967bd58f1c6a248ae
+  metadata.gz: 74e867dea23de7b4743d810a29925eba7fbb2d4f674e7c9035985699dc35712d80591ea0b3b25a48b72d550f2550c42303719438c65b341e7b4d649af82b07ca
+  data.tar.gz: aa8af24acdcda63f9a8ebfe2ebc573dd048f6e408954125144cf424abfc990baa451b8f6c7197ed015ff30ed2b6d110d96b9c34f67312d8076726b0c278d1c5b

data/History.txt

@@ -1,3 +1,11 @@
+=== 2.14.0 / 2015-09-18
+
+* 1 minor feature:
+  * Make building with SSL support optional
+
+* 1 bug fix:
+  * Use Rack::Builder if available. Fixes #735
+
 === 2.13.4 / 2015-08-16
 
 * 1 bug fix:

data/ext/puma_http11/extconf.rb

@@ -2,8 +2,12 @@ require 'mkmf'
 
 dir_config("puma_http11")
 
-if %w'crypto libeay32'.find {|crypto| have_library(crypto, 'BIO_read')} and
-    %w'ssl ssleay32'.find {|ssl| have_library(ssl, 'SSL_CTX_new')}
-  
-  create_makefile("puma/puma_http11")
+unless ENV["DISABLE_SSL"]
+  if %w'crypto libeay32'.find {|crypto| have_library(crypto, 'BIO_read')} and
+      %w'ssl ssleay32'.find {|ssl| have_library(ssl, 'SSL_CTX_new')}
+
+    have_header "openssl/bio.h"
+  end
 end
+
+create_makefile("puma/puma_http11")

data/ext/puma_http11/mini_ssl.c

@@ -1,6 +1,10 @@
 #define RSTRING_NOT_MODIFIED 1
+
 #include <ruby.h>
 #include <rubyio.h>
+
+#ifdef HAVE_OPENSSL_BIO_H
+
 #include <openssl/bio.h>
 #include <openssl/ssl.h>
 #include <openssl/dh.h>
@@ -347,6 +351,10 @@ VALUE engine_peercert(VALUE self) {
   return rb_cert_buf;
 }
 
+VALUE noop(VALUE self) {
+  return Qnil;
+}
+
 void Init_mini_ssl(VALUE puma) {
   VALUE mod, eng;
 
@@ -358,6 +366,8 @@ void Init_mini_ssl(VALUE puma) {
   mod = rb_define_module_under(puma, "MiniSSL");
   eng = rb_define_class_under(mod, "Engine", rb_cObject);
 
+  rb_define_singleton_method(mod, "check", noop, 0);
+
   eError = rb_define_class_under(mod, "SSLError", rb_eStandardError);
 
   rb_define_singleton_method(eng, "server", engine_init_server, 1);
@@ -371,3 +381,20 @@ void Init_mini_ssl(VALUE puma) {
 
   rb_define_method(eng, "peercert", engine_peercert, 0);
 }
+
+#else
+
+VALUE raise_error(VALUE self) {
+  rb_raise(rb_eStandardError, "SSL not available in this build");
+  return Qnil;
+}
+
+void Init_mini_ssl(VALUE puma) {
+  VALUE mod, eng;
+
+  mod = rb_define_module_under(puma, "MiniSSL");
+  rb_define_class_under(mod, "SSLError", rb_eStandardError);
+
+  rb_define_singleton_method(mod, "check", raise_error, 0);
+}
+#endif

data/lib/puma/binder.rb

@@ -128,6 +128,8 @@ module Puma
 
           @listeners << [str, io]
         when "ssl"
+          MiniSSL.check
+
           params = Util.parse_query uri.query
           require 'puma/minissl'
 
@@ -253,6 +255,8 @@ module Puma
                          optimize_for_latency=true, backlog=1024)
       require 'puma/minissl'
 
+      MiniSSL.check
+
       host = host[1..-2] if host[0..0] == '['
       s = TCPServer.new(host, port)
       if optimize_for_latency
@@ -272,6 +276,8 @@ module Puma
 
     def inherited_ssl_listener(fd, ctx)
       require 'puma/minissl'
+      MiniSSL.check
+
       s = TCPServer.for_fd(fd)
       ssl = MiniSSL::Server.new(s, ctx)
 

data/lib/puma/configuration.rb

@@ -123,10 +123,24 @@ module Puma
       File.basename(Dir.getwd)
     end
 
+    # Load and use the normal Rack builder if we can, otherwise
+    # fallback to our minimal version.
+    def rack_builder
+      begin
+        require 'rack'
+        require 'rack/builder'
+      rescue LoadError
+        # ok, use builtin version
+        return Puma::Rack::Builder
+      else
+        return ::Rack::Builder
+      end
+    end
+
     def load_rackup
       raise "Missing rackup file '#{rackup}'" unless File.exist?(rackup)
 
-      rack_app, rack_options = Puma::Rack::Builder.parse_file(rackup)
+      rack_app, rack_options = rack_builder.parse_file(rackup)
       @options.merge!(rack_options)
 
       config_ru_binds = []

data/lib/puma/const.rb

@@ -99,8 +99,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.13.4".freeze
-    CODE_NAME = "A Midsummer Code's Dream".freeze
+    PUMA_VERSION = VERSION = "2.14.0".freeze
+    CODE_NAME = "Fuchsia Friday".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/minissl.rb

@@ -102,6 +102,8 @@ module Puma
       class SSLError < StandardError
         # Define this for jruby even though it isn't used.
       end
+
+      def self.check; end
     end
 
     class Context

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.13.4
+  version: 2.14.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server
   for Ruby/Rack applications. Puma is intended for use in both development and production
   environments. In order to get the best throughput, it is highly recommended that