webrick 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 901e5eed67a1747d1b8359f3e22fedeede6c92d35cdc32166428e714d393a505
-  data.tar.gz: ce5277a103aa620bc0228209f4554ea3b9792ffe32b1bdcda24e0fdea8da9e85
+  metadata.gz: 0b22d1a22487ddaea4a02b95387d97d6860f856578442b3466dc1476313422ab
+  data.tar.gz: '08bc9dac03f0340f332bdb65415443c749365245340e59467c039f32f2410366'
 SHA512:
-  metadata.gz: 0411f18ca5d531964f58fc12d9961c74f14399fe2d0896537a8aae8cc95180c5927eba9c907a4aecaa89443ee1f409bac9574620de085ddfcb87ad4ed856a67e
-  data.tar.gz: 531502100d1c9a38f97987a187f39f245777ef607adcc0d78ee225591e84b90fd17827a506d354dcb4f702d18e5959c29b4326714c08855a7d9edd6b29402aaa
+  metadata.gz: 7a7c7286591c28174ce5921164fcea59130c4ff0031f01fd1abf4c89073b8774cb3d409328d8644dbd83cc29de2e4a8b25c9bd2866ba618f8f66530a100d830b
+  data.tar.gz: 313497330c512f587d9e8af3ce3a1936c64c55b58f694c3088db872ef9628ac44f4029277d5178cb1ffc43ea1d94bc68b98bb4884d78f667bd435cad36dfafa6

data/lib/webrick/accesslog.rb

@@ -149,11 +149,9 @@ module WEBrick
     # Escapes control characters in +data+
 
     def escape(data)
-      if data.tainted?
-        data.gsub(/[[:cntrl:]\\]+/) {$&.dump[1...-1]}.untaint
-      else
-        data
-      end
+      data = data.gsub(/[[:cntrl:]\\]+/) {$&.dump[1...-1]}
+      data.untaint if RUBY_VERSION < '2.7'
+      data
     end
   end
 end

data/lib/webrick/httprequest.rb

@@ -226,9 +226,9 @@ module WEBrick
         raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'."
       end
 
-      if /\Aclose\z/io =~ self["connection"]
+      if /close/io =~ self["connection"]
         @keep_alive = false
-      elsif /\Akeep-alive\z/io =~ self["connection"]
+      elsif /keep-alive/io =~ self["connection"]
         @keep_alive = true
       elsif @http_version < "1.1"
         @keep_alive = false
@@ -503,7 +503,7 @@ module WEBrick
       return unless socket
       if tc = self['transfer-encoding']
         case tc
-        when /\Achunked\z/io then read_chunked(socket, block)
+        when /chunked/io then read_chunked(socket, block)
         else raise HTTPStatus::NotImplemented, "Transfer-Encoding: #{tc}."
         end
       elsif self['content-length'] || @remaining_size
@@ -611,7 +611,12 @@ module WEBrick
       end
       if host_port = self["x-forwarded-host"]
         host_port = host_port.split(",", 2).first
-        @forwarded_host, tmp = host_port.split(":", 2)
+        if host_port =~ /\A(\[[0-9a-fA-F:]+\])(?::(\d+))?\z/
+          @forwarded_host = $1
+          tmp = $2
+        else
+          @forwarded_host, tmp = host_port.split(":", 2)
+        end
         @forwarded_port = (tmp || (@forwarded_proto == "https" ? 443 : 80)).to_i
       end
       if addrs = self["x-forwarded-for"]

data/lib/webrick/httpresponse.rb

@@ -51,8 +51,21 @@ module WEBrick
     attr_accessor :reason_phrase
 
     ##
-    # Body may be a String or IO-like object that responds to #read and
-    # #readpartial.
+    # Body may be:
+    # * a String;
+    # * an IO-like object that responds to +#read+ and +#readpartial+;
+    # * a Proc-like object that responds to +#call+.
+    #
+    # In the latter case, either #chunked= should be set to +true+,
+    # or <code>header['content-length']</code> explicitly provided.
+    # Example:
+    #
+    #   server.mount_proc '/' do |req, res|
+    #     res.chunked = true
+    #     # or
+    #     # res.header['content-length'] = 10
+    #     res.body = proc { |out| out.write(Time.now.to_s) }
+    #   end
 
     attr_accessor :body
 
@@ -142,6 +155,7 @@ module WEBrick
     # Sets the response header +field+ to +value+
 
     def []=(field, value)
+      @chunked = value.to_s.downcase == 'chunked' if field.downcase == 'transfer-encoding'
       @header[field.downcase] = value.to_s
     end
 

data/lib/webrick/httpservlet/cgihandler.rb

@@ -28,6 +28,7 @@ module WEBrick
     class CGIHandler < AbstractServlet
       Ruby = RbConfig.ruby # :nodoc:
       CGIRunner = "\"#{Ruby}\" \"#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb\"" # :nodoc:
+      CGIRunnerArray = [Ruby, "#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb".freeze].freeze # :nodoc:
 
       ##
       # Creates a new CGI script servlet for the script at +name+
@@ -36,7 +37,12 @@ module WEBrick
         super(server, name)
         @script_filename = name
         @tempdir = server[:TempDir]
-        @cgicmd = "#{CGIRunner} #{server[:CGIInterpreter]}"
+        interpreter = server[:CGIInterpreter]
+        if interpreter.is_a?(Array)
+          @cgicmd = CGIRunnerArray + interpreter
+        else
+          @cgicmd = "#{CGIRunner} #{interpreter}"
+        end
       end
 
       # :stopdoc:

data/lib/webrick/httputils.rb

@@ -162,10 +162,7 @@ module WEBrick
         end
       }
       header.each{|key, values|
-        values.each{|value|
-          value.strip!
-          value.gsub!(/\s+/, " ")
-        }
+        values.each(&:strip!)
       }
       header
     end

data/lib/webrick/version.rb

@@ -14,5 +14,5 @@ module WEBrick
   ##
   # The WEBrick version
 
-  VERSION      = "1.5.1"
+  VERSION      = "1.6.0"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: webrick
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - TAKAHASHI Masayoshi
 - GOTOU YUUZOU
 - Eric Wong
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2019-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -29,8 +29,8 @@ dependencies:
 description: WEBrick is an HTTP server toolkit that can be configured as an HTTPS
   server, a proxy server, and a virtual-host server.
 email:
--
--
+- 
+- 
 - normal@ruby-lang.org
 executables: []
 extensions: []
@@ -85,7 +85,7 @@ metadata:
   bug_tracker_uri: https://bugs.ruby-lang.org/projects/ruby-trunk/issues
   homepage_uri: https://www.ruby-lang.org
   source_code_uri: https://git.ruby-lang.org/ruby.git/
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -100,8 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: HTTP server toolkit
 test_files: []