puma 2.13.4-java → 2.14.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d01b8909729fc7cf60221c69146878f2c71df1b4
-  data.tar.gz: f45503f301c52aeb9ddace8e27ed9031c25eaa83
+  metadata.gz: e093de7b7e1a0fc7103ebc46655aca2845fac33f
+  data.tar.gz: 5d68507508dd7d031053235885a9cc97c8735aea
 SHA512:
-  metadata.gz: 59791e7926e52a3db4b7241dd75550e5256632b05eee7a75e1a367dc761adfaae339395afd28f3541436c141f795666e69c141a389465887eb9537115db34fd3
-  data.tar.gz: ded649b73cf2d3e22668829f366138eb04f14ec77cfe3545c2fca02f5ed044efd46f844ae27e9aa7ab6524984f201326daf06a2c76b8fb7461244a5b19019d39
+  metadata.gz: a9cfaaa4ea9a090d4cbdf419f23d3adcad60463e4884c81bfc92250dfb5cbfacff57ae56dbf6fc107192a3f3c193be4c778870f62bf1beae89b05eaf2c0fe8df
+  data.tar.gz: a7b4bfea158c0dd78046abe14c2f870a2bf5dca6e12365a28c41487f1ef531c05f7cea20ffed698ae68267f15e0eee30d1eabd9f9a548114126c5b0e2a75dcb2

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: java
 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
   requirement: !ruby/object:Gem::Requirement