yahns 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 164544a63a17cfe2b98fb72ad88372ef172e1f36
-  data.tar.gz: 70a7cf50db77f1297f1ea551b18037ae664e3d25
+  metadata.gz: 689a07f3155677900ad1b3df449a06978c2edd8c
+  data.tar.gz: 6741406d0b136e70745bc5aa728f6f5f7faa77bc
 SHA512:
-  metadata.gz: cd3e8a33edf8edfdc912d66146234605be0c086d7d80eddb9c01bb9a93fa49e1fb9936b08f2ce2abe3e4ab3cad2405c4224ba6f9cdf400d25f6d0d67a8d82391
-  data.tar.gz: fc2d66c05bba3f5bc21d99d5e015801d7f43d2f8c20cd105507b49c5fe8c1e0a86c562b1e183ab25b2d63b785af77f712a330b50714120598e02065073e8b15d
+  metadata.gz: b17db2fead5e7ff7585fdd5433f0adb43b247a46502ac99b7530bdc7b8a0d5e96b8d45a238ab7f16f8438ccac38a1cd1aaac33db1d55dcfbc1fbd034f6d2c203
+  data.tar.gz: 8fe3e364ff37d704d40079657d14739f9ac3fe886ffc86e6bc22bc606162ab906370279ba6a1f7d312c7acdc4f6f07269e655ab42ff55698f8a1adb5956e4ae2

data/GIT-VERSION-GEN

@@ -4,7 +4,7 @@
 CONSTANT = "Yahns::VERSION"
 RVF = "lib/yahns/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v1.3.1"
+DEF_VER = "v1.4.0"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),

data/README

@@ -82,7 +82,7 @@ Hacking
 We use git and follow the same development model as git itself
 (mailing list-oriented, benevolent dictator).
 
-  git clone git://yhbt.net/yahns
+	git clone git://yhbt.net/yahns
 
 Please use git-format-patch(1) and git-send-email(1) distributed with
 the git(7) suite for generating and sending patches.  Please format
@@ -94,7 +94,7 @@ See http://www.git-scm.com/ for more information on git.
 Design
 ------
 
-yahns is designed to optimimally use multiple threads with non-blocking I/O.
+yahns is designed to optimally use multiple threads with non-blocking I/O.
 The event loop is not a traditional single-threaded design with a mutex
 slapped on as an afterthought, but designed from the beginning to utilize
 multiple threads.
@@ -109,16 +109,16 @@ multiple threads.
 The end result is clients transition freely and fairly between threads
 and will always be able to find the next idle thread to run on.
 
-This design works with kqueue, too, and we will support kqueue if there
-is interest.  In fact, got our design inspiration from the name "kqueue"
-when working on another project.  We may also support libkqueue:
+This design works with kqueue, too, and we support kqueue.  In fact, got
+our design inspiration from the name "kqueue" when working on another
+project.  We may also support libkqueue:
 
     http://sourceforge.net/projects/libkqueue/
 
 In addition to multiple threads, yahns optionally supports multiple
 processes to work around low FD limits as well as contention in the:
 
-* kernel (socket (de)allocation from accept/close)
+* kernel (socket (de)allocation from accept/close, mmap/sbrk locks)
 * standard C library (malloc/free)
 * Ruby VM (GVL, GC)
 * application it hosts
@@ -126,7 +126,7 @@ processes to work around low FD limits as well as contention in the:
 Copyright
 ---------
 
-Copyright 2013, Eric Wong <normalperson@yhbt.net> and all contributors.
+Copyright 2013-2014, all contributors (see git repo).
 License: GPLv3 or later <https://www.gnu.org/licenses/gpl-3.0.txt>
 
 yahns is copyrighted Free Software by all contributors, see logs in
@@ -147,4 +147,15 @@ for more details.
 You should have received a copy of the GNU General Public License along
 with this program; if not, see https://www.gnu.org/licenses/gpl-3.0.txt
 
+Additional permission under GNU GPL version 3 section 7:
+
+    If you modify this program, or any covered work, by linking or
+    combining it with the OpenSSL project's OpenSSL library (or a
+    modified version of that library), containing parts covered by the
+    terms of the OpenSSL or SSLeay licenses, the copyright holder(s)
+    grants you additional permission to convey the resulting work.
+    Corresponding Source for a non-source form of such a combination
+    shall include the source code for the parts of OpenSSL used as well
+    as that of the covered work.
+
 lrg nabgure ubeevoyl-anzrq freire :>

data/extras/autoindex.rb

@@ -13,12 +13,13 @@ class Autoindex
   FN = %{<a href="%s">%s</a>}
   TFMT = "%Y-%m-%d %H:%M"
 
-  def initialize(app, index = %w(index.html))
+  def initialize(app, index = %w(index.html), skip_gzip_static = true)
     app.respond_to?(:root) or raise ArgumentError,
        "wrapped app #{app.inspect} does not respond to :root"
     @app = app
     @root = app.root
     @index = index
+    @skip_gz = skip_gzip_static
   end
 
   def redirect_slash(env)
@@ -67,10 +68,13 @@ class Autoindex
       # generate the index, show directories first
       dirs = []
       files = []
+      ngz_idx = {} if @skip_gz # used to avoid redundant stat()
       dir.each do |base|
         case base
         when "."
           next
+        when ".."
+          next if path_info == "/"
         end
 
         begin
@@ -90,8 +94,22 @@ class Autoindex
         entry << (" " * pad) if pad > 0
         entry << st.mtime.strftime(TFMT)
         entry << sprintf("% 8s", human_size(st))
+        entry = [name, entry]
 
-        (st.directory? ? dirs : files) << [ name,  entry ]
+        if st.directory?
+          dirs << entry
+        elsif ngz_idx
+          ngz_idx[name] = entry
+        else
+          files << entry
+        end
+      end
+
+      if ngz_idx
+        ngz_idx.each do |name, entry|
+          ngz_path = name.dup.gsub!(/\.gz\z/, '')
+          ngz_idx.include?(ngz_path) or files << entry
+        end
       end
 
       dirs.sort! { |(a,_),(b)| a <=> b }.map! { |(_,ent)| ent }
@@ -117,7 +135,7 @@ class Autoindex
     dir.close if dir
   end
 
-  def r(code, msg = nil, env = nil)
+  def r(code, exc = nil, env = nil)
     if env && exc && logger = env["rack.logger"]
       msg = exc.message
       msg = msg.dump if /[[:cntrl:]]/ =~ msg # prevent code injection

data/lib/yahns/daemon.rb

@@ -1,7 +1,7 @@
 # -*- encoding: binary -*-
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
-require 'yahns'
+require_relative '../yahns'
 
 module Yahns::Daemon # :nodoc:
   # We don't do a lot of standard daemonization stuff:

data/lib/yahns/http_client.rb

@@ -224,9 +224,10 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
     http_response_write(status, headers, body)
   end
 
+  # this is the env["rack.hijack"] callback exposed to the Rack app
   def hijack_proc(env)
     proc do
-      self.class.queue.queue_del(self) # EPOLL_CTL_DEL
+      hijack_cleanup
       env[RACK_HIJACK_IO] = self
     end
   end
@@ -253,12 +254,19 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
     end while true
   end
 
-  def response_hijacked(fn)
+  # allow releasing some memory if rack.hijack is used
+  def hijack_cleanup
     # we must issue EPOLL_CTL_DEL before hijacking (if we issue it at all),
     # because the hijacker may close use before we get back to the epoll worker
     # loop.  EPOLL_CTL_DEL saves about 200 bytes of unswappable kernel memory,
     # so it can matter if we have lots of hijacked sockets.
-    self.class.queue.queue_del(self)
+    self.class.queue.queue_del(self) # EPOLL_CTL_DEL
+    @input = @input.close if @input
+    @hs = nil # no need for the HTTP parser anymore
+  end
+
+  def response_hijacked(fn)
+    hijack_cleanup
     fn.call(self)
     :ignore
   end

data/lib/yahns/http_context.rb

@@ -49,11 +49,11 @@ module Yahns::HttpContext # :nodoc:
     # input_buffering == false is handled in http_client
     return app if @client_max_body_size == nil
 
-    require 'yahns/cap_input'
+    require_relative 'cap_input'
     return app if @input_buffering == true
 
     # @input_buffering == false/:lazy
-    require 'yahns/max_body'
+    require_relative 'max_body'
     Yahns::MaxBody.new(app, @client_max_body_size)
   end
 

data/lib/yahns/http_response.rb

@@ -143,7 +143,7 @@ module Yahns::HttpResponse # :nodoc:
       buf = "#{response_start}#{status}\r\nDate: #{httpdate}\r\n"
       headers.each do |key, value|
         case key
-        when %r{\ADate\z}
+        when %r{\ADate\z}i
           next
         when %r{\AContent-Range\z}i
           if %r{\Abytes (\d+)-(\d+)/\d+\z} =~ value

data/lib/yahns/queue.rb

@@ -1,7 +1,7 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net>
+# Copyright (C) 2013-2014, all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 if SleepyPenguin.const_defined?(:Epoll)
   require_relative 'queue_epoll'
 else
-  require_relative 'queue_kqueue' # TODO
+  require_relative 'queue_kqueue'
 end

data/lib/yahns/rackup_handler.rb

@@ -1,6 +1,6 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
-require 'yahns'
+require_relative '../yahns'
 
 module Yahns::RackupHandler # :nodoc:
   def self.default_host

data/lib/yahns/server.rb

@@ -57,7 +57,7 @@ class Yahns::Server # :nodoc:
     bind_new_listeners!
     self.pid = @config.value(:pid) # write pid file
     if @worker_processes
-      require 'yahns/server_mp'
+      require_relative 'server_mp'
       extend Yahns::ServerMP
     else
       switch_user(*@user) if @user

data/lib/yahns/stream_input.rb

@@ -50,7 +50,7 @@ class Yahns::StreamInput # :nodoc:
           rv << @rbuf
           to_read -= @rbuf.size
         end
-        @rbuf.replace('')
+        @rbuf.clear
       end
       rv = nil if rv.empty? && length != 0
     else
@@ -137,7 +137,7 @@ class Yahns::StreamInput # :nodoc:
       dst << @rbuf
     end
   ensure
-    @rbuf.replace('')
+    @rbuf.clear
   end
 
   def eof!

data/test/test_extras_autoindex.rb

@@ -44,8 +44,12 @@ class TestExtrasAutoindex < Testcase
 
       res = http.request(Net::HTTP::Get.new("/"))
       assert_equal 200, res.code.to_i
+      refute_match %r{\.\./}, res.body, "top level should not link to parent"
       assert_match %r{foo}, res.body
-      assert_match %r{bar/}, res.body
+
+      res = http.request(Net::HTTP::Get.new("/bar/"))
+      assert_equal 200, res.code.to_i
+      assert_match %r{\.\./}, res.body, "link to parent present"
     end
   ensure
     quit_wait pid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server