yahns 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0885938d8049ca0b240e7727bcf47c9558945997'
-  data.tar.gz: 0b2a81c5a297241967f3f184a755c80d51f90a34
+  metadata.gz: 73a1df35604f8a2a57198e315bc7a3f1c0f008d2
+  data.tar.gz: 7ad6f6bf6464151fcb205a774e68475549f1a73b
 SHA512:
-  metadata.gz: a5fa096ca664e7f224f933a5c37b437a15617decfca04415aa8928d33cd733fe700b0544966392929568c5dcacb25016971d7aab294c5d33a9e4907c66b5d60a
-  data.tar.gz: 7dea50f747b2f7214c1de823fcb584b6da6738cb2c34ba8b5676a86636dddb322af50b22119a7a38b075fae692fb507feef3294e34538bd0ba0a88e6fb7a372a
+  metadata.gz: 2cc36eff407f38c2fe1d768e334455f311672dd0e82f1376fce79151ef4ec07fe1019646087eb24a1d0cb01d5b792cf40da6eb9ac295d58b9e4bb28e9ecb6e99
+  data.tar.gz: 8b28720a5ff4234b702347cef2e2cc7e5309886ef6b021ef1592cf2d9363c53235209def345329df1903859697f69b4c3afaafa8f946318c708cc8bd34fd205a

data/.olddoc.yml

@@ -1,7 +1,7 @@
 ---
-cgit_url: http://yhbt.net/yahns.git
+cgit_url: https://yhbt.net/yahns.git
 git_url: git://yhbt.net/yahns.git
-rdoc_url: http://yahns.yhbt.net/
-ml_url: http://yhbt.net/yahns-public/
+rdoc_url: https://yhbt.net/yahns/
+ml_url: https://yhbt.net/yahns-public/
 public_email: yahns-public@yhbt.net
 private_email: yahns@yhbt.net

data/Documentation/yahns-rackup.pod

@@ -163,7 +163,7 @@ See rackup documentation for more details.
 
 All feedback welcome via plain-text mail to L<mailto:yahns-public@yhbt.net>
 No subscription is necessary to post to the mailing list.
-List archives are available at L<http://yhbt.net/yahns-public/>
+List archives are available at L<https://yhbt.net/yahns-public/>
 
 =head1 COPYRIGHT
 

data/Documentation/yahns.pod

@@ -84,7 +84,7 @@ See L<yahns_config(5)> for documentation on the configuration file format.
 
 All feedback welcome via plain-text mail to L<mailto:yahns-public@yhbt.net>
 No subscription is necessary to post to the mailing list.
-Mail archives are available at L<http://yhbt.net/yahns-public/>
+Mail archives are available at L<https://yhbt.net/yahns-public/>
 
 =head1 COPYRIGHT
 

data/Documentation/yahns_config.pod

@@ -662,7 +662,7 @@ See the examples/ directory in the git source tree.
 
 All feedback welcome via plain-text mail to L<mailto:yahns-public@yhbt.net>
 No subscription is necessary to post to the mailing list.
-List archives are available at L<http://yhbt.net/yahns-public/>
+List archives are available at L<https://yhbt.net/yahns-public/>
 
 =head1 COPYRIGHT
 

data/GIT-VERSION-GEN

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

data/HACKING

@@ -47,7 +47,7 @@ developers do.  Please send patches via git-send-email(1) to the public
 mailing list at <yahns-public@yhbt.net>.  Pull requests should be
 formatted using git-request-pull(1).
 
-Mailing list archives: http://yhbt.net/yahns-public/
+Mailing list archives: https://yhbt.net/yahns-public/
 No subscription is necessary to post to the mailing list.
 Please remember to Cc: all recipients as subscription is optional.
 

data/README

@@ -66,14 +66,14 @@ You may optionally subscribe by sending an email to:
 
 	yahns-public+subscribe@yhbt.net
 
-Mailing list archives browsable via HTTP: http://yhbt.net/yahns-public/
+Mailing list archives browsable via HTTP: https://yhbt.net/yahns-public/
 Or NNTP: nntp://news.public-inbox.org/inbox.comp.lang.ruby.yahns
 
 This README is our homepage, we would rather be working on HTTP servers
 all day than worrying about the next browser vulnerability because
 HTML/CSS/JS is too complicated for us.
 
-* http://yahns.yhbt.net/README
+* https://yhbt.net/yahns/README
 
 Hacking
 -------

data/Rakefile

@@ -5,11 +5,11 @@
 
 gendocs = %w(NEWS NEWS.atom.xml)
 task rsync_docs: gendocs do
-  dest = ENV["RSYNC_DEST"] || "yahns.yhbt.net:/srv/yahns/"
+  dest = ENV["RSYNC_DEST"] || "yhbt.net:/srv/yhbt/yahns/"
   top = %w(INSTALL HACKING README COPYING)
 
   # git-set-file-times is distributed with rsync,
-  # Also available at: http://yhbt.net/git-set-file-times
+  # Also available at: https://yhbt.net/git-set-file-times
   # on Debian systems: /usr/share/doc/rsync/scripts/git-set-file-times.gz
   sh("git", "set-file-times", "Documentation", "examples", *top)
   make = ENV['MAKE'] || 'make'

data/extras/README

@@ -3,7 +3,7 @@ yahns extras
 
 This is random crap used to power one of the top websites in the galaxy:
 
-	http://YHBT.net/
+	https://YHBT.net/
 
 The code in this extras directory is officially part of yahns but may
 be useful to some (even outside of yahns).  There are no guarantees

data/lib/yahns.rb

@@ -16,8 +16,8 @@
 end
 
 # yahns exposes no user-visible API outside of the config file.
-# See http://yahns.yhbt.net/yahns_config.txt for the config documentation
-# and http://yahns.yhbt.net/ for the homepage.
+# See https://yhbt.net/yahns/yahns_config.txt for the config documentation
+# and https://yhbt.net/yahns/ for the homepage.
 # Internals are subject to change.
 
 module Yahns

data/lib/yahns/config.rb

@@ -4,7 +4,7 @@
 # frozen_string_literal: true
 #
 # Implements a DSL for configuring a yahns server.
-# See http://yahns.yhbt.net/examples/yahns_multi.conf.rb for a full
+# See https://yhbt.net/yahns/examples/yahns_multi.conf.rb for a full
 # example configuration file.
 class Yahns::Config # :nodoc:
   # public within yahns itself, NOT a public interface for users outside

data/lib/yahns/http_response.rb

@@ -60,7 +60,7 @@ def err_response(code)
   end
 
   def response_header_blocked(header, body, alive, offset, count)
-    if body.respond_to?(:to_path)
+    if body.respond_to?(:to_path) && count
       alive = Yahns::StreamFile.new(body, alive, offset, count)
       body = nil
     end
@@ -125,7 +125,7 @@ def kv_str(buf, key, value)
   def http_response_write(res, opt)
     status, headers, body = res
     offset = 0
-    count = hijack = nil
+    count = hijack = clen = nil
     alive = @hs.next? && self.class.persistent_connections
     flags = MSG_DONTWAIT
     term = false
@@ -152,7 +152,8 @@ def http_response_write(res, opt)
           alive = false if value =~ /\bclose\b/i
         when %r{\AContent-Length\z}i
           term = true
-          flags |= MSG_MORE if value.to_i > 0 && !hdr_only
+          clen = value.to_i
+          flags |= MSG_MORE if clen > 0 && !hdr_only
           kv_str(buf, key, value)
         when %r{\ATransfer-Encoding\z}i
           term = true if value =~ /\bchunked\b/i
@@ -163,6 +164,8 @@ def http_response_write(res, opt)
           kv_str(buf, key, value)
         end
       end
+      count ||= clen
+
       if !term && chunk_ok
         term = true
         body = Yahns::ChunkBody.new(body, opt)
@@ -194,7 +197,7 @@ def http_response_write(res, opt)
     return response_hijacked(hijack) if hijack
     return http_response_done(alive) if hdr_only
 
-    if body.respond_to?(:to_path)
+    if body.respond_to?(:to_path) && count
       @state = body = Yahns::StreamFile.new(body, alive, offset, count)
       return step_write
     end

data/lib/yahns/openssl_client.rb

@@ -38,12 +38,14 @@ def yahns_init_ssl(ssl_ctx)
   end
 
   def kgio_trywrite(buf)
+    len = buf.bytesize
+    return if len == 0
     buf = @ssl_blocked = buf.dup
     case rv = @ssl.write_nonblock(buf, exception: false)
     when :wait_readable, :wait_writable
       return rv # do not clear ssl_blocked
     when Integer
-      rv = buf.bytesize == rv ? nil : buf.byteslice(rv, buf.bytesize - rv)
+      rv = len == rv ? nil : buf.byteslice(rv, len - rv)
     end
     @ssl_blocked = nil
     rv

data/lib/yahns/req_res.rb

@@ -76,7 +76,7 @@ def yahns_step # yahns event loop entry point
     when Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EPIPE
       e.set_backtrace([])
     end
-    c.proxy_err_response(502, self, e)
+    c.proxy_err_response(Yahns::WbufCommon === @resbuf ? nil : 502, self, e)
   end
 
   def send_req_body_chunk(buf)

data/lib/yahns/stream_file.rb

@@ -11,28 +11,24 @@ class Yahns::StreamFile # :nodoc:
   NeedClose = Class.new(File) # :nodoc:
 
   def initialize(body, persist, offset, count)
-    if body.respond_to?(:to_io)
-      @tmpio = body.to_io
+    path = body.to_path
+    if path =~ %r{\A/dev/fd/(\d+)\z}
+      @tmpio = IO.for_fd($1.to_i)
+      @tmpio.autoclose = false
     else
-      path = body.to_path
-      if path =~ %r{\A/dev/fd/(\d+)\z}
-        @tmpio = IO.for_fd($1.to_i)
-        @tmpio.autoclose = false
-      else
-        retried = false
-        begin
-          @tmpio = NeedClose.open(path)
-        rescue Errno::EMFILE, Errno::ENFILE
-          raise if retried
-          retried = true
-          Thread.current[:yahns_fdmap].desperate_expire(5)
-          sleep(1)
-          retry
-        end
+      retried = false
+      begin
+        @tmpio = NeedClose.open(path)
+      rescue Errno::EMFILE, Errno::ENFILE
+        raise if retried
+        retried = true
+        Thread.current[:yahns_fdmap].desperate_expire(5)
+        sleep(1)
+        retry
       end
     end
-    @sf_offset = offset
-    @sf_count = count || @tmpio.size
+    @sf_offset = offset || 0
+    @sf_count = count
     @wbuf_persist = persist # whether or not we keep the connection alive
     @body = body
   end

data/yahns.gemspec

@@ -25,6 +25,6 @@
   # for Rack::Utils::HeaderHash#each
   s.add_development_dependency(%q<rack>, '>= 1.1')
 
-  s.homepage = "http://yahns.yhbt.net/README"
+  s.homepage = 'https://yhbt.net/yahns/README'
   s.licenses = "GPL-3.0+"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -222,7 +222,7 @@ files:
 - test/test_unix_socket.rb
 - test/test_wbuf.rb
 - yahns.gemspec
-homepage: http://yahns.yhbt.net/README
+homepage: https://yhbt.net/yahns/README
 licenses:
 - GPL-3.0+
 metadata: {}
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server