Skip to content

Commit c2693aa

Browse files
committed
Only load what is required from cgi
In Ruby 3.5, most of the cgi gem is removed. Only methods relating to escaping/unescaping are retained. On versions before Ruby 3.5, `cgi/util` must be required for correct functionality. https://bugs.ruby-lang.org/issues/21258
1 parent e6c160e commit c2693aa

File tree

11 files changed

+22
-11
lines changed

11 files changed

+22
-11
lines changed

build_tools/custom_service.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# frozen_string_literal: true
22

33
require 'json'
4-
require 'cgi'
4+
require "cgi/escape"
5+
require "cgi/util" if RUBY_VERSION < "3.5"
56

67
module BuildTools
78
class CustomService

gems/aws-sdk-core/lib/aws-sdk-core/endpoints/matchers.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# frozen_string_literal: true
22

3-
require 'cgi'
3+
require "cgi/escape"
4+
require "cgi/util" if RUBY_VERSION < "3.5"
45

56
module Aws
67
module Endpoints

gems/aws-sdk-core/lib/aws-sdk-core/util.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# frozen_string_literal: true
22

3-
require 'cgi'
3+
require "cgi/escape"
4+
require "cgi/util" if RUBY_VERSION < "3.5"
45

56
module Aws
67
# @api private

gems/aws-sdk-core/lib/aws-sdk-core/xml/error_handler.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# frozen_string_literal: true
22

3-
require 'cgi'
3+
require "cgi/escape"
4+
require "cgi/util" if RUBY_VERSION < "3.5"
45

56
module Aws
67
module Xml

gems/aws-sdk-core/lib/seahorse/client/net_http/connection_pool.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# frozen_string_literal: true
22

3-
require 'cgi'
3+
require "cgi/escape"
4+
require "cgi/util" if RUBY_VERSION < "3.5"
45
require 'net/http'
56
require 'net/https'
67
require 'delegate'

gems/aws-sdk-core/lib/seahorse/util.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# frozen_string_literal: true
22

3-
require 'cgi'
3+
require "cgi/escape"
4+
require "cgi/util" if RUBY_VERSION < "3.5"
45

56
module Seahorse
67
# @api private

gems/aws-sdk-s3/lib/aws-sdk-s3/legacy_signer.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
require 'set'
44
require 'time'
55
require 'openssl'
6-
require 'cgi'
6+
require "cgi/escape"
7+
require "cgi/util" if RUBY_VERSION < "3.5"
78
require 'aws-sdk-core/query'
89

910
module Aws

gems/aws-sdk-s3/lib/aws-sdk-s3/object_multipart_copier.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# frozen_string_literal: true
22

33
require 'thread'
4-
require 'cgi'
4+
require "cgi/escape"
5+
require "cgi/util" if RUBY_VERSION < "3.5"
56

67
module Aws
78
module S3

gems/aws-sdk-s3/lib/aws-sdk-s3/plugins/url_encoded_keys.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# frozen_string_literal: true
22

33
require 'uri'
4-
require 'cgi'
4+
require "cgi/escape"
5+
require "cgi/util" if RUBY_VERSION < "3.5"
56

67
module Aws
78
module S3

gems/aws-sigv2/lib/aws-sigv2/signer.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
require 'openssl'
44
require 'base64'
55
require 'uri'
6-
require 'cgi'
6+
require "cgi/escape"
7+
require "cgi/util" if RUBY_VERSION < "3.5"
78

89
module Aws
910
module Sigv2

gems/aws-sigv4/lib/aws-sigv4/signer.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
require 'time'
66
require 'uri'
77
require 'set'
8-
require 'cgi'
8+
require "cgi/escape"
9+
require "cgi/util" if RUBY_VERSION < "3.5"
910
require 'pathname'
1011
require 'aws-eventstream'
1112

0 commit comments

Comments
 (0)