Hello community,
here is the log from the commit of package rubygem-puma for openSUSE:Factory
checked in at 2015-05-19 23:48:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-puma (Old)
and /work/SRC/openSUSE:Factory/.rubygem-puma.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-puma"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-puma/rubygem-puma.changes
2015-04-13 20:30:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-puma.new/rubygem-puma.changes
2015-05-19 23:48:13.000000000 +0200
@@ -1,0 +2,17 @@
+Tue May 19 04:29:36 UTC 2015 - co...@suse.com
+
+- updated to version 2.11.3
+ see installed History.txt
+
+ === 2.11.3 / 2015-05-18
+
+ * 5 bug fixes:
+ * Be sure to unlink tempfiles after a request. Fixes #690
+ * Coerce the key to a string before checking. (thar be symbols). Fixes #684
+ * Fix hang on bad SSL handshake
+ * Remove `enable_SSLv3` support from JRuby
+
+ * 1 PR merged:
+ * Merge pull request #698 from looker/hang-handshake
+
+-------------------------------------------------------------------
Old:
----
puma-2.11.2.gem
New:
----
puma-2.11.3.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-puma.spec ++++++
--- /var/tmp/diff_new_pack.xjviNn/_old 2015-05-19 23:48:14.000000000 +0200
+++ /var/tmp/diff_new_pack.xjviNn/_new 2015-05-19 23:48:14.000000000 +0200
@@ -24,7 +24,7 @@
#
Name: rubygem-puma
-Version: 2.11.2
+Version: 2.11.3
Release: 0
%define mod_name puma
%define mod_full_name %{mod_name}-%{version}
++++++ puma-2.11.2.gem -> puma-2.11.3.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/History.txt new/History.txt
--- old/History.txt 2015-04-11 22:19:59.000000000 +0200
+++ new/History.txt 2015-05-19 06:11:25.000000000 +0200
@@ -1,3 +1,14 @@
+=== 2.11.3 / 2015-05-18
+
+* 5 bug fixes:
+ * Be sure to unlink tempfiles after a request. Fixes #690
+ * Coerce the key to a string before checking. (thar be symbols). Fixes #684
+ * Fix hang on bad SSL handshake
+ * Remove `enable_SSLv3` support from JRuby
+
+* 1 PR merged:
+ * Merge pull request #698 from looker/hang-handshake
+
=== 2.11.2 / 2015-04-11
* 2 minor features:
@@ -483,7 +494,7 @@
* Close the binder in the right place. Fixes #192
* Handle early term in workers. Fixes #206
* Make sure that the default port is 80 when the request doesn't include
HTTP_X_FORWARDED_PROTO.
- * Prevent Errno::EBADF errors on restart when running ruby 2.0
+ * Prevent Errno::EBADF errors on restart when running ruby 2.0
* Record the proper @master_pid
* Respect the header HTTP_X_FORWARDED_PROTO when the host doesn't include a
port number.
* Retry EAGAIN/EWOULDBLOCK during syswrite
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/puma_http11/mini_ssl.c
new/ext/puma_http11/mini_ssl.c
--- old/ext/puma_http11/mini_ssl.c 2015-04-11 22:19:59.000000000 +0200
+++ new/ext/puma_http11/mini_ssl.c 2015-05-19 06:11:25.000000000 +0200
@@ -161,7 +161,7 @@
VALUE engine_read(VALUE self) {
ms_conn* conn;
char buf[512];
- int bytes, n;
+ int bytes, n, error;
Data_Get_Struct(self, ms_conn, conn);
@@ -173,7 +173,8 @@
if(SSL_want_read(conn->ssl)) return Qnil;
- if(SSL_get_error(conn->ssl, bytes) == SSL_ERROR_ZERO_RETURN) {
+ error = SSL_get_error(conn->ssl, bytes);
+ if(error == SSL_ERROR_ZERO_RETURN || error == SSL_ERROR_SSL) {
rb_eof_error();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/puma_http11/org/jruby/puma/MiniSSL.java
new/ext/puma_http11/org/jruby/puma/MiniSSL.java
--- old/ext/puma_http11/org/jruby/puma/MiniSSL.java 2015-04-11
22:19:59.000000000 +0200
+++ new/ext/puma_http11/org/jruby/puma/MiniSSL.java 2015-05-19
06:11:25.000000000 +0200
@@ -153,13 +153,7 @@
sslCtx.init(kmf.getKeyManagers(), null, null);
engine = sslCtx.createSSLEngine();
- IRubyObject enableSSLv3 = miniSSLContext.callMethod(threadContext,
"enable_SSLv3");
- String[] protocols;
- if (enableSSLv3 instanceof RubyBoolean && enableSSLv3.isTrue()) {
- protocols = new String[] { "SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1",
"TLSv1.2" };
- } else {
- protocols = new String[] { "TLSv1", "TLSv1.1", "TLSv1.2" };
- }
+ String[] protocols = new String[] { "TLSv1", "TLSv1.1", "TLSv1.2" };
engine.setEnabledProtocols(protocols);
engine.setUseClientMode(false);
@@ -308,8 +302,10 @@
log("read(): end dump of request data <<<<\n");
return str;
} catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(e);
+ if (DEBUG) {
+ e.printStackTrace();
+ }
+ throw getRuntime().newEOFError(e.getMessage());
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/client.rb new/lib/puma/client.rb
--- old/lib/puma/client.rb 2015-04-11 22:19:59.000000000 +0200
+++ new/lib/puma/client.rb 2015-05-19 06:11:25.000000000 +0200
@@ -39,6 +39,7 @@
@body = nil
@buffer = nil
+ @tempfile = nil
@timeout_at = nil
@@ -46,7 +47,8 @@
@hijacked = false
end
- attr_reader :env, :to_io, :body, :io, :timeout_at, :ready, :hijacked
+ attr_reader :env, :to_io, :body, :io, :timeout_at, :ready, :hijacked,
+ :tempfile
def inspect
"#<Puma::Client:0x#{object_id.to_s(16)} @ready=#{@ready.inspect}>"
@@ -72,6 +74,7 @@
@read_header = true
@env = @proto_env.dup
@body = nil
+ @tempfile = nil
@parsed_bytes = 0
@ready = false
@@ -129,6 +132,7 @@
if remain > MAX_BODY
@body = Tempfile.new(Const::PUMA_TMP_BASE)
@body.binmode
+ @tempfile = @body
else
# The body[0,0] trick is to get an empty string in the same
# encoding as body.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/configuration.rb
new/lib/puma/configuration.rb
--- old/lib/puma/configuration.rb 2015-04-11 22:19:59.000000000 +0200
+++ new/lib/puma/configuration.rb 2015-05-19 06:11:25.000000000 +0200
@@ -103,7 +103,7 @@
@options.merge!(rack_options)
config_ru_binds = rack_options.each_with_object([]) do |(k, v), b|
- b << v if k.start_with?('bind')
+ b << v if k.to_s[0,4] == "bind"
end
@options[:binds] = config_ru_binds unless config_ru_binds.empty?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/const.rb new/lib/puma/const.rb
--- old/lib/puma/const.rb 2015-04-11 22:19:59.000000000 +0200
+++ new/lib/puma/const.rb 2015-05-19 06:11:25.000000000 +0200
@@ -28,7 +28,7 @@
# too taxing on performance.
module Const
- PUMA_VERSION = VERSION = "2.11.2".freeze
+ PUMA_VERSION = VERSION = "2.11.3".freeze
CODE_NAME = "Intrepid Squirrel".freeze
FAST_TRACK_KA_TIMEOUT = 0.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/minissl.rb new/lib/puma/minissl.rb
--- old/lib/puma/minissl.rb 2015-04-11 22:19:59.000000000 +0200
+++ new/lib/puma/minissl.rb 2015-05-19 06:11:25.000000000 +0200
@@ -95,11 +95,6 @@
# jruby-specific Context properties: java uses a keystore and password
pair rather than a cert/key pair
attr_reader :keystore
attr_accessor :keystore_pass
- attr_accessor :enable_SSLv3
-
- def initialize
- @enable_SSLv3 = false
- end
def keystore=(keystore)
raise ArgumentError, "No such keystore file '#{keystore}'" unless
File.exist? keystore
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/server.rb new/lib/puma/server.rb
--- old/lib/puma/server.rb 2015-04-11 22:19:59.000000000 +0200
+++ new/lib/puma/server.rb 2015-05-19 06:11:25.000000000 +0200
@@ -656,6 +656,7 @@
uncork_socket client
body.close
+ req.tempfile.unlink if req.tempfile
res_body.close if res_body.respond_to? :close
after_reply.each { |o| o.call }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2015-04-11 22:19:59.000000000 +0200
+++ new/metadata 2015-05-19 06:11:25.000000000 +0200
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: puma
version: !ruby/object:Gem::Version
- version: 2.11.2
+ version: 2.11.3
platform: ruby
authors:
- Evan Phoenix
autorequire:
bindir: bin
cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: rack
