hayabusa 0.0.22 → 0.0.23

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/hayabusa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "hayabusa"
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2013-06-28"
+  s.date = "2013-06-30"
   s.description = "A threadded web/app-server that focuses on threadding, shared ressources, speed and more."
   s.email = "k@spernj.org"
   s.executables = ["check_running.rb", "hayabusa_benchmark.rb", "hayabusa_cgi.rb", "hayabusa_fcgi.fcgi", "hayabusa_fcgi.rb", "hayabusa_fcgi_server.rb", "hayabusa_spec_restart.rb", "knjappserver_start.rb"]
@@ -84,9 +84,11 @@ Gem::Specification.new do |s|
     "pages/debug_http_sessions.rhtml",
     "pages/debug_memory_usage.rhtml",
     "pages/error_notfound.rhtml",
+    "pages/image.png",
     "pages/logs_latest.rhtml",
     "pages/logs_show.rhtml",
     "pages/spec.rhtml",
+    "pages/spec_exit.rhtml",
     "pages/spec_multiple_threads.rhtml",
     "pages/spec_sleeper.rhtml",
     "pages/spec_test_multiple_clients.rhtml",

data/lib/hayabusa_http_session_response.rb

@@ -148,21 +148,17 @@ class Hayabusa::Http_session::Response
       @cgroup.content_length = nil
     end
     
-    if @status == 304
-      #do nothing.
-    else
-      if @chunked
-        @cgroup.write_to_socket
-        @socket.write("0#{NL}")
-        
-        @headers_trailing.each do |header_id_str, header|
-          @socket.write("#{header[0]}: #{header[1]}#{NL}")
-        end
-        
-        @socket.write(NL)
-      else
-        @cgroup.write_to_socket
+    if @chunked
+      @cgroup.write_to_socket
+      @socket.write("0#{NL}")
+      
+      @headers_trailing.each do |header_id_str, header|
+        @socket.write("#{header[0]}: #{header[1]}#{NL}")
       end
+      
+      @socket.write(NL)
+    else
+      @cgroup.write_to_socket
     end
     
     # Validate that no more has been written than given in content-length, since that will corrupt the client.

data/pages/spec_exit.rhtml

@@ -0,0 +1,5 @@
+<%
+  _httpsession.resp.status = 304
+  puts "ExitOutput"
+  exit
+%>

data/spec/hayabusa_spec.rb

@@ -98,8 +98,13 @@ describe "Hayabusa" do
     File.symlink(img_from_path, img_to_path)
     
     begin
+      http = $testmodes.first[:http]
+      res = http.get("image.rhtml?path64=#{Base64.encode64("image.png").to_s.strip}&rounded_corners=8&width=550")
+      res.contenttype.should eql("image/png")
+      res.header?("content-length").should eql(true)
+      
       $testmodes.each do |tdata|
-        5.times do
+        3.times do
           path = "#{File.dirname(__FILE__)}/../pages/testpic.jpeg"
           
           res = tdata[:http].get("#{tdata[:path_pre]}testpic.jpeg")
@@ -107,7 +112,22 @@ describe "Hayabusa" do
           
           res.body.bytes.to_a.should eql(File.read(path).bytes.to_a)
           
+          #puts "Getting forced image through #{tdata[:name]}"
           res = tdata[:http].get("#{tdata[:path_pre]}image.rhtml?force=true&path64=#{Base64.encode64("testpic.jpeg").to_s.strip}")
+          
+          #puts "Getting normal image through #{tdata[:name]}"
+          res1 = tdata[:http].get("#{tdata[:path_pre]}image.rhtml?path64=#{Base64.encode64("image.png").to_s.strip}&rounded_corners=8&width=550")
+          res1.contenttype.should eql("image/png")
+          
+          #puts "Getting exit-script through #{tdata[:name]}"
+          res_exit = tdata[:http].get("#{tdata[:path_pre]}spec_exit.rhtml")
+          res_exit.body.should eql("ExitOutput\n")
+          
+          #puts "Getting normal image through #{tdata[:name]}"
+          res2 = tdata[:http].get("#{tdata[:path_pre]}image.rhtml?path64=#{Base64.encode64("image.png").to_s.strip}&rounded_corners=8&width=550")
+          res2.contenttype.should eql("image/png")
+          
+          res1.body.bytesize.should eql(res2.body.bytesize)
         end
       end
     ensure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hayabusa
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
@@ -318,9 +318,11 @@ files:
 - pages/debug_http_sessions.rhtml
 - pages/debug_memory_usage.rhtml
 - pages/error_notfound.rhtml
+- pages/image.png
 - pages/logs_latest.rhtml
 - pages/logs_show.rhtml
 - pages/spec.rhtml
+- pages/spec_exit.rhtml
 - pages/spec_multiple_threads.rhtml
 - pages/spec_sleeper.rhtml
 - pages/spec_test_multiple_clients.rhtml
@@ -352,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4203364333015306411
+      hash: 4394094248699079700
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: