http_spew 0.4.1 → 0.7.1

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 0.4.1
+GIT_VERSION = 0.7.1

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.4.1.GIT
+DEF_VER=v0.7.1
 
 LF='
 '

data/GNUmakefile

@@ -1,6 +1,5 @@
 all::
-RSYNC_DEST := bogomips.org:/srv/bogomips/http_spew
-rfproject := rainbows
+RSYNC_DEST := yhbt.net:/srv/yhbt/http_spew
 rfpackage := http_spew
 
 RUBY_VERSION_FILE = lib/http_spew/version.rb
@@ -10,7 +9,7 @@ include pkg.mk
 $(RUBY_VERSION_FILE): GIT-VERSION-FILE
 	@$(RM) -f $@+
 	@echo >> $@+ '# -*- encoding: binary -*-'
-	@echo >> $@+ 'HTTP_Spew.const_set :VERSION, "$(GIT_VERSION)"'
+	@echo >> $@+ 'HTTP_Spew.const_set :VERSION, "$(GIT_VERSION)".freeze'
 	@mv $@+ $@
 
 build: $(RUBY_VERSION_FILE)

data/LATEST

@@ -1,4 +1,6 @@
-=== http_spew 0.4.1 / 2012-09-23 00:01 UTC
+=== http_spew 0.7.1 / 2022-01-16 08:45 UTC
 
-  Fix formatting of user-supplied headers.
+  2 changes since v0.7.0:
+    doc: s/bogomips.org/yhbt.net/
+    fix mismatched indentation warnings
 

data/LICENSE

@@ -1,17 +1,14 @@
-HTTP Spew is copyrighted Free Software by all contributors, see logs in
+http_spew is copyrighted Free Software by all contributors, see logs in
 revision control for names and email addresses of all of them.
 
 You can redistribute it and/or modify it under the terms of the GNU
-General Public License, version 2 *or* 3 ({GPLv3}[link:COPYING]) as
-published by the Free Software Foundation.  The project leader
-(Eric Wong) reserves the right to relicense HTTP Spew under future versions
-of the GPL.
+General Public License as published by the Free Software Foundation;
+either version 2 of the License, or (at your option) any later version.
 
-HTTP Spew is distributed in the hope that it will be useful, but WITHOUT
+http_spew is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-License for more details.
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
-You should have received a copy of the GNU General Public License
-along with HTTP Spew; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+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-2.0.txt

data/NEWS

@@ -1,3 +1,58 @@
+=== http_spew 0.7.1 / 2022-01-16 08:45 UTC
+
+  2 changes since v0.7.0:
+    doc: s/bogomips.org/yhbt.net/
+    fix mismatched indentation warnings
+
+=== http_spew 0.7.0 - modernizing for newer Rubies / 2017-06-12 22:00 UTC
+
+  Ruby 2.3+ is now required as kgio dependencies are gone.
+  This is unlikely to be a problem in practice, as hardly
+  anybody uses this at the moment.
+
+  5 changes since 0.6.0:
+
+        remove most uses of kgio
+        make kgio entirely optional
+        update to only use public email address
+        http_spew: remove kgio require at top level
+        gemspec: remove olddoc as a build dependency
+
+=== http_spew 0.6.0 - even less / 2016-11-05 02:15 UTC
+
+  Rack "to_path" support is dropped since few servers can
+  take advantage of this in a non-buggy way.
+
+  As a consolation, #each should be less GC-intensive by
+  with explicit calls to String#clear to reduce memory
+  pressure.
+
+  3 changes since 0.5.0
+
+        pkg.mk: avoid network for "gem install"
+        request: drop to_path support
+        explicitly clear large buf when it is obviously safe
+
+=== http_spew 0.5.0 / 2016-10-31 20:43 UTC
+
+  This release requires Ruby 2.1 or later.
+
+  13 changes since 0.4.1:
+
+        gemspec: require kcar >= 0.3.1
+        test/helper: explicit redirect for Ruby 2.0.0
+        update packaging + docs (website)
+        allow all future GPL versions
+        add benchmark scripts
+        relax dependency on unicorn
+        declare empty classes with constant assignment
+        test_upload: use object_id to check matches
+        use frozen string literals for Ruby 2.1+
+        merge into kcar project and mailing list
+        dedicated mailing list
+        rely on opt_str_freeze in more places
+        use monotonic clock for timing
+
 === http_spew 0.4.1 / 2012-09-23 00:01 UTC
 
   Fix formatting of user-supplied headers.

data/README

@@ -11,7 +11,6 @@ Use HTTP Spew if you wish you could kinda multicast with HTTP...
 * No support for DNS resolution (WONTFIX, ever)
 * No support for HTTPS
 * No support for keepalive (yet?)
-* No support for Ruby 1.8, this is Ruby 1.9-only
 * Not remotely RFC-compliant
 * Messes up analytics/reporting on servers
 * Resets server connections
@@ -33,13 +32,13 @@ It's also completely untested and unused anywhere!
 
 You can get the latest source via git from the following locations:
 
-  git://bogomips.org/http_spew.git
+  git://yhbt.net/http_spew.git
   git://repo.or.cz/http_spew.git (mirror)
 
 You may browse the code from the web and download the latest snapshot
 tarballs here:
 
-* http://bogomips.org/http_spew.git (cgit)
+* https://yhbt.net/http_spew.git
 * http://repo.or.cz/w/http_spew.git (gitweb)
 
 Inline patches (from "git format-patch") to the mailing list are
@@ -54,8 +53,8 @@ don't email the git mailing list or maintainer with http_spew patches.
 == Contact
 
 All feedback (bug reports, user/development discussion, patches, pull
-requests) go to the mailing list: mailto:http.spew@librelist.org
+requests) go to the mailing list: mailto:http_spew-public@yhbt.net
 
-Mailing list archives in mbox format may be downloaded here:
+Mailing list archives may be viewed and downloaded here:
 
-http://bogomips.org/http_spew/archives/
+https://yhbt.net/http_spew-public/

data/benchmark/bm_content_md5.rb

@@ -0,0 +1,52 @@
+# -*- encoding: binary -*-
+require "./test/helper"
+require "benchmark"
+
+class TestBMContentMD5 < Test::Unit::TestCase
+  def setup
+    @addr, @port, @srv = start_server("./test/content-md5.ru", 1)
+    @sockaddr = Socket.pack_sockaddr_in(@port, @addr)
+    @env = {
+      "REQUEST_METHOD" => "PUT",
+      "REQUEST_URI" => "/",
+      "HTTP_HOST" => "example.com",
+    }
+    @tmpfiles = []
+    @bs = ENV['bs'] ? ENV['bs'].to_i : 1024 * 1024
+    @count = ENV['count'] ? ENV['count'].to_i : 1000
+    @cmd = %w(dd if=/dev/zero)
+    @cmd << "bs=#@bs"
+    @cmd << "count=#@count"
+  end
+
+  def teardown
+    Process.kill(:QUIT, @srv)
+    Process.waitpid2(@srv)
+    @tmpfiles.each { |tmp| tmp.closed? or tmp.close! }
+  end
+
+  def test_upload_with_md5
+    rd, wr = IO.pipe
+    pid = fork do
+      $stdout.reopen(wr)
+      rd.close
+      wr.close
+      exec(*@cmd)
+    end
+    wr.close
+    @env["CONTENT_LENGTH"] = (@bs * @count).to_s
+    @env["rack.input"] = rd
+    input = HTTP_Spew::ContentMD5.new(@env)
+    assert_nil @env["CONTENT_LENGTH"]
+    assert_equal "chunked", @env["HTTP_TRANSFER_ENCODING"]
+    req = HTTP_Spew::Request.new(@env, input, @sockaddr)
+    rv = nil
+    res = Benchmark.measure do
+      rv = req.run(100000)
+    end
+    assert_equal 200, rv[0].to_i
+    pid, status = Process.waitpid2(pid)
+    assert status.success?
+    p res
+  end
+end

data/benchmark/bm_content_md5_input_spray.rb

@@ -0,0 +1,59 @@
+require "./test/helper"
+require "benchmark"
+
+class TestBMContentMD5InputSpray < Test::Unit::TestCase
+  def setup
+    @nr = 4
+    @addr, @port, @srv = start_server("./test/content-md5.ru", @nr)
+    @sockaddr = Socket.pack_sockaddr_in(@port, @addr)
+    @env = {
+      "REQUEST_METHOD" => "PUT",
+      "REQUEST_URI" => "/",
+      "HTTP_HOST" => "example.com",
+    }
+    @tmpfiles = []
+    @bs = ENV['bs'] ? ENV['bs'].to_i : 1024 * 1024
+    @count = ENV['count'] ? ENV['count'].to_i : 1000
+    @cmd = %w(dd if=/dev/zero)
+    @cmd << "bs=#@bs"
+    @cmd << "count=#@count"
+  end
+
+  def teardown
+    Process.kill(:QUIT, @srv)
+    Process.waitpid2(@srv)
+    @tmpfiles.each { |tmp| tmp.closed? or tmp.close! }
+  end
+
+  def test_spray_with_md5
+    rd, wr = IO.pipe
+    pid = fork do
+      $stdout.reopen(wr)
+      rd.close
+      wr.close
+      exec(*@cmd)
+    end
+    wr.close
+    @env["CONTENT_LENGTH"] = (@bs * @count).to_s
+    @env["rack.input"] = rd
+    input = HTTP_Spew::ContentMD5.new(@env)
+    sprayer = HTTP_Spew::InputSpray.new(@env, @nr, input)
+    assert_nil @env["CONTENT_LENGTH"]
+    assert_equal "chunked", @env["HTTP_TRANSFER_ENCODING"]
+    reqs = sprayer.readers.map do |md5_input|
+      HTTP_Spew::Request.new(@env, md5_input, @sockaddr)
+    end
+    assert_equal @nr, reqs.size
+    rv = nil
+    res = Benchmark.measure do
+      rv = HTTP_Spew.wait_mt reqs.size, reqs, 3600
+    end
+    assert_equal @nr, rv.size
+    rv.each do |resp|
+      assert_equal 200, resp.response[0].to_i
+    end
+    pid, status = Process.waitpid2(pid)
+    assert status.success?
+    p res
+  end
+end

data/http_spew.gemspec

@@ -1,24 +1,20 @@
-ENV["VERSION"] or abort "VERSION= must be specified"
-manifest = File.readlines('.manifest').map! { |x| x.chomp! }
-require 'wrongdoc'
-extend Wrongdoc::Gemspec
-name, summary, title = readme_metadata
+manifest = File.exist?('.manifest') ?
+  IO.readlines('.manifest').map!(&:chomp!) : `git ls-files`.split("\n")
 
 Gem::Specification.new do |s|
   s.name = %q{http_spew}
-  s.version = ENV["VERSION"].dup
-  s.authors = ["HTTP Spew hackers"]
-  s.date = Time.now.utc.strftime('%Y-%m-%d')
-  s.description = readme_description
-  s.email = %q{http.spew@librelist.org}
-  s.extra_rdoc_files = extra_rdoc_files(manifest)
+  s.version = (ENV['VERSION'] || '0.7.1').dup
+  s.authors = ["http_spew hackers"]
+  s.description = File.read('README').split("\n\n")[1]
+  s.email = %q{http_spew-public@yhbt.net}
+  s.extra_rdoc_files = IO.readlines('.document').map!(&:chomp!).keep_if do |f|
+    File.exist?(f)
+  end
   s.files = manifest
-  s.homepage = Wrongdoc.config[:rdoc_url]
-  s.summary = summary
-  s.rdoc_options = rdoc_options
-  s.rubyforge_project = %q{rainbows}
+  s.homepage = 'https://yhbt.net/http_spew/'
+  s.summary = 'HTTP Spew - LAN-only HTTP spam^H^H^H^Hclient for Ruby'
   s.test_files = Dir["test/test_*.rb"]
-  s.add_dependency(%q<kcar>, "~> 0.3")
-  s.add_dependency(%q<kgio>, "~> 2.6")
-  s.add_development_dependency(%q<wrongdoc>, "~> 1.5")
+  s.add_dependency(%q<kcar>, [ "~> 0.3", ">= 0.3.1"])
+  s.required_ruby_version = '>= 2.3'
+  s.licenses = %w(GPL-2.0+)
 end

data/lib/http_spew/chunky_pipe.rb

@@ -3,17 +3,28 @@
 # This is a OS-level pipe that overrides IO#read to provide
 # IO#readpartial-like semantics while remaining Rack::Lint-compatible
 # for EOF, meaning we return nil on EOF instead of raising EOFError.
-class HTTP_Spew::ChunkyPipe < Kgio::Pipe
+class HTTP_Spew::ChunkyPipe < IO
 
   # other threads may force an error to be raised in the +read+
   # method
   attr_accessor :error
 
+  class << self
+    alias new pipe
+  end
+
   # Override IO#read to behave like IO#readpartial, but still return +nil+
   # on EOF instead of raising EOFError.
-  def read(*args)
+  def read(len = 16384, buf = '')
     check_err!
-    kgio_read(*args) || check_err! || close
+    case read_nonblock(len, buf, exception: false)
+    when nil
+      return check_err! || close
+    when :wait_readable
+      wait_readable # retry
+    else
+      return buf
+    end while true
   end
 
   def check_err!

data/lib/http_spew/class_methods.rb

@@ -41,11 +41,11 @@ module HTTP_Spew::ClassMethods
   end
 
   def with_timeout(t)
-    t0 = Time.now
+    t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     yield
-    ensure
-      t[0] -= Time.now - t0
-      t[0] = 0.0 if t[0] < 0
+  ensure
+    t[0] -= Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0
+    t[0] = 0.0 if t[0] < 0
   end
 
   # Returns an array of requests that are complete, including those
@@ -53,14 +53,14 @@ module HTTP_Spew::ClassMethods
   # If +need+ is fullfilled, it closes all incomplete requests.
   def wait_mt(need, requests, timeout)
     ready, failed = [], []
-    r, w = Kgio::Pipe.new
+    r, w = IO.pipe
     active = []
     t = [ timeout ]
     requests.each_with_index do |req, i|
       active << Thread.new do
         begin
           rv = req.run(timeout)
-          w.write([ i ].pack("v"))
+          w.write([ i ].pack("v".freeze))
           rv
         rescue => err
           err
@@ -68,8 +68,8 @@ module HTTP_Spew::ClassMethods
       end
     end
     begin
-      with_timeout(t) { r.kgio_wait_readable(t[0]) }
-      req_idx = r.read(2).unpack("v")[0]
+      with_timeout(t) { r.wait_readable(t[0]) }
+      req_idx = r.read(2).unpack("v".freeze)[0]
       thr = active[req_idx]
       with_timeout(t) { thr.join(t[0]) }
       rv = thr.value
@@ -81,9 +81,9 @@ module HTTP_Spew::ClassMethods
     pending = requests - ready
     error = HTTP_Spew::TimeoutError.new("request timed out")
     ready.concat(error_all(pending, error))
-    ensure
-      w.close
-      r.close
+  ensure
+    w.close
+    r.close
   end
 
   def wait(need, requests, timeout)
@@ -110,7 +110,7 @@ module HTTP_Spew::ClassMethods
       break if pollset.empty?
 
       busy = pollset.keys
-      rv = with_timeout(t) { Kgio.poll(pollset, (t[0] * 1000).to_i) } or break
+      rv = with_timeout(t) { do_poll(pollset, t[0]) } or break
     end while t[0] > 0.0 && requests = rv.keys.concat(busy).uniq!
 
     ready.concat(failed)
@@ -121,4 +121,32 @@ module HTTP_Spew::ClassMethods
     end
     ready
   end
+
+  begin
+    require 'kgio'
+    def do_poll(pollset, sec) # :nodoc:
+      Kgio.poll(pollset, (sec * 1000).to_i)
+    end
+  rescue LoadError
+    # emulate Kgio.poll with IO.select
+    def do_poll(pollset, sec) # :nodoc:
+      rd = []
+      wr = []
+      pollset.each do |io, events|
+        case events
+        when :wait_readable
+          rd << io
+        when :wait_writable
+          wr << io
+        else
+          raise "BUG: unsupported event #{event.inspect} for #{io.inspect}"
+        end
+      end
+      ready = IO.select(rd, wr, nil, sec) or return
+      pollset.clear
+      ready[0].each { |io| pollset[io] = 1 } # POLLIN
+      ready[1].each { |io| pollset[io] = 4 } # POLLOUT
+      pollset
+    end
+  end
 end

data/lib/http_spew/content_md5.rb

@@ -7,17 +7,16 @@ class HTTP_Spew::ContentMD5
   attr_reader :content_md5
   attr_reader :bytes_digested
 
-  CRLF = "\r\n" # :nodoc:
-
   def initialize(env, input = env["rack.input"])
     if trailer = env["HTTP_TRAILER"]
       unless trailer.split(/\s*,\s*/).grep(/\AContent-MD5\z/i)[0]
-        trailer << (trailer.empty? ? "Content-MD5" : ",Content-MD5")
+        trailer << (trailer.empty? ? "Content-MD5".freeze
+                                   : ",Content-MD5".freeze)
       end
     else
-      env["HTTP_TRAILER"] = "Content-MD5"
+      env["HTTP_TRAILER"] = "Content-MD5".freeze
     end
-    env["HTTP_TRANSFER_ENCODING"] = "chunked"
+    env["HTTP_TRANSFER_ENCODING"] = "chunked".freeze
     @to_io, wr = HTTP_Spew::ChunkyPipe.new
     expect_md5 = env.delete("HTTP_CONTENT_MD5")
     expect_len = env.delete("CONTENT_LENGTH")
@@ -41,8 +40,9 @@ class HTTP_Spew::ContentMD5
             @bytes_digested += n
             wr.write("#{n.to_s(16)}\r\n")
             digest.update(buf)
-            wr.write(buf << CRLF)
+            wr.write(buf << "\r\n".freeze)
           end while input.read(0x4000, buf)
+          buf.clear
         end
         if expect_len && expect_len.to_i != @bytes_digested
           raise HTTP_Spew::LengthError,

data/lib/http_spew/headers.rb

@@ -1,18 +1,10 @@
 # -*- encoding: binary -*-
 module HTTP_Spew::Headers
-  # :stopdoc:
-  REQUEST_METHOD = "REQUEST_METHOD"
-  REQUEST_URI = "REQUEST_URI"
-  CRLF = "\r\n"
-  QUERY_STRING = "QUERY_STRING"
-  PATH_INFO = "PATH_INFO"
-  CONTENT_TYPE = "CONTENT_TYPE" # specified by Rack to be !/^HTTP_/
-  # :startdoc:
 
   # regenerates the request_uri from a Rack +env+
   def request_uri(env)
-    qs = env[QUERY_STRING]
-    qs.size == 0 ? env[PATH_INFO] : "#{env[PATH_INFO]}?#{qs}"
+    qs = env['QUERY_STRING']
+    qs.size == 0 ? env['PATH_INFO'] : "#{env['PATH_INFO']}?#{qs}"
   end
   module_function :request_uri
 
@@ -27,26 +19,25 @@ module HTTP_Spew::Headers
   #
   #   buf, input = env_to_headers(env, input)
   def env_to_headers(env, input)
-    req = "#{env[REQUEST_METHOD]} " \
-          "#{env[REQUEST_URI] || request_uri(env)} HTTP/1.1\r\n" \
+    req = "#{env['REQUEST_METHOD']} " \
+          "#{env['REQUEST_URI'] || request_uri(env)} HTTP/1.1\r\n" \
           "Connection: close\r\n"
-    uscore, dash = "_", "-"
     env.each do |key,value|
       %r{\AHTTP_(\w+)\z} =~ key or next
       key = $1
       %r{\A(?:VERSION|EXPECT|TRANSFER_ENCODING|CONNECTION|KEEP_ALIVE)\z}x =~
         key and next
 
-      key.tr!(uscore, dash)
+      key.tr!('_'.freeze, '-'.freeze)
       req << "#{key}: #{value}\r\n"
     end
     if input
       req << (input.respond_to?(:size) ?
              "Content-Length: #{input.size}\r\n" :
-             "Transfer-Encoding: chunked\r\n")
-      ct = env[CONTENT_TYPE] and req << "Content-Type: #{ct}\r\n"
+             "Transfer-Encoding: chunked\r\n".freeze)
+      ct = env['CONTENT_TYPE'] and req << "Content-Type: #{ct}\r\n"
     end
-    req << CRLF
+    req << "\r\n".freeze
     String === input ? (req << input) : [ req, input ]
   end
   module_function :env_to_headers

data/lib/http_spew/input_spray.rb

@@ -35,6 +35,7 @@ class HTTP_Spew::InputSpray
           @pipes.delete_if { |rd, wr| write_fail?(rd, wr, buf) }.empty? and
             raise HTTP_Spew::NoWritersError, "all writers have died", []
         end
+        buf.clear
       rescue => e
         @pipes.each { |rd, _| rd.error = e }
       ensure