hprose 1.4.8 → 1.4.9

data/lib/hprose/httpservice.rb

@@ -34,6 +34,8 @@ module Hprose
       @client_access_policy_xml_file = nil
       @client_access_policy_xml_content = nil
       @on_send_header = nil
+      @last_modified = Date.today.strftime("%a, %d %b %Y %H:%M:%S GMT")
+      @etag = format('"%x:%x"', rand(2147483647), rand(2147483647))
     end
     attr_accessor :crossdomain
     attr_accessor :p3p
@@ -79,8 +81,9 @@ module Hprose
         return result if result
       end
       header = default_header(context)
+      statuscode = 200
+      body = ''
       begin
-        statuscode = 200
         if (context['REQUEST_METHOD'] == 'GET') and @get then
           body = do_function_list
         elsif (context['REQUEST_METHOD'] == 'POST') then

data/lib/hprose/service.rb

@@ -295,7 +295,6 @@ module Hprose
         aliasname = name.downcase
         args = []
         byref = false
-        result = nil
         tag = simpleReader.check_tags([TagList, TagCall, TagEnd])
         if tag == TagList then
           reader = Reader.new(istream)
@@ -324,8 +323,7 @@ module Hprose
         fire_after_invoke_event(name, args, byref, result, context)
         ostream = StringIO.new
         if resultMode == RawWithEndTag then
-          ostream.write(result)
-          return response_end(ostream)
+          return @filter.output_filter(result)
         elsif resultMode == Raw then
           ostream.write(result)
         else
@@ -337,14 +335,14 @@ module Hprose
             writer = Writer.new(ostream, simple)
             writer.serialize(result)
             if byref then
-              writer.stream.putc(TagArgument)
+              ostream.putc(TagArgument)
               writer.reset
               writer.write_list(args)
             end
           end
         end
       end while tag == TagCall
-      writer.stream.putc(TagEnd)
+      ostream.putc(TagEnd)
       return response_end(ostream)
     end
     def do_function_list()
@@ -356,6 +354,7 @@ module Hprose
       return response_end(ostream)
     end
     def handle(data, context)
+      istream = nil
       begin
         data = @filter.input_filter(data)
         raise Exception.exception("Wrong Request: \r\n#{data}") if data.nil? or data.empty? or data[data.size - 1].ord != TagEnd
@@ -366,6 +365,7 @@ module Hprose
         when TagEnd then return do_function_list
         else raise Exception.exception("Wrong Request: \r\n#{data}")
         end
+      rescue ::Interrupt => e
       rescue ::Exception => e
         return do_error(e, context)
       ensure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hprose
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
   prerelease: 
 platform: ruby
 authors: