summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/erb/escape/escape.c (renamed from ext/erb/erb.c)2
-rw-r--r--ext/erb/escape/extconf.rb2
-rw-r--r--ext/erb/extconf.rb2
-rw-r--r--lib/erb.gemspec2
-rw-r--r--lib/erb.rb2
5 files changed, 5 insertions, 5 deletions
diff --git a/ext/erb/erb.c b/ext/erb/escape/escape.c
index b72c295a81..d9dacadff3 100644
--- a/ext/erb/erb.c
+++ b/ext/erb/escape/escape.c
@@ -84,7 +84,7 @@ erb_escape_html(VALUE self, VALUE str)
}
void
-Init_erb(void)
+Init_escape(void)
{
rb_cERB = rb_define_class("ERB", rb_cObject);
rb_mUtil = rb_define_module_under(rb_cERB, "Util");
diff --git a/ext/erb/escape/extconf.rb b/ext/erb/escape/extconf.rb
new file mode 100644
index 0000000000..9dec05f2c6
--- /dev/null
+++ b/ext/erb/escape/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile 'erb/escape'
diff --git a/ext/erb/extconf.rb b/ext/erb/extconf.rb
deleted file mode 100644
index 00a7e92aea..0000000000
--- a/ext/erb/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile 'erb'
diff --git a/lib/erb.gemspec b/lib/erb.gemspec
index 419685c318..1973344339 100644
--- a/lib/erb.gemspec
+++ b/lib/erb.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
spec.platform = 'java'
else
spec.required_ruby_version = '>= 2.7.0'
- spec.extensions = ['ext/erb/extconf.rb']
+ spec.extensions = ['ext/erb/escape/extconf.rb']
end
spec.add_dependency 'cgi', '>= 0.3.3'
diff --git a/lib/erb.rb b/lib/erb.rb
index 48dcca71aa..e7cb160ee3 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -1000,7 +1000,7 @@ class ERB
#
begin
# ERB::Util.html_escape
- require 'erb.so'
+ require 'erb/escape'
rescue LoadError
def html_escape(s)
CGI.escapeHTML(s.to_s)