yahns 1.14.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 100f23910c77a7e45fdb98c841bf13a166eb0b63
-  data.tar.gz: ea3c7b2801fa134773bc079f637ccf419b5e6ef5
+  metadata.gz: 7e2b90d1e9db03563036b8fa9d20f734eadbc66b
+  data.tar.gz: da4bfdde14dc21244e1ce59e5696e56bb23d7327
 SHA512:
-  metadata.gz: 7ee178fa9b9b1122a4446353ca6c6f4744aa1589679deef510fe3afeae40f72f66b8ccb96b56476e2e67383b6cd17f10f23c1fedfd81ab588056944e5693fb83
-  data.tar.gz: 1f7a89edf6427deeb0f01b26461c744fa56dc22edc5f84d14eacfb48a50618a5622dcc28e67041843d1ff5de2d6b40c4144b580f044e8770f1e453e268ab10a0
+  metadata.gz: b7f796332d347e087508c0ddd7fbba45567e2c51fdc1b9718b911ca03b058c111131e399f0779c8c28abb950197a3cc7e057e5fcee1577c9e32367173486188a
+  data.tar.gz: b12c67cec9e1d9b6f752dc0282d0de9609e72074f2210bc54b68e4b6e47447ae238887aa6a87fcde6d95912ff86f54f9a9617c3d0596411fdba4101b408715cb

data/.gitignore

@@ -15,4 +15,3 @@
 .gem-manifest
 .tgz-manifest
 /doc
-/LATEST

data/Documentation/design_notes.txt

@@ -17,9 +17,12 @@ socket we have inside the kernel.
 Each listen queue has a dedicated thread pool running _blocking_
 accept(2) (or accept4(2)) syscall in a loop.  We use dedicated threads
 and blocking accept to benefit from "wake-one" behavior in the Linux
-kernel.  By default, this thread pool only has thread per-process, doing
+kernel.  By default, this thread pool only has one thread per-process, doing
 nothing but accepting sockets and injecting into to the event queue
-(used by epoll or kqueue).
+(used by epoll or kqueue) so a worker thread pool can pick them up.
+
+This design makes EPOLLEXCLUSIVE in Linux 4.5+ unnecessary to us,
+our listen sockets are never registered with epoll or kqueue.
 
 worker thread pool
 ------------------
@@ -38,7 +41,7 @@ allows us to guarantee exclusive access to a client socket without
 additional locks managed in userspace.
 
 Idle threads will sit performing epoll_wait(2) (or kevent(2))
-indefinitely until a socket is reported as "ready" by the kernel.
+indefinitely until a client socket is reported as "ready" by the kernel.
 
 queue flow
 ----------

data/Documentation/yahns-rackup.pod

@@ -168,7 +168,7 @@ List archives are available at L<https://yhbt.net/yahns-public/>
 =head1 COPYRIGHT
 
 Copyright (C) 2013-2016 all contributors L<mailto:yahns-public@yhbt.net>
-License: GPL-3.0+ L<http://www.gnu.org/licenses/gpl-3.0.txt>
+License: GPL-3.0+ L<https://www.gnu.org/licenses/gpl-3.0.txt>
 
 =head1 SEE ALSO
 

data/Documentation/yahns_config.pod

@@ -427,7 +427,7 @@ To enable TLS connections, you must configure this yourself.
 See documentation for OpenSSL::SSL::SSLContext
 for more information:
 
-L<http://docs.ruby-lang.org/en/trunk/OpenSSL/SSL/SSLContext.html>
+L<https://docs.ruby-lang.org/en/trunk/OpenSSL/SSL/SSLContext.html>
 
 Default: none
 
@@ -667,7 +667,7 @@ List archives are available at L<https://yhbt.net/yahns-public/>
 =head1 COPYRIGHT
 
 Copyright (C) 2013-2016 all contributors L<mailto:yahns-public@yhbt.net>
-License: GPL-3.0+ L<http://www.gnu.org/licenses/gpl-3.0.txt>
+License: GPL-3.0+ L<https://www.gnu.org/licenses/gpl-3.0.txt>
 
 =head1 SEE ALSO
 

data/GIT-VERSION-GEN

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

data/HACKING

@@ -2,12 +2,12 @@ development dependencies
 ------------------------
 
 * minitest RubyGem (version 4 or 5, standard in Ruby 2.0+)
-* curl - http://curl.haxx.se/ - we don't trust our own Ruby abilities :>
+* curl - https://curl.haxx.se/ - we don't trust our own Ruby abilities :>
 * dd(1) - standard POSIX tool - to feed curl
-* ab - http://httpd.apache.org/ - for concurrent testing
+* ab - https://httpd.apache.org/ - for concurrent testing
 * GNU make - https://www.gnu.org/software/make/
-* git - http://www.git-scm.com/
-* ruby - http://www.ruby-lang.org/en/
+* git - https://www.git-scm.com/
+* ruby - https://www.ruby-lang.org/en/
 
 	git clone git://yhbt.net/yahns
 
@@ -47,9 +47,10 @@ 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: https://yhbt.net/yahns-public/
+All mail is archived publically at: https://yhbt.net/yahns-public/
+Anonymous contributions will always be welcome.
 No subscription is necessary to post to the mailing list.
 Please remember to Cc: all recipients as subscription is optional.
 
 Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
-License: GPL-3.0+ <http://www.gnu.org/licenses/gpl-3.0.txt>
+License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>

data/README

@@ -66,8 +66,12 @@ You may optionally subscribe by sending an email to:
 
 	yahns-public+subscribe@yhbt.net
 
-Mailing list archives browsable via HTTP: https://yhbt.net/yahns-public/
+We suck at delivering email, so relying on the archives might be
+a better bet:
+
+Mailing list archives browsable via HTTPS: https://yhbt.net/yahns-public/
 Or NNTP: nntp://news.public-inbox.org/inbox.comp.lang.ruby.yahns
+Atom feed: https://yhbt.net/yahns-public/new.atom
 
 This README is our homepage, we would rather be working on HTTP servers
 all day than worrying about the next browser vulnerability because
@@ -88,7 +92,7 @@ the git(7) suite for generating and sending patches.  Please format
 pull requests with the git-request-pull(1) script (also distributed
 with git(7)) and send them via email.
 
-See http://www.git-scm.com/ for more information on git.
+See https://www.git-scm.com/ for more information on git.
 
 Design
 ------

data/Rakefile

@@ -66,12 +66,105 @@ def tags
   end.compact.sort { |a,b| b[:time] <=> a[:time] }
 end
 
+def xml(dst, tag, text = nil, attrs = nil)
+  if Hash === text
+    attrs = text
+    text = nil
+  end
+  if attrs
+    attrs = attrs.map { |k,v| "#{k}=#{v.encode(xml: :attr)}" }
+    attrs = "\n#{attrs.join("\n")}"
+  end
+  case text
+  when nil
+    if block_given?
+      dst << "<#{tag}#{attrs}>"
+      yield
+      dst << "</#{tag}>"
+    else
+      dst << "<#{tag}#{attrs}/>"
+    end
+  else
+    dst << "<#{tag}#{attrs}>#{text.encode(xml: :text)}</#{tag}>"
+  end
+end
+
 desc 'prints news as an Atom feed'
 task "NEWS.atom.xml" do
-  # gem install 'olddoc', 'olddoc prepare' has no API besides the
-  # command-line.  This requires olddoc 1.1 or later.
-  system('olddoc', 'prepare') or abort "olddoc prepare failed #$?"
+  require 'uri'
+  cgit_uri = URI('https://yhbt.net/yahns.git')
+  uri = URI('https://yhbt.net/yahns/')
+  new_tags = tags[0,10]
+  time = nil
+  project_name = 'yahns'
+  short_desc = File.readlines('README')[0].split(' - ')[0]
+  new_tags = tags[0,10]
+  atom_uri = uri.dup
+  atom_uri.path += 'NEWS.atom.xml'
+  news_uri = uri.dup
+  news_uri.path += 'NEWS.html'
+  dst = ''
+  xml(dst, 'feed', xmlns: 'http://www.w3.org/2005/Atom') do
+    xml(dst, 'id', atom_uri.to_s)
+    xml(dst, 'title', "#{project_name} news")
+    xml(dst, 'subtitle', short_desc)
+    xml(dst, 'link', rel: 'alternate', type: 'text/html', href: news_uri.to_s)
+    xml(dst, 'updated', new_tags.empty? ? '1970-01-01:00:00:00Z'
+                                      : new_tags[0][:time])
+    new_tags.each do |tag|
+      xml(dst, 'entry') do
+        xml(dst, 'title', tag[:subject])
+        xml(dst, 'updated', tag[:time])
+        xml(dst, 'published', tag[:time])
+        xml(dst, 'author') do
+          xml(dst, 'name', tag[:tagger_name])
+          xml(dst, 'email', tag[:tagger_email])
+        end
+        uri = cgit_uri.dup
+        uri.path += '/tag/'
+        uri.query = "id=#{tag[:tag]}"
+        uri = uri.to_s
+        xml(dst, 'link', rel: 'alternate', type: 'text/html', href: uri)
+        xml(dst, 'id', uri)
+        xml(dst, 'content', type: 'xhtml') do
+          xml(dst, 'div', xmlns: 'http://www.w3.org/1999/xhtml') do
+            xml(dst, 'pre', tag[:body])
+          end # div
+        end # content
+      end # entry
+    end # new_tags.each
+  end # feed
+
+  fp = Tempfile.new('NEWS.atom.xml', '.')
+  fp.sync = true
+  fp.write(dst)
+  fp.chmod 0644
+  File.utime(time, time, fp.path) if time
+  File.rename(fp.path, 'NEWS.atom.xml')
+  fp.close!
 end
 
 desc 'prints news as a text file'
-task 'NEWS' => 'NEWS.atom.xml'
+task 'NEWS' do
+  fp = Tempfile.new('NEWS', '.')
+  fp.sync = true
+  time = nil
+  tags.each do |tag|
+    time ||= tag[:time_obj]
+    line = tag[:subject] + ' / ' + tag[:time].sub(/T.*/, '')
+    fp.puts line
+    fp.puts('-' * line.length)
+    fp.puts
+    fp.puts tag[:body]
+    fp.puts
+  end
+  fp.write("Unreleased\n\n") unless fp.size > 0
+  fp.puts "COPYRIGHT"
+  fp.puts "---------"
+  fp.puts "Copyright (C) 2013-2017 all contributors <yahns-public@yhbt.net>"
+  fp.puts "License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>"
+  fp.chmod 0644
+  File.utime(time, time, fp.path) if time
+  File.rename(fp.path, 'NEWS')
+  fp.close!
+end

data/examples/logrotate.conf

@@ -5,7 +5,7 @@
 # /etc/logrotate.d/yahns_app on my Debian systems
 #
 # See the logrotate(8) manpage for more information:
-#    http://linux.die.net/man/8/logrotate
+#    https://linux.die.net/man/8/logrotate
 
 # Modify the following glob to match the logfiles your app writes to:
 /var/log/yahns_app/*.log {

data/lib/yahns/chunk_body.rb

@@ -2,7 +2,8 @@
 # Copyright (C) 2016 all contributors <yahns-public@yhbt.net>
 # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
-class Yahns::ChunkBody
+
+class Yahns::ChunkBody # :nodoc:
   def initialize(body, vec)
     @body = body
     @vec = vec

data/lib/yahns/http_response.rb

@@ -200,7 +200,7 @@ def http_response_write(res, opt)
       return step_write
     end
 
-    wbuf = rv = nil
+    headers = wbuf = rv = nil
     body.each do |x|
       if wbuf
         rv = wbuf.wbuf_write(self, x)

data/lib/yahns/proxy_http_response.rb

@@ -132,7 +132,9 @@ def proxy_res_headers(res, req_res)
 
     # send the headers
     case rv = kgio_syssend(res, flags)
-    when nil then break # all done, likely
+    when nil # all done, likely
+      res.clear
+      break
     when String # partial write, highly unlikely
       flags = MSG_DONTWAIT
       res = rv # hope the skb grows

data/lib/yahns/proxy_pass.rb

@@ -6,6 +6,12 @@
 require 'rack/request'
 require 'timeout'
 
+# XXX consider this file and the proxy-related stuff in yahns
+# unstable and experimental!  It has never been documented and
+# incompatible changes may still happen.
+#
+# However, it seems to be proxying for our mail archives well enough:
+# https://yhbt.net/yahns-public/
 require_relative 'proxy_http_response'
 require_relative 'req_res'
 

data/lib/yahns/stream_input.rb

@@ -43,8 +43,9 @@ def read(length = nil, rv = ''.dup)
         length < 0 and raise ArgumentError, "negative length #{length} given"
         rv.replace(@rbuf.slice!(0, length))
       else
-        to_read = length - @rbuf.size
-        rv.replace(@rbuf.slice!(0, @rbuf.size))
+        cur = @rbuf.size
+        to_read = length - cur
+        cur == 0 ? rv.clear : rv.replace(@rbuf.slice!(0, cur))
         until to_read == 0 || eof? || (rv.size > 0 && @chunked)
           @client.yahns_read(to_read, @buf) or eof!
           filter_body(@rbuf, @buf)

data/lib/yahns/tee_input.rb

@@ -104,9 +104,7 @@ def consume!
   end
 
   def tee(buffer)
-    if buffer && buffer.size > 0
-      @tmp.write(buffer)
-    end
+    @tmp.write(buffer) if buffer
     buffer
   end
 

data/yahns.gemspec

@@ -7,7 +7,7 @@
   s.authors = ["yahns hackers"]
   s.summary = "sleepy, multi-threaded, non-blocking application server"
   s.description = File.read("README").split(/\n\n/)[1].strip
-  s.email = %q{yahns@yhbt.net}
+  s.email = %q{yahns-public@yhbt.net}
   s.executables = manifest.grep(%r{\Abin/}).map { |s| s.sub(%r{\Abin/}, "") }
   s.files = manifest
   s.add_dependency(%q<kgio>, '~> 2.9')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -99,7 +99,7 @@ description: |-
   yahns currently hosts Rack/HTTP applications, but may eventually support
   other application types.  Unlike some existing servers, yahns is
   extremely sensitive to fatal bugs in the applications it hosts.
-email: yahns@yhbt.net
+email: yahns-public@yhbt.net
 executables:
 - yahns
 - yahns-rackup
@@ -108,7 +108,6 @@ extra_rdoc_files: []
 files:
 - ".gitattributes"
 - ".gitignore"
-- ".olddoc.yml"
 - COPYING
 - Documentation/.gitignore
 - Documentation/GNUmakefile
@@ -242,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server

data/.olddoc.yml

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