Merging debian version 1.9.4-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 0 insertions, 170 deletions

diff --git a/debian/vendor-h2o/lib/handler/mruby/embedded/chunked.rb b/debian/vendor-h2o/lib/handler/mruby/embedded/chunked.rb
deleted file mode 100644
index ff4e578..0000000
--- a/debian/vendor-h2o/lib/handler/mruby/embedded/chunked.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2014 DeNA Co., Ltd.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-module Kernel
-
-  def _h2o_chunked_proc_each_to_fiber()
-    Proc.new do |src|
-      fiber = Fiber.new do
-        src.each do |chunk|
-          _h2o_send_chunk(chunk)
-        end
-        _h2o_send_chunk_eos()
-      end
-      fiber.resume
-    end
-  end
-
-end
diff --git a/debian/vendor-h2o/lib/handler/mruby/embedded/core.rb b/debian/vendor-h2o/lib/handler/mruby/embedded/core.rb
deleted file mode 100644
index e62583d..0000000
--- a/debian/vendor-h2o/lib/handler/mruby/embedded/core.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright (c) 2014-2016 DeNA Co., Ltd., Kazuho Oku, Ryosuke Matsumoto,
-#                         Masayoshi Takahashi
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-module Kernel
-
-  def _h2o_define_callback(name, id)
-    Kernel.define_method(name) do |*args|
-      ret = Fiber.yield([ id, _h2o_create_resumer(), args ])
-      if ret.kind_of? Exception
-        raise ret
-      end
-      ret
-    end
-  end
-
-  def _h2o_create_resumer()
-    me = Fiber.current
-    Proc.new do |v|
-    me.resume(v)
-    end
-  end
-
-  def _h2o_proc_each_to_array()
-    Proc.new do |o|
-      a = []
-      o.each do |x|
-        a << x
-      end
-      a
-    end
-  end
-
-  def _h2o_proc_app_to_fiber()
-    Proc.new do |app|
-      cached = nil
-      Proc.new do |req|
-        fiber = cached
-        cached = nil
-        if !fiber
-          fiber = Fiber.new do
-            self_fiber = Fiber.current
-            req = Fiber.yield
-            while 1
-              begin
-                while 1
-                  resp = app.call(req)
-                  cached = self_fiber
-                  req = Fiber.yield(resp)
-                end
-              rescue => e
-                cached = self_fiber
-                req = Fiber.yield([-1, e])
-              end
-            end
-          end
-          fiber.resume
-        end
-        fiber.resume(req)
-      end
-    end
-  end
-
-end
diff --git a/debian/vendor-h2o/lib/handler/mruby/embedded/http_request.rb b/debian/vendor-h2o/lib/handler/mruby/embedded/http_request.rb
deleted file mode 100644
index 3f3247a..0000000
--- a/debian/vendor-h2o/lib/handler/mruby/embedded/http_request.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) 2015-2016 DeNA Co., Ltd., Kazuho Oku
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-module H2O
-
-  class HttpRequest
-    def join
-      if !@resp
-        @resp = _h2o__http_join_response(self)
-      end
-      @resp
-    end
-    def _set_response(resp)
-      @resp = resp
-    end
-  end
-
-  class HttpInputStream
-    def each
-      while c = _h2o__http_fetch_chunk(self)
-        yield c
-      end
-    end
-    def join
-      s = ""
-      each do |c|
-        s << c
-      end
-      s
-    end
-
-    class Empty < HttpInputStream
-      def each; end
-    end
-  end
-
-end