copyright updates for 2016

Using the 'update-copyright' script from gnulib[1]:

  git ls-files | UPDATE_COPYRIGHT_HOLDER='all contributors' \
      UPDATE_COPYRIGHT_USE_INTERVALS=2 \
      xargs /path/to/gnulib/build-aux/update-copyright

We're also switching to 'GPL-3.0+' as recommended by SPDX
to be consistent with our gemspec and other metadata
(as opposed to the longer but equivalent "GPLv3 or later").

[1] git://git.savannah.gnu.org/gnulib.git

30 files changed, 60 insertions, 60 deletions

diff --git a/test/covshow.rb b/test/covshow.rb
index 63f37ee..1ad4e7d 100644
--- a/test/covshow.rb
+++ b/test/covshow.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 #
 # this works with the __covmerge method in test/helper.rb
diff --git a/test/helper.rb b/test/helper.rb
index 445a0e6..8f70ddc 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 $stdout.sync = $stderr.sync = Thread.abort_on_exception = true
 $-w = true if RUBY_VERSION.to_f >= 2.0
diff --git a/test/server_helper.rb b/test/server_helper.rb
index 16a3ae3..cb11e79 100644
--- a/test/server_helper.rb
+++ b/test/server_helper.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'helper'
 require 'timeout'
diff --git a/test/test_bin.rb b/test/test_bin.rb
index 20031b3..eeaf126 100644
--- a/test/test_bin.rb
+++ b/test/test_bin.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 class TestBin < Testcase
diff --git a/test/test_buffer_tmpdir.rb b/test/test_buffer_tmpdir.rb
index 0c5fa5f..6b15f9a 100644
--- a/test/test_buffer_tmpdir.rb
+++ b/test/test_buffer_tmpdir.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 require 'sleepy_penguin'
diff --git a/test/test_client_expire.rb b/test/test_client_expire.rb
index 9cc85c2..b2f932b 100644
--- a/test/test_client_expire.rb
+++ b/test/test_client_expire.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 
diff --git a/test/test_client_max_body_size.rb b/test/test_client_max_body_size.rb
index 9ea91ad..19c152e 100644
--- a/test/test_client_max_body_size.rb
+++ b/test/test_client_max_body_size.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 
diff --git a/test/test_config.rb b/test/test_config.rb
index 088a253..022f128 100644
--- a/test/test_config.rb
+++ b/test/test_config.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'helper'
 require 'rack/lobster'
diff --git a/test/test_expect_100.rb b/test/test_expect_100.rb
index f34c29e..d126dea 100644
--- a/test/test_expect_100.rb
+++ b/test/test_expect_100.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 
diff --git a/test/test_extras_autoindex.rb b/test/test_extras_autoindex.rb
index 998b280..30d454c 100644
--- a/test/test_extras_autoindex.rb
+++ b/test/test_extras_autoindex.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 require 'zlib'
diff --git a/test/test_extras_exec_cgi.rb b/test/test_extras_exec_cgi.rb
index 5b2f2ff..f9b96d9 100644
--- a/test/test_extras_exec_cgi.rb
+++ b/test/test_extras_exec_cgi.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 
diff --git a/test/test_extras_exec_cgi.sh b/test/test_extras_exec_cgi.sh
index 0a6c521..ce9c372 100755
--- a/test/test_extras_exec_cgi.sh
+++ b/test/test_extras_exec_cgi.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 
 # test CGI program, this remains portable POSIX shell (not bash)
 set -e
diff --git a/test/test_extras_proxy_pass.rb b/test/test_extras_proxy_pass.rb
index cda302a..45eb7bb 100644
--- a/test/test_extras_proxy_pass.rb
+++ b/test/test_extras_proxy_pass.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 begin
diff --git a/test/test_extras_try_gzip_static.rb b/test/test_extras_try_gzip_static.rb
index 7051d68..4a73764 100644
--- a/test/test_extras_try_gzip_static.rb
+++ b/test/test_extras_try_gzip_static.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 require 'zlib'
diff --git a/test/test_fdmap.rb b/test/test_fdmap.rb
index 05eac07..33830ba 100644
--- a/test/test_fdmap.rb
+++ b/test/test_fdmap.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'helper'
 
diff --git a/test/test_input.rb b/test/test_input.rb
index 802e099..b0f292e 100644
--- a/test/test_input.rb
+++ b/test/test_input.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 require 'digest/md5'
diff --git a/test/test_mt_accept.rb b/test/test_mt_accept.rb
index 9f28078..aa2867f 100644
--- a/test/test_mt_accept.rb
+++ b/test/test_mt_accept.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 require 'rack/lobster'
diff --git a/test/test_output_buffering.rb b/test/test_output_buffering.rb
index 8134b53..da93b87 100644
--- a/test/test_output_buffering.rb
+++ b/test/test_output_buffering.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 require 'digest/md5'
diff --git a/test/test_proxy_pass.rb b/test/test_proxy_pass.rb
index 29c5a61..f6e0efd 100644
--- a/test/test_proxy_pass.rb
+++ b/test/test_proxy_pass.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 require 'json'
diff --git a/test/test_rack.rb b/test/test_rack.rb
index 82a5fb7..c4c8847 100644
--- a/test/test_rack.rb
+++ b/test/test_rack.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'helper'
 require 'rack/lobster'
diff --git a/test/test_rack_hijack.rb b/test/test_rack_hijack.rb
index 23858b8..671387e 100644
--- a/test/test_rack_hijack.rb
+++ b/test/test_rack_hijack.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 
diff --git a/test/test_reopen_logs.rb b/test/test_reopen_logs.rb
index e4e076b..2eb3e0d 100644
--- a/test/test_reopen_logs.rb
+++ b/test/test_reopen_logs.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 require 'rack/commonlogger'
diff --git a/test/test_response.rb b/test/test_response.rb
index a46c286..a71fd65 100644
--- a/test/test_response.rb
+++ b/test/test_response.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 
diff --git a/test/test_serve_static.rb b/test/test_serve_static.rb
index 98cf57b..12932d2 100644
--- a/test/test_serve_static.rb
+++ b/test/test_serve_static.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative 'server_helper'
 require 'rack/file'
 
diff --git a/test/test_server.rb b/test/test_server.rb
index a2c5ea2..65a6ea1 100644
--- a/test/test_server.rb
+++ b/test/test_server.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 
diff --git a/test/test_ssl.rb b/test/test_ssl.rb
index 1379e93..a8e3bea 100644
--- a/test/test_ssl.rb
+++ b/test/test_ssl.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2014,  all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 require 'openssl'
diff --git a/test/test_stream_file.rb b/test/test_stream_file.rb
index 4219836..e797d8e 100644
--- a/test/test_stream_file.rb
+++ b/test/test_stream_file.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'helper'
 require 'timeout'
diff --git a/test/test_tmpio.rb b/test/test_tmpio.rb
index 5e49cce..7d25d3f 100644
--- a/test/test_tmpio.rb
+++ b/test/test_tmpio.rb
@@ -1,6 +1,6 @@
 # -*- encoding: binary -*-
-# Copyright (C) 2009-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-2.0.txt)
+# Copyright (C) 2009-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-2.0.txt)
 # frozen_string_literal: true
 require_relative 'helper'
 
diff --git a/test/test_unix_socket.rb b/test/test_unix_socket.rb
index 3bda4df..3911619 100644
--- a/test/test_unix_socket.rb
+++ b/test/test_unix_socket.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'server_helper'
 
diff --git a/test/test_wbuf.rb b/test/test_wbuf.rb
index 4905eff..1c8c0d0 100644
--- a/test/test_wbuf.rb
+++ b/test/test_wbuf.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 require_relative 'helper'
 require 'timeout'