Skip to content

Commit 566b9d6

Browse files
committed
Update 1.8.7 rexml to latest.
1 parent 57ecaf6 commit 566b9d6

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

lib/ruby/1.8/rexml/document.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,16 +213,18 @@ def Document::entity_expansion_limit
213213
return @@entity_expansion_limit
214214
end
215215

216-
@@entity_expansion_text_limit = 10_240
217-
218216
# Set the entity expansion limit. By default the limit is set to 10240.
217+
#
218+
# Deprecated. Use REXML.entity_expansion_text_limit= instead.
219219
def Document::entity_expansion_text_limit=( val )
220-
@@entity_expansion_text_limit = val
220+
REXML.entity_expansion_text_limit = val
221221
end
222222

223223
# Get the entity expansion limit. By default the limit is set to 10000.
224+
#
225+
# Deprecated. Use REXML.entity_expansion_text_limit instead.
224226
def Document::entity_expansion_text_limit
225-
return @@entity_expansion_text_limit
227+
return REXML.entity_expansion_text_limit
226228
end
227229

228230
attr_reader :entity_expansion_count

lib/ruby/1.8/rexml/rexml.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,16 @@ module REXML
2929

3030
Copyright = COPYRIGHT
3131
Version = VERSION
32+
33+
@@entity_expansion_text_limit = 10_240
34+
35+
# Set the entity expansion limit. By default the limit is set to 10240.
36+
def self.entity_expansion_text_limit=( val )
37+
@@entity_expansion_text_limit = val
38+
end
39+
40+
# Get the entity expansion limit. By default the limit is set to 10240.
41+
def self.entity_expansion_text_limit
42+
return @@entity_expansion_text_limit
43+
end
3244
end

lib/ruby/1.8/rexml/text.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
require 'rexml/rexml'
12
require 'rexml/entity'
23
require 'rexml/doctype'
34
require 'rexml/child'
@@ -311,7 +312,7 @@ def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil )
311312
sum = 0
312313
string.gsub( /\r\n?/, "\n" ).gsub( REFERENCE ) {
313314
s = Text.expand($&, doctype, filter)
314-
if sum + s.bytesize > Document.entity_expansion_text_limit
315+
if sum + s.bytesize > REXML.entity_expansion_text_limit
315316
raise "entity expansion has grown too large"
316317
else
317318
sum += s.bytesize
@@ -338,6 +339,5 @@ def Text.expand(ref, doctype, filter)
338339
entity_value ? entity_value.value : ref
339340
end
340341
end
341-
342342
end
343343
end

0 commit comments

Comments
 (0)