Attachment #238329 for bug #267776

Lines 155-162 RUBY_PORTEPOCH= 1 Link Here

(-)b/Mk/bsd.ruby.mk (-2 / +2 lines)
155	#	155	#
156	# Ruby 3.2	156	# Ruby 3.2
157	#	157	#
158	RUBY_DISTVERSION= 3.2.0-preview2	158	RUBY_DISTVERSION= 3.2.0-preview3
159	RUBY_PORTREVISION= 1	159	RUBY_PORTREVISION= 0
160	RUBY_PORTEPOCH= 1	160	RUBY_PORTEPOCH= 1
161		161
162	# When adding a version, please keep the comment in	162	# When adding a version, please keep the comment in

Lines 1-3 Link Here

(-)b/lang/ruby32/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1662820136	1	TIMESTAMP = 1668437769
2	SHA256 (ruby/ruby-3.2.0-preview2.tar.xz) = 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430	2	SHA256 (ruby/ruby-3.2.0-preview3.tar.xz) = d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb
3	SIZE (ruby/ruby-3.2.0-preview2.tar.xz) = 14578112	3	SIZE (ruby/ruby-3.2.0-preview3.tar.xz) = 14799804




diff --git NEWS.md NEWS.md
index 95ab936534..69cabf7f8c 100644
--- NEWS.md
+++ NEWS.md
@@ -243,7 +243,7 @@ Note: We're only listing outstanding class updates.
     * RubyGems 3.4.0.dev
     * bigdecimal 3.1.2
     * bundler 2.4.0.dev
-    * cgi 0.3.3
+    * cgi 0.3.4
     * date 3.2.3
     * erb 3.0.0
     * error_highlight 0.5.1
diff --git lib/cgi.rb lib/cgi.rb
index 8d51cb24fe..a6d48f2c1a 100644
--- lib/cgi.rb
+++ lib/cgi.rb
@@ -288,7 +288,7 @@
 #
 
 class CGI
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end
 
 require 'cgi/core'
diff --git lib/cgi/cookie.rb lib/cgi/cookie.rb
index 6b0d89ca3b..4b11a6a9ba 100644
--- lib/cgi/cookie.rb
+++ lib/cgi/cookie.rb
@@ -40,6 +40,10 @@ class CGI
   class Cookie < Array
     @@accept_charset="UTF-8" unless defined?(@@accept_charset)
 
+    TOKEN_RE = %r"\A[[!-~]&&[^()<>@,;:\\\"/?=\[\]{}]]+\z"
+    PATH_VALUE_RE = %r"\A[[ -~]&&[^;]]*\z"
+    DOMAIN_VALUE_RE = %r"\A(?<label>[A-Za-z][-A-Za-z0-9]*[A-Za-z0-9])(?:\.\g<label>)*\z"
+
     # Create a new CGI::Cookie object.
     #
     # :call-seq:
@@ -72,8 +76,8 @@ def initialize(name = "", *value)
       @domain = nil
       @expires = nil
       if name.kind_of?(String)
-        @name = name
-        @path = (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
+        self.name = name
+        self.path = (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
         @secure = false
         @httponly = false
         return super(value)
@@ -84,11 +88,11 @@ def initialize(name = "", *value)
         raise ArgumentError, "`name' required"
       end
 
-      @name = options["name"]
+      self.name = options["name"]
       value = Array(options["value"])
       # simple support for IE
-      @path = options["path"] || (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
-      @domain = options["domain"]
+      self.path = options["path"] || (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
+      self.domain = options["domain"]
       @expires = options["expires"]
       @secure = options["secure"] == true
       @httponly = options["httponly"] == true
@@ -97,11 +101,35 @@ def initialize(name = "", *value)
     end
 
     # Name of this cookie, as a +String+
-    attr_accessor :name
+    attr_reader :name
+    # Set name of this cookie
+    def name=(str)
+      if str and !TOKEN_RE.match?(str)
+        raise ArgumentError, "invalid name: #{str.dump}"
+      end
+      @name = str
+    end
+
     # Path for which this cookie applies, as a +String+
-    attr_accessor :path
+    attr_reader :path
+    # Set path for which this cookie applies
+    def path=(str)
+      if str and !PATH_VALUE_RE.match?(str)
+        raise ArgumentError, "invalid path: #{str.dump}"
+      end
+      @path = str
+    end
+
     # Domain for which this cookie applies, as a +String+
-    attr_accessor :domain
+    attr_reader :domain
+    # Set domain for which this cookie applies
+    def domain=(str)
+      if str and ((str = str.b).bytesize > 255 or !DOMAIN_VALUE_RE.match?(str))
+        raise ArgumentError, "invalid domain: #{str.dump}"
+      end
+      @domain = str
+    end
+
     # Time at which this cookie expires, as a +Time+
     attr_accessor :expires
     # True if this cookie is secure; false otherwise
diff --git lib/cgi/core.rb lib/cgi/core.rb
index bec76e0749..62e606837a 100644
--- lib/cgi/core.rb
+++ lib/cgi/core.rb
@@ -188,17 +188,28 @@ def http_header(options='text/html')
   # Using #header with the HTML5 tag maker will create a <header> element.
   alias :header :http_header
 
+  def _no_crlf_check(str)
+    if str
+      str = str.to_s
+      raise "A HTTP status or header field must not include CR and LF" if str =~ /[\r\n]/
+      str
+    else
+      nil
+    end
+  end
+  private :_no_crlf_check
+
   def _header_for_string(content_type) #:nodoc:
     buf = ''.dup
     if nph?()
-      buf << "#{$CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'} 200 OK#{EOL}"
+      buf << "#{_no_crlf_check($CGI_ENV['SERVER_PROTOCOL']) || 'HTTP/1.0'} 200 OK#{EOL}"
       buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
-      buf << "Server: #{$CGI_ENV['SERVER_SOFTWARE']}#{EOL}"
+      buf << "Server: #{_no_crlf_check($CGI_ENV['SERVER_SOFTWARE'])}#{EOL}"
       buf << "Connection: close#{EOL}"
     end
-    buf << "Content-Type: #{content_type}#{EOL}"
+    buf << "Content-Type: #{_no_crlf_check(content_type)}#{EOL}"
     if @output_cookies
-      @output_cookies.each {|cookie| buf << "Set-Cookie: #{cookie}#{EOL}" }
+      @output_cookies.each {|cookie| buf << "Set-Cookie: #{_no_crlf_check(cookie)}#{EOL}" }
     end
     return buf
   end # _header_for_string
@@ -213,9 +224,9 @@ def _header_for_hash(options)  #:nodoc:
     ## NPH
     options.delete('nph') if defined?(MOD_RUBY)
     if options.delete('nph') || nph?()
-      protocol = $CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'
+      protocol = _no_crlf_check($CGI_ENV['SERVER_PROTOCOL']) || 'HTTP/1.0'
       status = options.delete('status')
-      status = HTTP_STATUS[status] || status || '200 OK'
+      status = HTTP_STATUS[status] || _no_crlf_check(status) || '200 OK'
       buf << "#{protocol} #{status}#{EOL}"
       buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
       options['server'] ||= $CGI_ENV['SERVER_SOFTWARE'] || ''
@@ -223,38 +234,38 @@ def _header_for_hash(options)  #:nodoc:
     end
     ## common headers
     status = options.delete('status')
-    buf << "Status: #{HTTP_STATUS[status] || status}#{EOL}" if status
+    buf << "Status: #{HTTP_STATUS[status] || _no_crlf_check(status)}#{EOL}" if status
     server = options.delete('server')
-    buf << "Server: #{server}#{EOL}" if server
+    buf << "Server: #{_no_crlf_check(server)}#{EOL}" if server
     connection = options.delete('connection')
-    buf << "Connection: #{connection}#{EOL}" if connection
+    buf << "Connection: #{_no_crlf_check(connection)}#{EOL}" if connection
     type = options.delete('type')
-    buf << "Content-Type: #{type}#{EOL}" #if type
+    buf << "Content-Type: #{_no_crlf_check(type)}#{EOL}" #if type
     length = options.delete('length')
-    buf << "Content-Length: #{length}#{EOL}" if length
+    buf << "Content-Length: #{_no_crlf_check(length)}#{EOL}" if length
     language = options.delete('language')
-    buf << "Content-Language: #{language}#{EOL}" if language
+    buf << "Content-Language: #{_no_crlf_check(language)}#{EOL}" if language
     expires = options.delete('expires')
     buf << "Expires: #{CGI.rfc1123_date(expires)}#{EOL}" if expires
     ## cookie
     if cookie = options.delete('cookie')
       case cookie
       when String, Cookie
-        buf << "Set-Cookie: #{cookie}#{EOL}"
+        buf << "Set-Cookie: #{_no_crlf_check(cookie)}#{EOL}"
       when Array
         arr = cookie
-        arr.each {|c| buf << "Set-Cookie: #{c}#{EOL}" }
+        arr.each {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
       when Hash
         hash = cookie
-        hash.each_value {|c| buf << "Set-Cookie: #{c}#{EOL}" }
+        hash.each_value {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
       end
     end
     if @output_cookies
-      @output_cookies.each {|c| buf << "Set-Cookie: #{c}#{EOL}" }
+      @output_cookies.each {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
     end
     ## other headers
     options.each do |key, value|
-      buf << "#{key}: #{value}#{EOL}"
+      buf << "#{_no_crlf_check(key)}: #{_no_crlf_check(value)}#{EOL}"
     end
     return buf
   end # _header_for_hash
diff --git test/cgi/test_cgi_cookie.rb test/cgi/test_cgi_cookie.rb
index 985cc0d7a1..2f09d0f9b2 100644
--- test/cgi/test_cgi_cookie.rb
+++ test/cgi/test_cgi_cookie.rb
@@ -118,6 +118,70 @@ def test_cgi_cookie_arrayinterface
   end
 
 
+  def test_cgi_cookie_domain_injection_into_name
+    name = "a=b; domain=example.com;"
+    path = "/"
+    domain = "example.jp"
+    assert_raise(ArgumentError) do
+      CGI::Cookie.new('name' => name,
+                      'value' => "value",
+                      'domain' => domain,
+                      'path' => path)
+    end
+  end
+
+
+  def test_cgi_cookie_newline_injection_into_name
+    name = "a=b;\r\nLocation: http://example.com#"
+    path = "/"
+    domain = "example.jp"
+    assert_raise(ArgumentError) do
+      CGI::Cookie.new('name' => name,
+                      'value' => "value",
+                      'domain' => domain,
+                      'path' => path)
+    end
+  end
+
+
+  def test_cgi_cookie_multibyte_injection_into_name
+    name = "a=b;\u3042"
+    path = "/"
+    domain = "example.jp"
+    assert_raise(ArgumentError) do
+      CGI::Cookie.new('name' => name,
+                      'value' => "value",
+                      'domain' => domain,
+                      'path' => path)
+    end
+  end
+
+
+  def test_cgi_cookie_injection_into_path
+    name = "name"
+    path = "/; samesite=none"
+    domain = "example.jp"
+    assert_raise(ArgumentError) do
+      CGI::Cookie.new('name' => name,
+                      'value' => "value",
+                      'domain' => domain,
+                      'path' => path)
+    end
+  end
+
+
+  def test_cgi_cookie_injection_into_domain
+    name = "name"
+    path = "/"
+    domain = "example.jp; samesite=none"
+    assert_raise(ArgumentError) do
+      CGI::Cookie.new('name' => name,
+                      'value' => "value",
+                      'domain' => domain,
+                      'path' => path)
+    end
+  end
+
 
   instance_methods.each do |method|
     private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
diff --git test/cgi/test_cgi_header.rb test/cgi/test_cgi_header.rb
index bab2d0348a..ec2f4deb72 100644
--- test/cgi/test_cgi_header.rb
+++ test/cgi/test_cgi_header.rb
@@ -176,6 +176,14 @@ def test_cgi_http_header_nph
   end
 
 
+  def test_cgi_http_header_crlf_injection
+    cgi = CGI.new
+    assert_raise(RuntimeError) { cgi.http_header("text/xhtml\r\nBOO") }
+    assert_raise(RuntimeError) { cgi.http_header("type" => "text/xhtml\r\nBOO") }
+    assert_raise(RuntimeError) { cgi.http_header("status" => "200 OK\r\nBOO") }
+    assert_raise(RuntimeError) { cgi.http_header("location" => "text/xhtml\r\nBOO") }
+  end
+
 
   instance_methods.each do |method|
     private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']




From 3fae53a343ebd7686bb20d8f4b6855f4d11019cd Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Mon, 14 Nov 2022 18:59:06 +0900
Subject: [PATCH] [Bug #19127] Fix revision.h dependency when no baseruby

Disconnect the dependency of revision.h on the timestamp file if no
baseruby is available
---
 common.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git common.mk common.mk
index a9a5d635d5..03e9c5f537 100644
--- common.mk
+++ common.mk
@@ -1226,10 +1226,12 @@ builtin_binary.inc: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/template/builtin_binary
 
 $(BUILTIN_RB_INCS): $(top_srcdir)/tool/mk_builtin_loader.rb
 
-$(srcdir)/revision.h: $(REVISION_H)
+$(srcdir)/revision.h$(no_baseruby:no=~disabled~): $(REVISION_H)
 
-$(REVISION_H):
+$(REVISION_H)$(no_baseruby:no=~disabled~):
 	$(Q) $(BASERUBY) $(tooldir)/file2lastrev.rb -q --revision.h --srcdir="$(srcdir)" --output=revision.h --timestamp=$@
+$(REVISION_H)$(yes_baseruby:yes=~disabled~):
+	$(Q) touch $@
 
 $(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y $(srcdir)/defs/id.def $(srcdir)/ext/ripper/depend
 	$(ECHO) generating $@
-- 
2.38.1





%%IF_DEFAULT%%bin/ruby
bin/ruby%%RUBY_SUFFIX%%
include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/rb_mjit_min_header-%%RUBY_VERSION%%.h
include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/ruby/config.h

%%RUBY_ARCHLIBDIR%%/enc/windows_1254.so
%%RUBY_ARCHLIBDIR%%/enc/windows_1257.so
%%RUBY_ARCHLIBDIR%%/enc/windows_31j.so
%%RUBY_ARCHLIBDIR%%/erb.so
%%RUBY_ARCHLIBDIR%%/etc.so
%%RUBY_ARCHLIBDIR%%/fcntl.so
%%RUBY_ARCHLIBDIR%%/fiddle.so

%%RUBY_LIBDIR%%/logger/period.rb
%%RUBY_LIBDIR%%/logger/severity.rb
%%RUBY_LIBDIR%%/logger/version.rb
%%RUBY_LIBDIR%%/mjit/c_32.rb
%%RUBY_LIBDIR%%/mjit/c_64.rb
%%RUBY_LIBDIR%%/mjit/c_pointer.rb
%%RUBY_LIBDIR%%/mjit/c_type.rb
%%RUBY_LIBDIR%%/mjit/compiler.rb
%%RUBY_LIBDIR%%/mjit/instruction.rb
%%RUBY_LIBDIR%%/mkmf.rb
%%RUBY_LIBDIR%%/monitor.rb
%%RUBY_LIBDIR%%/mutex_m.rb

%%RUBY_LIBDIR%%/rubygems/tsort/lib/tsort.rb
%%RUBY_LIBDIR%%/rubygems/uninstaller.rb
%%RUBY_LIBDIR%%/rubygems/unknown_command_spell_checker.rb
%%RUBY_LIBDIR%%/rubygems/update_suggestion.rb
%%RUBY_LIBDIR%%/rubygems/uri.rb
%%RUBY_LIBDIR%%/rubygems/uri_formatter.rb
%%RUBY_LIBDIR%%/rubygems/user_interaction.rb

%%DOCS%%%%RUBY_DOCDIR%%/dig_methods.rdoc
%%DOCS%%%%RUBY_DOCDIR%%/dtrace_probes.rdoc
%%DOCS%%%%RUBY_DOCDIR%%/encodings.rdoc
%%DOCS%%%%RUBY_DOCDIR%%/examples/files.rdoc
%%DOCS%%%%RUBY_DOCDIR%%/extension.ja.rdoc
%%DOCS%%%%RUBY_DOCDIR%%/extension.rdoc
%%DOCS%%%%RUBY_DOCDIR%%/fiber.md

%%DOCS%%%%RUBY_DOCDIR%%/optparse/ruby/true_class.rb
%%DOCS%%%%RUBY_DOCDIR%%/optparse/ruby/uri.rb
%%DOCS%%%%RUBY_DOCDIR%%/optparse/tutorial.rdoc
%%DOCS%%%%RUBY_DOCDIR%%/packed_data.rdoc
%%DOCS%%%%RUBY_DOCDIR%%/pty/README.expect.ja
%%DOCS%%%%RUBY_DOCDIR%%/pty/README.ja
%%DOCS%%%%RUBY_DOCDIR%%/ractor.md

%%RDOC%%%%RUBY_RIDIR%%/Binding/local_variables-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Binding/receiver-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Binding/source_location-i.ri
%%RDOC%%%%RUBY_RIDIR%%/C/CALL_DATA-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/IC-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/ID-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/IVC-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/NOT_COMPILED_STACK_SIZE-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/RB_BUILTIN-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/USE_LAZY_LOAD-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/USE_RVARGC-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/VALUE-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/VM_CALL_KW_SPLAT-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/VM_CALL_KW_SPLAT_bit-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/VM_CALL_TAILCALL-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/VM_CALL_TAILCALL_bit-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/VM_METHOD_TYPE_CFUNC-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/VM_METHOD_TYPE_ISEQ-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/_Bool-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/ccan_list_node-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/cdesc-C.ri
%%RDOC%%%%RUBY_RIDIR%%/C/compile_branch-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/compile_status-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/inlined_call_context-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/iseq_bits_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/iseq_catch_table-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/iseq_compile_data-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/iseq_inline_constant_cache-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/iseq_inline_constant_cache_entry-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/iseq_inline_iv_cache_entry-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/iseq_inline_storage_entry-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/iseq_insn_info-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/method_missing_reason-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/mjit_options-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_builtin_function-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_call_data-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_callable_method_entry_struct-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_callcache-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_callinfo-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_callinfo_kwarg-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_code_location_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_cref_struct-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_cref_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_event_flag_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_hook_list_struct-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_id_table-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_iseq_constant_body-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_iseq_location_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_iseq_param_keyword-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_iseq_struct-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_iseq_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_iseq_type-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_iv_index_tbl_entry-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_method_alias_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_method_attr_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_method_bmethod_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_method_cfunc_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_method_definition_struct-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_method_iseq_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_method_optimized_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_method_refined_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_method_type_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_mjit_compile_info-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_mjit_unit-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_scope_visibility_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_serial_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_snum_t-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/rb_thread_struct-c.ri
%%RDOC%%%%RUBY_RIDIR%%/C/vm_call_handler-c.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/cdesc-Cookie.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/domain%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/domain-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/expires-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/httponly%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/httponly-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/inspect-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/name%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/name-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/parse-c.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/path%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/path-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/secure%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/secure-i.ri

%%RDOC%%%%RUBY_RIDIR%%/CGI/Util/unescapeURIComponent-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Util/unescape_element-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/Util/unescape_html-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/_no_crlf_check-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/accept_charset%3d-c.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/accept_charset-c.ri
%%RDOC%%%%RUBY_RIDIR%%/CGI/accept_charset-i.ri

%%RDOC%%%%RUBY_RIDIR%%/CSV/writer_fields_converter-i.ri
%%RDOC%%%%RUBY_RIDIR%%/CSV/writer_options-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Class/allocate-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Class/attached_object-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Class/cdesc-Class.ri
%%RDOC%%%%RUBY_RIDIR%%/Class/inherited-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Class/json_creatable%3f-i.ri

%%RDOC%%%%RUBY_RIDIR%%/Coverage/setup-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Coverage/start-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Coverage/state-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Coverage/supported%3f-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Coverage/suspend-c.ri
%%RDOC%%%%RUBY_RIDIR%%/DRb/DRbArray/cdesc-DRbArray.ri
%%RDOC%%%%RUBY_RIDIR%%/DRb/DRbArray/new-c.ri

%%RDOC%%%%RUBY_RIDIR%%/DRb/to_obj-i.ri
%%RDOC%%%%RUBY_RIDIR%%/DRb/uri-c.ri
%%RDOC%%%%RUBY_RIDIR%%/DRb/uri-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/%3d%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/cdesc-Data.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/deconstruct-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/deconstruct_keys-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/define-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/eql%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/hash-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/inspect-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/members-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/members-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/to_h-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Data/to_s-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Date/%2b-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Date/%2d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Date/%3c%3c-i.ri

%%RDOC%%%%RUBY_RIDIR%%/Digest/cdesc-Digest.ri
%%RDOC%%%%RUBY_RIDIR%%/Digest/hexencode-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Dir/%5b%5d-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Dir/Tmpname/RANDOM/cdesc-RANDOM.ri
%%RDOC%%%%RUBY_RIDIR%%/Dir/Tmpname/RANDOM/next-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Dir/Tmpname/cdesc-Tmpname.ri
%%RDOC%%%%RUBY_RIDIR%%/Dir/cdesc-Dir.ri
%%RDOC%%%%RUBY_RIDIR%%/Dir/chdir-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Dir/children-c.ri

%%RDOC%%%%RUBY_RIDIR%%/Fcntl/cdesc-Fcntl.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Pool/cdesc-Pool.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Pool/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Scheduler/address_resolve-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Scheduler/block-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Scheduler/cdesc-Scheduler.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Scheduler/close-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Scheduler/fiber-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Scheduler/io_read-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Scheduler/io_wait-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Scheduler/io_write-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Scheduler/kernel_sleep-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Scheduler/process_wait-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Scheduler/timeout_after-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/Scheduler/unblock-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/alive%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/backtrace-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/backtrace_locations-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/blocking%3f-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/blocking%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/blocking-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/cdesc-Fiber.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/current-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiber/current_scheduler-c.ri

%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Closure/BlockCaller/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Closure/args-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Closure/cdesc-Closure.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Closure/create-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Closure/ctype-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Closure/free-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Closure/freed%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Closure/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Closure/to_i-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/CompositeHandler/%5b%5d-i.ri

%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Handle/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Handle/sym-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Handle/sym-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Handle/sym_defined%3f-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Handle/sym_defined%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Handle/to_i-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Handle/to_ptr-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Importer/%5b%5d-i.ri

%%RDOC%%%%RUBY_RIDIR%%/Fiddle/StructArray/cdesc-StructArray.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/StructArray/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/StructArray/to_ptr-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Types/cdesc-Types.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/Win32Types/cdesc-Win32Types.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/cdesc-Fiddle.ri
%%RDOC%%%%RUBY_RIDIR%%/Fiddle/dlopen-c.ri

%%RDOC%%%%RUBY_RIDIR%%/GC/stress%3d-c.ri
%%RDOC%%%%RUBY_RIDIR%%/GC/stress-c.ri
%%RDOC%%%%RUBY_RIDIR%%/GC/total_time-c.ri
%%RDOC%%%%RUBY_RIDIR%%/GC/using_rvargc%3f-c.ri
%%RDOC%%%%RUBY_RIDIR%%/GC/verify_compaction_references-c.ri
%%RDOC%%%%RUBY_RIDIR%%/GC/verify_internal_consistency-c.ri
%%RDOC%%%%RUBY_RIDIR%%/GC/verify_transient_heap_internal_consistency-c.ri

%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/hash-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/home-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/ipv4_fallback_enabled-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/last_update_check%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/last_update_check-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/load_api_keys-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/load_file-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/new-c.ri

%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/ssl_ca_cert-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/ssl_client_cert-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/ssl_verify_mode-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/state_file_name-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/state_file_writable%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/unset_api_key%21-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/update_sources-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/verbose-i.ri

%%RDOC%%%%RUBY_RIDIR%%/Gem/Platform/match_platforms%3f-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Platform/match_spec%3f-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Platform/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Platform/normalized_linux_version-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Platform/os-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Platform/sort_priority-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Platform/to_a-i.ri

%%RDOC%%%%RUBY_RIDIR%%/Gem/UnsatisfiableDependencyError/name-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/UnsatisfiableDependencyError/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/UnsatisfiableDependencyError/version-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/UpdateSuggestion/cdesc-UpdateSuggestion.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/UpdateSuggestion/ci%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/UpdateSuggestion/eglible_for_update%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/UpdateSuggestion/update_suggestion-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Uri/cdesc-Uri.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Uri/initialize_copy-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Uri/method_missing-i.ri

%%RDOC%%%%RUBY_RIDIR%%/Gem/sources%3d-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/sources-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/spec_cache_dir-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/state_file-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/state_home-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/suffix_pattern-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/suffix_regexp-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/suffixes-c.ri

%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/cdesc-Buffer.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/clear-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/copy-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/each-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/each_byte-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/empty%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/external%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/for-c.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/free-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/get_string-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/get_value-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/get_values-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/hexdump-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/initialize_copy-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/inspect-i.ri

%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/resize-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/set_string-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/set_value-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/set_values-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/shared%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/size-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/size_of-c.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/slice-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/to_s-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/transfer-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/valid%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/values-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/write-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/Buffer/xor%21-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/ConsoleMode/cdesc-ConsoleMode.ri

%%RDOC%%%%RUBY_RIDIR%%/IO/EINPROGRESSWaitWritable/cdesc-EINPROGRESSWaitWritable.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/EWOULDBLOCKWaitReadable/cdesc-EWOULDBLOCKWaitReadable.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/EWOULDBLOCKWaitWritable/cdesc-EWOULDBLOCKWaitWritable.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/TimeoutError/cdesc-TimeoutError.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/WaitReadable/cdesc-WaitReadable.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/WaitWritable/cdesc-WaitWritable.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/advise-i.ri

%%RDOC%%%%RUBY_RIDIR%%/IO/sysseek-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/syswrite-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/tell-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/timeout%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/timeout-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/to_i-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/to_io-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IO/try_convert-c.ri

%%RDOC%%%%RUBY_RIDIR%%/IRB/Abort/cdesc-Abort.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/CantChangeBinding/cdesc-CantChangeBinding.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/CantReturnToNormalMode/cdesc-CantReturnToNormalMode.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/CantShiftToMultiIrbMode/cdesc-CantShiftToMultiIrbMode.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Canvas/cdesc-Canvas.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Canvas/draw-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Canvas/line-i.ri

%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/back_trace_limit-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/cdesc-Context.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/change_workspace-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/command_aliases-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/echo%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/echo-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/echo_on_assignment%3f-i.ri

%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/save_history%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/save_history-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/set_last_value-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/symbol_alias-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/thread-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/use_autocomplete%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/use_autocomplete-i.ri

%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/use_multiline-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/use_readline%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/use_readline-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/use_reline%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/use_reline-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/use_singleline%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/use_singleline-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/Context/use_tracer%3d-i.ri

%%RDOC%%%%RUBY_RIDIR%%/IRB/ExtendCommandBundle/irb_exit-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ExtendCommandBundle/irb_load-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ExtendCommandBundle/irb_require-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ExtendCommandBundle/load_command-c.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/FileInputMethod/cdesc-FileInputMethod.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/FileInputMethod/close-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/FileInputMethod/encoding-i.ri

%%RDOC%%%%RUBY_RIDIR%%/IRB/ReadlineInputMethod/line-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ReadlineInputMethod/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ReadlineInputMethod/readable_after_eof%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ReidlineInputMethod/auto_indent-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ReidlineInputMethod/cdesc-ReidlineInputMethod.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ReidlineInputMethod/check_termination-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ReidlineInputMethod/dynamic_prompt-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ReidlineInputMethod/encoding-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ReidlineInputMethod/eof%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ReidlineInputMethod/gets-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ReidlineInputMethod/inspect-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ReidlineInputMethod/line-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/ReidlineInputMethod/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RelineInputMethod/auto_indent-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RelineInputMethod/cdesc-RelineInputMethod.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RelineInputMethod/check_termination-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RelineInputMethod/dynamic_prompt-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RelineInputMethod/encoding-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RelineInputMethod/eof%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RelineInputMethod/gets-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RelineInputMethod/inspect-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RelineInputMethod/line-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RelineInputMethod/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RelineInputMethod/readable_after_eof%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RubyModel/cdesc-RubyModel.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RubyModel/init_ruby_model-i.ri
%%RDOC%%%%RUBY_RIDIR%%/IRB/RubyModel/new-c.ri

%%RDOC%%%%RUBY_RIDIR%%/MatchData/byteoffset-i.ri
%%RDOC%%%%RUBY_RIDIR%%/MatchData/captures-i.ri
%%RDOC%%%%RUBY_RIDIR%%/MatchData/cdesc-MatchData.ri
%%RDOC%%%%RUBY_RIDIR%%/MatchData/deconstruct-i.ri
%%RDOC%%%%RUBY_RIDIR%%/MatchData/deconstruct_keys-i.ri
%%RDOC%%%%RUBY_RIDIR%%/MatchData/end-i.ri
%%RDOC%%%%RUBY_RIDIR%%/MatchData/eql%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/MatchData/hash-i.ri

%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/BN/mod_inverse-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/BN/mod_mul-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/BN/mod_sqr-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/BN/mod_sqrt-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/BN/mod_sub-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/BN/negative%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/BN/new-c.ri

%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLContext/flush_sessions-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLContext/freeze-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLContext/key-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLContext/keylog_cb-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLContext/max_version%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLContext/min_version%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLContext/new-c.ri

%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLSocket/connect-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLSocket/connect_nonblock-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLSocket/context-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLSocket/export_keying_material-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLSocket/finished_message-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLSocket/hostname%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/OpenSSL/SSL/SSLSocket/hostname-i.ri

%%RDOC%%%%RUBY_RIDIR%%/Psych/Nodes/cdesc-Nodes.ri
%%RDOC%%%%RUBY_RIDIR%%/Psych/Omap/cdesc-Omap.ri
%%RDOC%%%%RUBY_RIDIR%%/Psych/Parser/Mark/cdesc-Mark.ri
%%RDOC%%%%RUBY_RIDIR%%/Psych/Parser/_native_parse-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Psych/Parser/cdesc-Parser.ri
%%RDOC%%%%RUBY_RIDIR%%/Psych/Parser/external_encoding-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Psych/Parser/handler-i.ri

%%RDOC%%%%RUBY_RIDIR%%/RubyVM/AbstractSyntaxTree/Node/source-i.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/AbstractSyntaxTree/Node/type-i.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/AbstractSyntaxTree/cdesc-AbstractSyntaxTree.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/AbstractSyntaxTree/node_id_for_backtrace_location-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/AbstractSyntaxTree/of-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/AbstractSyntaxTree/parse-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/AbstractSyntaxTree/parse_file-c.ri

%%RDOC%%%%RUBY_RIDIR%%/RubyVM/MJIT/CType/Bool/cdesc-Bool.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/MJIT/CType/Bool/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/MJIT/CType/Immediate/cdesc-Immediate.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/MJIT/CType/Immediate/find-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/MJIT/CType/Immediate/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/MJIT/CType/Immediate/parse-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/MJIT/CType/Pointer/cdesc-Pointer.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/MJIT/CType/Pointer/new-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/MJIT/CType/Struct/cdesc-Struct.ri

%%RDOC%%%%RUBY_RIDIR%%/RubyVM/MJIT/Compiler/to_cstr-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/MJIT/Compiler/vm_cc_cme-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/MJIT/cdesc-MJIT.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/capacity-i.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/cdesc-Shape.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/depth-i.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/edge_name-i.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/edges-i.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/find_by_id-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/id-i.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/next_iv_index-i.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/next_shape_id-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/of-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/parent-i.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/parent_id-i.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/root_shape-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/size_pool_index-i.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/transition_tree-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/Shape/type-i.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/cdesc-RubyVM.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/each_builtin-c.ri
%%RDOC%%%%RUBY_RIDIR%%/RubyVM/keep_script_lines%3d-c.ri

%%RDOC%%%%RUBY_RIDIR%%/page-marshal_rdoc.ri
%%RDOC%%%%RUBY_RIDIR%%/page-memory_view_md.ri
%%RDOC%%%%RUBY_RIDIR%%/page-mjit_md.ri
%%RDOC%%%%RUBY_RIDIR%%/page-packed_data_rdoc.ri
%%RDOC%%%%RUBY_RIDIR%%/page-ractor_md.ri
%%RDOC%%%%RUBY_RIDIR%%/page-regexp_rdoc.ri
%%RDOC%%%%RUBY_RIDIR%%/page-security_rdoc.ri
- 

Return to bug 267776

Added Link Here

(-)b/lang/ruby32/files/patch-CVE-2021-33621 (+299 lines)
1	diff --git NEWS.md NEWS.md
2	index 95ab936534..69cabf7f8c 100644
3	--- NEWS.md
4	+++ NEWS.md
5	@@ -243,7 +243,7 @@ Note: We're only listing outstanding class updates.
6	* RubyGems 3.4.0.dev
7	* bigdecimal 3.1.2
8	* bundler 2.4.0.dev
9	- * cgi 0.3.3
10	+ * cgi 0.3.4
11	* date 3.2.3
12	* erb 3.0.0
13	* error_highlight 0.5.1
14	diff --git lib/cgi.rb lib/cgi.rb
15	index 8d51cb24fe..a6d48f2c1a 100644
16	--- lib/cgi.rb
17	+++ lib/cgi.rb
18	@@ -288,7 +288,7 @@
19	#
20
21	class CGI
22	- VERSION = "0.3.3"
23	+ VERSION = "0.3.4"
24	end
25
26	require 'cgi/core'
27	diff --git lib/cgi/cookie.rb lib/cgi/cookie.rb
28	index 6b0d89ca3b..4b11a6a9ba 100644
29	--- lib/cgi/cookie.rb
30	+++ lib/cgi/cookie.rb
31	@@ -40,6 +40,10 @@ class CGI
32	class Cookie < Array
33	@@accept_charset="UTF-8" unless defined?(@@accept_charset)
34
35	+ TOKEN_RE = %r"\A[[!-~]&&[^()<>@,;:\\\"/?=\[\]{}]]+\z"
36	+ PATH_VALUE_RE = %r"\A[[ -~]&&[^;]]*\z"
37	+ DOMAIN_VALUE_RE = %r"\A(?<label>[A-Za-z][-A-Za-z0-9][A-Za-z0-9])(?:\.\g<label>)\z"
38	+
39	# Create a new CGI::Cookie object.
40	#
41	# :call-seq:
42	@@ -72,8 +76,8 @@ def initialize(name = "", *value)
43	@domain = nil
44	@expires = nil
45	if name.kind_of?(String)
46	- @name = name
47	- @path = (%r\|\A(.*/)\| =~ ENV["SCRIPT_NAME"] ? $1 : "")
48	+ self.name = name
49	+ self.path = (%r\|\A(.*/)\| =~ ENV["SCRIPT_NAME"] ? $1 : "")
50	@secure = false
51	@httponly = false
52	return super(value)
53	@@ -84,11 +88,11 @@ def initialize(name = "", *value)
54	raise ArgumentError, "`name' required"
55	end
56
57	- @name = options["name"]
58	+ self.name = options["name"]
59	value = Array(options["value"])
60	# simple support for IE
61	- @path = options["path"] \|\| (%r\|\A(.*/)\| =~ ENV["SCRIPT_NAME"] ? $1 : "")
62	- @domain = options["domain"]
63	+ self.path = options["path"] \|\| (%r\|\A(.*/)\| =~ ENV["SCRIPT_NAME"] ? $1 : "")
64	+ self.domain = options["domain"]
65	@expires = options["expires"]
66	@secure = options["secure"] == true
67	@httponly = options["httponly"] == true
68	@@ -97,11 +101,35 @@ def initialize(name = "", *value)
69	end
70
71	# Name of this cookie, as a +String+
72	- attr_accessor :name
73	+ attr_reader :name
74	+ # Set name of this cookie
75	+ def name=(str)
76	+ if str and !TOKEN_RE.match?(str)
77	+ raise ArgumentError, "invalid name: #{str.dump}"
78	+ end
79	+ @name = str
80	+ end
81	+
82	# Path for which this cookie applies, as a +String+
83	- attr_accessor :path
84	+ attr_reader :path
85	+ # Set path for which this cookie applies
86	+ def path=(str)
87	+ if str and !PATH_VALUE_RE.match?(str)
88	+ raise ArgumentError, "invalid path: #{str.dump}"
89	+ end
90	+ @path = str
91	+ end
92	+
93	# Domain for which this cookie applies, as a +String+
94	- attr_accessor :domain
95	+ attr_reader :domain
96	+ # Set domain for which this cookie applies
97	+ def domain=(str)
98	+ if str and ((str = str.b).bytesize > 255 or !DOMAIN_VALUE_RE.match?(str))
99	+ raise ArgumentError, "invalid domain: #{str.dump}"
100	+ end
101	+ @domain = str
102	+ end
103	+
104	# Time at which this cookie expires, as a +Time+
105	attr_accessor :expires
106	# True if this cookie is secure; false otherwise
107	diff --git lib/cgi/core.rb lib/cgi/core.rb
108	index bec76e0749..62e606837a 100644
109	--- lib/cgi/core.rb
110	+++ lib/cgi/core.rb
111	@@ -188,17 +188,28 @@ def http_header(options='text/html')
112	# Using #header with the HTML5 tag maker will create a <header> element.
113	alias :header :http_header
114
115	+ def _no_crlf_check(str)
116	+ if str
117	+ str = str.to_s
118	+ raise "A HTTP status or header field must not include CR and LF" if str =~ /[\r\n]/
119	+ str
120	+ else
121	+ nil
122	+ end
123	+ end
124	+ private :_no_crlf_check
125	+
126	def _header_for_string(content_type) #:nodoc:
127	buf = ''.dup
128	if nph?()
129	- buf << "#{$CGI_ENV['SERVER_PROTOCOL'] \|\| 'HTTP/1.0'} 200 OK#{EOL}"
130	+ buf << "#{_no_crlf_check($CGI_ENV['SERVER_PROTOCOL']) \|\| 'HTTP/1.0'} 200 OK#{EOL}"
131	buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
132	- buf << "Server: #{$CGI_ENV['SERVER_SOFTWARE']}#{EOL}"
133	+ buf << "Server: #{_no_crlf_check($CGI_ENV['SERVER_SOFTWARE'])}#{EOL}"
134	buf << "Connection: close#{EOL}"
135	end
136	- buf << "Content-Type: #{content_type}#{EOL}"
137	+ buf << "Content-Type: #{_no_crlf_check(content_type)}#{EOL}"
138	if @output_cookies
139	- @output_cookies.each {\|cookie\| buf << "Set-Cookie: #{cookie}#{EOL}" }
140	+ @output_cookies.each {\|cookie\| buf << "Set-Cookie: #{_no_crlf_check(cookie)}#{EOL}" }
141	end
142	return buf
143	end # _header_for_string
144	@@ -213,9 +224,9 @@ def _header_for_hash(options) #:nodoc:
145	## NPH
146	options.delete('nph') if defined?(MOD_RUBY)
147	if options.delete('nph') \|\| nph?()
148	- protocol = $CGI_ENV['SERVER_PROTOCOL'] \|\| 'HTTP/1.0'
149	+ protocol = _no_crlf_check($CGI_ENV['SERVER_PROTOCOL']) \|\| 'HTTP/1.0'
150	status = options.delete('status')
151	- status = HTTP_STATUS[status] \|\| status \|\| '200 OK'
152	+ status = HTTP_STATUS[status] \|\| _no_crlf_check(status) \|\| '200 OK'
153	buf << "#{protocol} #{status}#{EOL}"
154	buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
155	options['server'] \|\|= $CGI_ENV['SERVER_SOFTWARE'] \|\| ''
156	@@ -223,38 +234,38 @@ def _header_for_hash(options) #:nodoc:
157	end
158	## common headers
159	status = options.delete('status')
160	- buf << "Status: #{HTTP_STATUS[status] \|\| status}#{EOL}" if status
161	+ buf << "Status: #{HTTP_STATUS[status] \|\| _no_crlf_check(status)}#{EOL}" if status
162	server = options.delete('server')
163	- buf << "Server: #{server}#{EOL}" if server
164	+ buf << "Server: #{_no_crlf_check(server)}#{EOL}" if server
165	connection = options.delete('connection')
166	- buf << "Connection: #{connection}#{EOL}" if connection
167	+ buf << "Connection: #{_no_crlf_check(connection)}#{EOL}" if connection
168	type = options.delete('type')
169	- buf << "Content-Type: #{type}#{EOL}" #if type
170	+ buf << "Content-Type: #{_no_crlf_check(type)}#{EOL}" #if type
171	length = options.delete('length')
172	- buf << "Content-Length: #{length}#{EOL}" if length
173	+ buf << "Content-Length: #{_no_crlf_check(length)}#{EOL}" if length
174	language = options.delete('language')
175	- buf << "Content-Language: #{language}#{EOL}" if language
176	+ buf << "Content-Language: #{_no_crlf_check(language)}#{EOL}" if language
177	expires = options.delete('expires')
178	buf << "Expires: #{CGI.rfc1123_date(expires)}#{EOL}" if expires
179	## cookie
180	if cookie = options.delete('cookie')
181	case cookie
182	when String, Cookie
183	- buf << "Set-Cookie: #{cookie}#{EOL}"
184	+ buf << "Set-Cookie: #{_no_crlf_check(cookie)}#{EOL}"
185	when Array
186	arr = cookie
187	- arr.each {\|c\| buf << "Set-Cookie: #{c}#{EOL}" }
188	+ arr.each {\|c\| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
189	when Hash
190	hash = cookie
191	- hash.each_value {\|c\| buf << "Set-Cookie: #{c}#{EOL}" }
192	+ hash.each_value {\|c\| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
193	end
194	end
195	if @output_cookies
196	- @output_cookies.each {\|c\| buf << "Set-Cookie: #{c}#{EOL}" }
197	+ @output_cookies.each {\|c\| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
198	end
199	## other headers
200	options.each do \|key, value\|
201	- buf << "#{key}: #{value}#{EOL}"
202	+ buf << "#{_no_crlf_check(key)}: #{_no_crlf_check(value)}#{EOL}"
203	end
204	return buf
205	end # _header_for_hash
206	diff --git test/cgi/test_cgi_cookie.rb test/cgi/test_cgi_cookie.rb
207	index 985cc0d7a1..2f09d0f9b2 100644
208	--- test/cgi/test_cgi_cookie.rb
209	+++ test/cgi/test_cgi_cookie.rb
210	@@ -118,6 +118,70 @@ def test_cgi_cookie_arrayinterface
211	end
212
213
214	+ def test_cgi_cookie_domain_injection_into_name
215	+ name = "a=b; domain=example.com;"
216	+ path = "/"
217	+ domain = "example.jp"
218	+ assert_raise(ArgumentError) do
219	+ CGI::Cookie.new('name' => name,
220	+ 'value' => "value",
221	+ 'domain' => domain,
222	+ 'path' => path)
223	+ end
224	+ end
225	+
226	+
227	+ def test_cgi_cookie_newline_injection_into_name
228	+ name = "a=b;\r\nLocation: http://example.com#"
229	+ path = "/"
230	+ domain = "example.jp"
231	+ assert_raise(ArgumentError) do
232	+ CGI::Cookie.new('name' => name,
233	+ 'value' => "value",
234	+ 'domain' => domain,
235	+ 'path' => path)
236	+ end
237	+ end
238	+
239	+
240	+ def test_cgi_cookie_multibyte_injection_into_name
241	+ name = "a=b;\u3042"
242	+ path = "/"
243	+ domain = "example.jp"
244	+ assert_raise(ArgumentError) do
245	+ CGI::Cookie.new('name' => name,
246	+ 'value' => "value",
247	+ 'domain' => domain,
248	+ 'path' => path)
249	+ end
250	+ end
251	+
252	+
253	+ def test_cgi_cookie_injection_into_path
254	+ name = "name"
255	+ path = "/; samesite=none"
256	+ domain = "example.jp"
257	+ assert_raise(ArgumentError) do
258	+ CGI::Cookie.new('name' => name,
259	+ 'value' => "value",
260	+ 'domain' => domain,
261	+ 'path' => path)
262	+ end
263	+ end
264	+
265	+
266	+ def test_cgi_cookie_injection_into_domain
267	+ name = "name"
268	+ path = "/"
269	+ domain = "example.jp; samesite=none"
270	+ assert_raise(ArgumentError) do
271	+ CGI::Cookie.new('name' => name,
272	+ 'value' => "value",
273	+ 'domain' => domain,
274	+ 'path' => path)
275	+ end
276	+ end
277	+
278
279	instance_methods.each do \|method\|
280	private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
281	diff --git test/cgi/test_cgi_header.rb test/cgi/test_cgi_header.rb
282	index bab2d0348a..ec2f4deb72 100644
283	--- test/cgi/test_cgi_header.rb
284	+++ test/cgi/test_cgi_header.rb
285	@@ -176,6 +176,14 @@ def test_cgi_http_header_nph
286	end
287
288
289	+ def test_cgi_http_header_crlf_injection
290	+ cgi = CGI.new
291	+ assert_raise(RuntimeError) { cgi.http_header("text/xhtml\r\nBOO") }
292	+ assert_raise(RuntimeError) { cgi.http_header("type" => "text/xhtml\r\nBOO") }
293	+ assert_raise(RuntimeError) { cgi.http_header("status" => "200 OK\r\nBOO") }
294	+ assert_raise(RuntimeError) { cgi.http_header("location" => "text/xhtml\r\nBOO") }
295	+ end
296	+
297
298	instance_methods.each do \|method\|
299	private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']

Added Link Here

(-)b/lang/ruby32/files/patch-common.mk (+33 lines)
1	From 3fae53a343ebd7686bb20d8f4b6855f4d11019cd Mon Sep 17 00:00:00 2001
2	From: Nobuyoshi Nakada <nobu@ruby-lang.org>
3	Date: Mon, 14 Nov 2022 18:59:06 +0900
4	Subject: [PATCH] [Bug #19127] Fix revision.h dependency when no baseruby
5
6	Disconnect the dependency of revision.h on the timestamp file if no
7	baseruby is available
8	---
9	common.mk \| 6 ++++--
10	1 file changed, 4 insertions(+), 2 deletions(-)
11
12	diff --git common.mk common.mk
13	index a9a5d635d5..03e9c5f537 100644
14	--- common.mk
15	+++ common.mk
16	@@ -1226,10 +1226,12 @@ builtin_binary.inc: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/template/builtin_binary
17
18	$(BUILTIN_RB_INCS): $(top_srcdir)/tool/mk_builtin_loader.rb
19
20	-$(srcdir)/revision.h: $(REVISION_H)
21	+$(srcdir)/revision.h$(no_baseruby:no=~disabled~): $(REVISION_H)
22
23	-$(REVISION_H):
24	+$(REVISION_H)$(no_baseruby:no=~disabled~):
25	$(Q) $(BASERUBY) $(tooldir)/file2lastrev.rb -q --revision.h --srcdir="$(srcdir)" --output=revision.h --timestamp=$@
26	+$(REVISION_H)$(yes_baseruby:yes=~disabled~):
27	+ $(Q) touch $@
28
29	$(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y $(srcdir)/defs/id.def $(srcdir)/ext/ripper/depend
30	$(ECHO) generating $@
31	--
32	2.38.1
33