torquebox-web 4.0.0.alpha1-java → 4.0.0.beta1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55cd60b73ff00c5b70ead500b540a3157d6f62ea
-  data.tar.gz: f03d8c919a518bed4b6e9f62287d9b2f93ee99b7
+  metadata.gz: 164f47261d59b96948f547d2689a45306d85a46e
+  data.tar.gz: 33275d3c626a06ce82348c543ccc8ba72a162a9f
 SHA512:
-  metadata.gz: ac3498da9cb459c950104e36c7758b99f457e98fc72af539331c1412389219e2162b190e04b7289a4818f5b638255bea4d8457f9d02f3666d832e653272f7dd8
-  data.tar.gz: 0bf863321a0e9c8bb7052bcabd8a82e7b8b8076a868abf9764b265485b4bbf596bda9e424d63c341e73bfb8d7de71650c3cfcce4c55a5aae3d8c42fdefcec5bf
+  metadata.gz: 285d3eef4722191b94330ea756b064bd1a1575642f20e5e41e23dd3d3f40490b5be76aa11e3546ac1b766582d28be915fd7650c886b3fc7b9b0d737055dbe5fa
+  data.tar.gz: c28e31a71ee2e20efca16fc3666ca238232fa068265394296ad2d5de43ac7d0d98eca721edbc15d4b9d240534f32deb06a9f0ec84732c26d4752ad25d949287b

data/lib/torquebox/web/server.rb

@@ -168,6 +168,7 @@ module TorqueBox
           @logger.trace("Registering handler at context path {}", options[:path])
           @web_component.register_handler(handler, register_options)
         end
+        start if @options[:auto_start]
         handler
       end
 
@@ -275,12 +276,12 @@ module TorqueBox
 
       def initialize(name, options = {})
         @logger = WB.logger('TorqueBox::Web::Server')
-        options = DEFAULT_SERVER_OPTIONS.merge(options)
-        unless options[:configuration]
-          options = Undertow.builder(options)
+        @options = DEFAULT_SERVER_OPTIONS.merge(options)
+        unless @options[:configuration]
+          @options = Undertow.builder(options)
         end
-        validate_options(options, DEFAULT_SERVER_OPTIONS.keys)
-        create_options = extract_options(options, WBWeb::CreateOption)
+        validate_options(@options, DEFAULT_SERVER_OPTIONS.keys)
+        create_options = extract_options(@options, WBWeb::CreateOption)
         web = WB.find_or_create_component(WBWeb.java_class, name,
                                           create_options)
         @logger.debug("TorqueBox::Web::Server '{}' has component {}",

data/lib/wunderboss_rack_response_handler.rb

@@ -15,17 +15,18 @@
 module WunderBoss
   module Rack
     class ResponseHandler
-      def self.handle(rack_response, rack_responder)
+      def self.handle(rack_response, rack_responder, env)
         status  = rack_response[0]
         headers = rack_response[1]
         body    = rack_response[2]
 
+        raise_if_hijacked(status, env)
         begin
           rack_responder.response_code = status.to_i
 
           transfer_encoding_value = nil
           headers.each do |key, value|
-            rack_responder.add_header(key, value)
+            rack_responder.add_header(key, value.to_s)
             transfer_encoding_value = value if key == 'Transfer-Encoding'
           end
 
@@ -36,7 +37,7 @@ module WunderBoss
             output = chunked ? strip_term_markers(chunk) : chunk
             unless output.nil?
               rack_responder.write(output)
-              rack_responder.flush if chunked
+              rack_responder.flush
             end
           end
         rescue NativeException => e
@@ -47,6 +48,11 @@ module WunderBoss
         end
       end
 
+      def self.raise_if_hijacked(status, env)
+        hijacked = status.to_i < 0 || env["rack.hijack_io"]
+        raise org.projectodd.wunderboss.rack.RackHijackException.new if hijacked
+      end
+
       # TODO: remove this once we upgrade to Undertow 1.0.2.Final
       # https://issues.jboss.org/browse/UNDERTOW-133
       def self.strip_term_markers(chunk)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torquebox-web
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha1
+  version: 4.0.0.beta1
 platform: java
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -36,12 +36,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.alpha1
+        version: 4.0.0.beta1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.alpha1
+        version: 4.0.0.beta1
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -106,24 +106,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/wunderboss_rack_response_handler.rb
 - lib/wunderboss-rack.jar
 - lib/torquebox-web.rb
-- lib/rack/handler/torquebox.rb
-- lib/wunderboss-jars/sockjs-servlet-0.1.2.jar
-- lib/wunderboss-jars/wunderboss-web-1.x.incremental.174.jar
+- lib/wunderboss_rack_response_handler.rb
+- lib/wunderboss-jars/xnio-api-3.3.0.Final.jar
 - lib/wunderboss-jars/jboss-servlet-api_3.1_spec-1.0.0.Final.jar
-- lib/wunderboss-jars/undertow-servlet-1.1.0.Final.jar
+- lib/wunderboss-jars/xnio-nio-3.3.0.Final.jar
 - lib/wunderboss-jars/jboss-annotations-api_1.2_spec-1.0.0.Final.jar
-- lib/wunderboss-jars/xnio-api-3.3.0.Final.jar
-- lib/wunderboss-jars/undertow-core-1.1.0.Final.jar
 - lib/wunderboss-jars/jboss-websocket-api_1.1_spec-1.1.0.Final.jar
 - lib/wunderboss-jars/undertow-websockets-jsr-1.1.0.Final.jar
-- lib/wunderboss-jars/xnio-nio-3.3.0.Final.jar
+- lib/wunderboss-jars/undertow-core-1.1.0.Final.jar
+- lib/wunderboss-jars/undertow-servlet-1.1.0.Final.jar
+- lib/wunderboss-jars/wunderboss-web-0.8.0.jar
+- lib/wunderboss-jars/sockjs-servlet-0.1.2.jar
+- lib/rack/handler/torquebox.rb
 - lib/torquebox/web.rb
-- lib/torquebox/web/server.rb
 - lib/torquebox/web/cli.rb
-homepage: http://torquebox.org/torqbox
+- lib/torquebox/web/server.rb
+homepage: http://torquebox.org/4x
 licenses:
 - Apache-2.0
 metadata: {}
@@ -142,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements:
-- jar org.projectodd.wunderboss:wunderboss-ruby, 1.x.incremental.174
-- jar org.projectodd.wunderboss:wunderboss-web, 1.x.incremental.174
+- jar org.projectodd.wunderboss:wunderboss-ruby, 0.8.0
+- jar org.projectodd.wunderboss:wunderboss-web, 0.8.0
 - jar org.projectodd.sockjs:sockjs-servlet, 0.1.2
 rubyforge_project:
 rubygems_version: 2.1.9