rjack-jetty 9.3.6.0-java → 9.3.7.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8c57aada7a578cc26b55a6db93acabc717fe871
-  data.tar.gz: aa37f2532e37b3deeda7a573631f98707c2f7bbc
+  metadata.gz: 2a3473039bf9751b4c49f7c6e830ab62c737bdca
+  data.tar.gz: 153b2275011f6bf0ba2e23ea769989aa857c7330
 SHA512:
-  metadata.gz: f134e935c17e1fd7f77d2f7a6195f24af3eec356d78509de015dc1ae8c339bf35415de741a32a9cc882e91d504e80b7365142e83d3d16f97d2c8d437d8069ca0
-  data.tar.gz: 1bdc6d4c8382c3049da088c50e4c15943fd0ada4b44d1e667173fee30ea9b6c13abf20d3c5f4a74359e54def6944387198c656facc25d4146484b34d89b68883
+  metadata.gz: 0da86c3b580fa08f5b4fa595a7a94545268aa95e6e29dfe4fc8d72cac7fd34066ea8ce2c2f0a83a6cec89ca0672633784a3ea843c465f352249f81442ec3b99f
+  data.tar.gz: 00435fa77f7fe93d9507dd44bcfc7ae52baff477b3dc2d4346ea748e757813684d57d82897c2ca45007862d8d6dbe5c7e86c2482f1072f50512d3ed3c31203dc

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 9.3.7.0 (2016-1-21)
+* Update to Jetty 9.3.7.v20160115. Note that this release changes the
+  default ciphers for SSL connectors. This results in connection
+  failure of a default configured JRuby Net::HTTP client at minimum. A
+  workaround was found for local tests.
+* Add :inherit_channel option to RJack::Jetty::ServerFactory#connections
+  (#9, Akihiro Uchida)
+
 === 9.3.6.0 (2015-11-18)
 * Update to Jetty 9.3.6.v20151106
 

data/Manifest.txt

@@ -17,15 +17,15 @@ webapps/test/index.html
 webapps/test/WEB-INF/web.xml
 webapps/test.war
 lib/rjack-jetty/javax.servlet-api-3.1.0.jar
-lib/rjack-jetty/jetty-client-9.3.6.v20151106.jar
-lib/rjack-jetty/jetty-continuation-9.3.6.v20151106.jar
-lib/rjack-jetty/jetty-http-9.3.6.v20151106.jar
-lib/rjack-jetty/jetty-io-9.3.6.v20151106.jar
-lib/rjack-jetty/jetty-rewrite-9.3.6.v20151106.jar
-lib/rjack-jetty/jetty-security-9.3.6.v20151106.jar
-lib/rjack-jetty/jetty-server-9.3.6.v20151106.jar
-lib/rjack-jetty/jetty-servlet-9.3.6.v20151106.jar
-lib/rjack-jetty/jetty-util-9.3.6.v20151106.jar
-lib/rjack-jetty/jetty-webapp-9.3.6.v20151106.jar
-lib/rjack-jetty/jetty-xml-9.3.6.v20151106.jar
+lib/rjack-jetty/jetty-client-9.3.7.v20160115.jar
+lib/rjack-jetty/jetty-continuation-9.3.7.v20160115.jar
+lib/rjack-jetty/jetty-http-9.3.7.v20160115.jar
+lib/rjack-jetty/jetty-io-9.3.7.v20160115.jar
+lib/rjack-jetty/jetty-rewrite-9.3.7.v20160115.jar
+lib/rjack-jetty/jetty-security-9.3.7.v20160115.jar
+lib/rjack-jetty/jetty-server-9.3.7.v20160115.jar
+lib/rjack-jetty/jetty-servlet-9.3.7.v20160115.jar
+lib/rjack-jetty/jetty-util-9.3.7.v20160115.jar
+lib/rjack-jetty/jetty-webapp-9.3.7.v20160115.jar
+lib/rjack-jetty/jetty-xml-9.3.7.v20160115.jar
 lib/rjack-jetty/rjack-jetty-1.0.jar

data/README.rdoc

@@ -65,7 +65,7 @@ or
 
 === rjack-jetty gem
 
-Copyright (c) 2008-2015 David Kellum
+Copyright (c) 2008-2016 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/bin/rjack-jetty-service

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 # -*- ruby -*-
 #--
-# Copyright (c) 2008-2015 David Kellum
+# Copyright (c) 2008-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/rjack-jetty.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2015 David Kellum
+# Copyright (c) 2008-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -174,11 +174,17 @@ module RJack
       # :max_idle_time_ms:: See above
       # :key_store_path:: For ssl, the path to the (Java JKS) keystore
       # :key_store_password:: For ssl, the password to the keystore
+      # :inherit_channel:: If set to true, use channel based on standard input,
+      #                    if standard input is available and binded to a socket,
+      #                    it can be used for inetd or hot deploy with
+      #                    {start_server}[https://metacpan.org/pod/start_server]
+      #                    (Default: false)
       #
       # URI examples:
       #
       #  tcp://127.0.0.1
       #  ssl://0.0.0.0:8443?key_store_path=test/keystore&key_store_password=399as8d9
+      #  tcp://127.0.0.1?inherit_channel=true
       #
       attr_accessor  :connections
 
@@ -243,6 +249,7 @@ module RJack
           connector.host = h if h
           connector.port = opts[:port] || ( first && @port ) || 0
           connector.idle_timeout = opts[:max_idle_time_ms] || @max_idle_time_ms
+          connector.inherit_channel = [true, 'true'].include?(opts[:inherit_channel])
           first = false
           connector
         end

data/lib/rjack-jetty/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2015 David Kellum
+# Copyright (c) 2008-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -16,9 +16,9 @@
 
 module RJack
   module Jetty
-    JETTY_VERSION = '9.3.6'
+    JETTY_VERSION = '9.3.7'
     VERSION = JETTY_VERSION + '.0'
-    JETTY_BUILD = 'v20151106'
+    JETTY_BUILD = 'v20160115'
     SERVLET_API_VERSION = '3.1.0'
 
     JETTY_DIR = File.dirname( __FILE__ ) # :nodoc:

data/lib/rjack-jetty/test-servlets.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2015 David Kellum
+# Copyright (c) 2008-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/pom.xml

@@ -16,43 +16,43 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.3.6.v20151106</version>
+      <version>9.3.7.v20160115</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.3.6.v20151106</version>
+      <version>9.3.7.v20160115</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
-      <version>9.3.6.v20151106</version>
+      <version>9.3.7.v20160115</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>9.3.6.v20151106</version>
+      <version>9.3.7.v20160115</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
-      <version>9.3.6.v20151106</version>
+      <version>9.3.7.v20160115</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>9.3.6.v20151106</version>
+      <version>9.3.7.v20160115</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-continuation</artifactId>
-      <version>9.3.6.v20151106</version>
+      <version>9.3.7.v20160115</version>
     </dependency>
 
   </dependencies>

data/test/test_jetty.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2008-2015 David Kellum
+# Copyright (c) 2008-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -34,6 +34,7 @@ require 'rjack-jetty/rewrite'
 require 'rjack-jetty/test-servlets'
 
 require 'net/http'
+require 'openssl'
 
 class TestJetty < MiniTest::Unit::TestCase
   include RJack::Jetty
@@ -47,6 +48,24 @@ class TestJetty < MiniTest::Unit::TestCase
     factory
   end
 
+  def test_parse_inherit_channel
+    factory = default_factory
+    factory.connections = [ 'tcp://127.0.0.1?inherit_channel=true',
+                            { scheme: 'tcp', inherit_channel: true },
+                            'tcp://127.0.0.1?inherit_channel=false',
+                            { scheme: 'tcp', inherit_channel: false },
+                            'tcp://127.0.0.1?inherit_channel=nil',
+                            { scheme: 'tcp', inherit_channel: nil } ]
+    server = factory.create
+    connectors = server.connectors
+    assert( connectors[0].inherit_channel )
+    assert( connectors[1].inherit_channel )
+    assert( !connectors[2].inherit_channel )
+    assert( !connectors[3].inherit_channel )
+    assert( !connectors[4].inherit_channel )
+    assert( !connectors[5].inherit_channel )
+  end
+
   def test_start_stop
     10.times do
       factory = default_factory
@@ -190,7 +209,10 @@ class TestJetty < MiniTest::Unit::TestCase
   def get( path, port, scheme = :tcp )
     args = [ 'localhost', port, nil, nil, nil, nil ]
     if scheme == :ssl
-      args << { use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE }
+      args << { use_ssl: true,
+                # From https://wiki.mozilla.org/Security/Server_Side_TLS (intermediate)
+                ciphers: "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA",
+                verify_mode: OpenSSL::SSL::VERIFY_NONE }
     end
     Net::HTTP.start( *args ) do |http|
       http.open_timeout = 1.0

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: rjack-jetty
 version: !ruby/object:Gem::Version
-  version: 9.3.6.0
+  version: 9.3.7.0
 platform: java
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.5
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.8'
   name: rjack-slf4j
@@ -24,16 +24,16 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.5
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   name: rjack-logback
@@ -41,13 +41,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.7.4
   name: minitest
@@ -55,13 +55,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.7.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.1
   name: rdoc
@@ -69,13 +69,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   name: rjack-tarpit
@@ -83,7 +83,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 description:
@@ -106,17 +106,17 @@ files:
 - lib/rjack-jetty/base.rb
 - lib/rjack-jetty/client.rb
 - lib/rjack-jetty/javax.servlet-api-3.1.0.jar
-- lib/rjack-jetty/jetty-client-9.3.6.v20151106.jar
-- lib/rjack-jetty/jetty-continuation-9.3.6.v20151106.jar
-- lib/rjack-jetty/jetty-http-9.3.6.v20151106.jar
-- lib/rjack-jetty/jetty-io-9.3.6.v20151106.jar
-- lib/rjack-jetty/jetty-rewrite-9.3.6.v20151106.jar
-- lib/rjack-jetty/jetty-security-9.3.6.v20151106.jar
-- lib/rjack-jetty/jetty-server-9.3.6.v20151106.jar
-- lib/rjack-jetty/jetty-servlet-9.3.6.v20151106.jar
-- lib/rjack-jetty/jetty-util-9.3.6.v20151106.jar
-- lib/rjack-jetty/jetty-webapp-9.3.6.v20151106.jar
-- lib/rjack-jetty/jetty-xml-9.3.6.v20151106.jar
+- lib/rjack-jetty/jetty-client-9.3.7.v20160115.jar
+- lib/rjack-jetty/jetty-continuation-9.3.7.v20160115.jar
+- lib/rjack-jetty/jetty-http-9.3.7.v20160115.jar
+- lib/rjack-jetty/jetty-io-9.3.7.v20160115.jar
+- lib/rjack-jetty/jetty-rewrite-9.3.7.v20160115.jar
+- lib/rjack-jetty/jetty-security-9.3.7.v20160115.jar
+- lib/rjack-jetty/jetty-server-9.3.7.v20160115.jar
+- lib/rjack-jetty/jetty-servlet-9.3.7.v20160115.jar
+- lib/rjack-jetty/jetty-util-9.3.7.v20160115.jar
+- lib/rjack-jetty/jetty-webapp-9.3.7.v20160115.jar
+- lib/rjack-jetty/jetty-xml-9.3.7.v20160115.jar
 - lib/rjack-jetty/rewrite.rb
 - lib/rjack-jetty/rjack-jetty-1.0.jar
 - lib/rjack-jetty/test-servlets.rb
@@ -132,18 +132,18 @@ licenses: []
 metadata: {}
 post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []