fishwife 1.8.0-java → 1.8.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dde09a0a87fbd2aa589d44a02616cb08993cca24
-  data.tar.gz: b88680fc0b5dfa5ab36e111310fec7a087ead6c1
+  metadata.gz: da6bb47238b5e657b46cfd57554067e416167bdc
+  data.tar.gz: 7c1e89a29da563c3a6d85f6abb2c80e0b572c3ba
 SHA512:
-  metadata.gz: 1bdd3ba4110e324a8a5b678102c25edab31872633f29ffab82fc523f1f964eb3c9d3d750ed09fda8832edbcb3f6aa82018a7485824c22f4420b9bff55307fb68
-  data.tar.gz: df9ce253c9096bf6db08b5f058a1c377b408dd4f8b781a42d73ac7014b15f4a8eec920d71ee480ff3b66b7753cbb04d88634a29086ef5aef3db8d31a8cc89266
+  metadata.gz: 32f7500ca1dc117376dfb5a012e2095b552d6b064624e4eb401c795d9d6ed906e09445b1c33594a705d42367a194dcd9a562b7fe0a688aada43c7af17c8ba272
+  data.tar.gz: e9cea7ca709a9dc2b7fce66a2e45f75cddc03b95bdfae87e153f79d83c899f4ca9dc72498abad672f6b10b2a084876526df889ec3343f64b21b8d193e974b352

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 1.8.1 (2016-3-30)
+* Avoid mutating the rack response headers hash as part of the special
+  handling of Content-Length and Content-Type. Rack applications may
+  wish to use (frozen) headers constants. (Theo Hultberg, #11)
+
 === 1.8.0 (2015-5-3)
 * Added Fishwife::HttpServer::new :connections configuration, allowing
   multiple connectors and including SSL support. (#10 with Gregory

data/Manifest.txt

@@ -19,4 +19,4 @@ spec/test_app.rb
 spec/data/hello.txt
 spec/data/localhost.keystore
 spec/data/reddit-icon.png
-lib/fishwife/fishwife-1.8.0.jar
+lib/fishwife/fishwife-1.8.1.jar

data/README.rdoc

@@ -96,7 +96,7 @@ Unix-like logrotate(8) may be used with the former process monitors.
 
 == License
 
-Copyright (c) 2011-2015 David Kellum
+Copyright (c) 2011-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/fishwife

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 # -*- ruby -*-
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/lib/fishwife.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/lib/fishwife/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-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 may
@@ -15,6 +15,6 @@
 #++
 
 module Fishwife
-  VERSION = '1.8.0'
+  VERSION = '1.8.1'
   LIB_DIR = File.dirname( __FILE__ )
 end

data/lib/fishwife/http_server.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-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 may
@@ -70,10 +70,17 @@ module Fishwife
     # :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 "true" (String) or true (TrueClass), use
+    #                    the socket bound to standard input. This can
+    #                    be used for inetd-style socket activation and
+    #                    hot deploy. It can be arranged via
+    #                    {start_server}[https://metacpan.org/pod/start_server]
+    #                    (Requires rjack-jetty 9.3.7+; Default: false)
     #
     # URI examples:
     #
     #  tcp://127.0.0.1
+    #  tcp://127.0.0.1?inherit_channel=true
     #  ssl://0.0.0.0:8443?key_store_path=keystore&key_store_password=399as8d9
     #
     def initialize( options = {} )

data/lib/fishwife/rack_servlet.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -255,17 +255,18 @@ module Fishwife
         # Set the HTTP status code.
         response.setStatus(status.to_i)
 
-        # Did we get a Content-Length header?
-        content_length = headers.delete('Content-Length')
-        response.setContentLength(content_length.to_i) if content_length
-
-        # Did we get a Content-Type header?
-        content_type = headers.delete('Content-Type')
-        response.setContentType(content_type) if content_type
-
         # Add all the result headers.
         headers.each do |h, v|
-          v.split("\n").each { |val| response.addHeader(h, val) }
+          case h
+          when 'Content-Length'
+            # Did we get a Content-Length header?
+            response.setContentLength(v.to_i) if v
+          when 'Content-Type'
+            # Did we get a Content-Type header?
+            response.setContentType(v) if v
+          else
+            v.split("\n").each { |val| response.addHeader(h, val) }
+          end
         end
       end
 
@@ -276,7 +277,9 @@ module Fishwife
         path = body.to_path
 
         # Set Content-Length unless this is an async request.
-        response.setContentLength( File.size( path ) ) unless content_length
+        unless headers['Content-Length']
+          response.setContentLength( File.size( path ) )
+        end
 
         # FIXME: Support ranges?
 

data/lib/rack/handler/fishwife.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-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 may

data/pom.xml

@@ -4,7 +4,7 @@
   <groupId>fishwife</groupId>
   <artifactId>fishwife</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.0</version>
+  <version>1.8.1</version>
   <name>Fishwife Java Extension</name>
 
   <properties>
@@ -36,8 +36,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target>
           <optimize>true</optimize>
           <debug>true</debug>
           <encoding>UTF-8</encoding>

data/spec/fishwife_spec.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -65,6 +65,7 @@ describe Fishwife do
         if @scheme == :https
           @https_client_opts = {
             :use_ssl => true,
+            :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 }
           @options[:connections] = [ {
             :scheme => 'ssl',
@@ -143,16 +144,26 @@ describe Fishwife do
       it "Rejects request body larger than maximum" do
         body = '<' + "f" * (100*1024) + '>'
         headers = { "Content-Type" => "text/plain" }
-        response = post("/count", nil, headers, body)
-        response.code.should == "413"
+        begin
+          response = post("/count", nil, headers, body)
+          response.code.should == "413"
+        rescue IOError, Errno::EPIPE, Errno::ECONNRESET => e
+          # or alternatively, our send pipe breaks in mid-send
+          e.message.should match( /broken pipe/i )
+        end
       end
 
       it "Rejects request body larger than maximum in chunked request" do
         body = '<' + "f" * (100*1024) + '>'
         headers = { "Content-Type" => "text/plain",
                     "Transfer-Encoding" => "chunked" }
-        response = post("/count", nil, headers, StringIO.new( body ) )
-        response.code.should == "413"
+        begin
+          response = post("/count", nil, headers, StringIO.new( body ) )
+          response.code.should == "413"
+        rescue IOError, Errno::EPIPE, Errno::ECONNRESET => e
+          # or alternatively, our send pipe breaks in mid-send
+          e.message.should match( /broken pipe/i )
+        end
       end
 
       it "passes custom headers" do
@@ -243,6 +254,11 @@ describe Fishwife do
         lock.synchronize { buffer.count.should == 10 }
       end
 
+      it "handles frozen Rack responses" do
+        response = get("/frozen_response")
+        response.code.should == "200"
+      end
+
     end
 
   end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/spec/test_app.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -126,4 +126,8 @@ class TestApp
     response.write(checksum)
     response.finish
   end
+
+  def frozen_response(request)
+    [200, {}.freeze, [].freeze].freeze
+  end
 end

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: fishwife
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: java
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.7'
   name: rack
@@ -24,19 +24,19 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 9.2.11
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '9.4'
   name: rjack-jetty
@@ -44,16 +44,16 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 9.2.11
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '9.4'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.2
   name: rjack-slf4j
@@ -61,13 +61,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.2
   name: json
@@ -75,13 +75,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   name: rjack-logback
@@ -89,13 +89,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
   name: rspec
@@ -103,13 +103,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   name: rjack-tarpit
@@ -117,7 +117,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 description: A hard working threaded HTTP 1.1 Rack server for JRuby using Jetty 7.x or 9.x. Fishwife deploys and operates like other Ruby HTTP servers/rack handlers such as Mongrel or Puma. No Java legacy war files (e.g. warbler) required.
@@ -141,7 +141,7 @@ files:
 - example/ssl.ru
 - lib/fishwife.rb
 - lib/fishwife/base.rb
-- lib/fishwife/fishwife-1.8.0.jar
+- lib/fishwife/fishwife-1.8.1.jar
 - lib/fishwife/http_server.rb
 - lib/fishwife/rack_servlet.rb
 - lib/rack/handler/fishwife.rb
@@ -157,23 +157,23 @@ 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: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: A Jetty based Rack HTTP 1.1 server.