diff options
| author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-26 14:34:01 +0000 |
|---|---|---|
| committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-26 14:34:01 +0000 |
| commit | b972878978ec8fa860eab3af5ac466b6b85c628d (patch) | |
| tree | 65e4e4b809532aa951db8b421f423666b20748b2 /lib | |
| parent | ea2e083a1d67e31b8699aa849f0e1477e6ca4131 (diff) | |
* lib/rexml/document.rb: move entity_expansion_limit accessor to ...
* lib/rexml/rexml.rb: ... here for consistency.
* lib/rexml/document.rb (REXML::Document.entity_expansion_limit):
deprecated.
* lib/rexml/document.rb (REXML::Document.entity_expansion_limit=):
deprecated.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rexml/document.rb | 12 | ||||
| -rw-r--r-- | lib/rexml/rexml.rb | 12 |
2 files changed, 19 insertions, 5 deletions
diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb index 76679d1c16..1c67da8718 100644 --- a/lib/rexml/document.rb +++ b/lib/rexml/document.rb @@ -243,16 +243,18 @@ module REXML Parsers::StreamParser.new( source, listener ).parse end - @@entity_expansion_limit = 10_000 - # Set the entity expansion limit. By default the limit is set to 10000. + # + # Deprecated. Use REXML.entity_expansion_limit= instead. def Document::entity_expansion_limit=( val ) - @@entity_expansion_limit = val + REXML.entity_expansion_limit = val end # Get the entity expansion limit. By default the limit is set to 10000. + # + # Deprecated. Use REXML.entity_expansion_limit= instead. def Document::entity_expansion_limit - return @@entity_expansion_limit + return REXML.entity_expansion_limit end # Set the entity expansion limit. By default the limit is set to 10240. @@ -273,7 +275,7 @@ module REXML def record_entity_expansion @entity_expansion_count += 1 - if @entity_expansion_count > @@entity_expansion_limit + if @entity_expansion_count > REXML.entity_expansion_limit raise "number of entity expansions exceeded, processing aborted." end end diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb index bc59a30c64..472fadb7ee 100644 --- a/lib/rexml/rexml.rb +++ b/lib/rexml/rexml.rb @@ -29,6 +29,18 @@ module REXML Copyright = COPYRIGHT Version = VERSION + @@entity_expansion_limit = 10_000 + + # Set the entity expansion limit. By default the limit is set to 10000. + def self.entity_expansion_limit=( val ) + @@entity_expansion_limit = val + end + + # Get the entity expansion limit. By default the limit is set to 10000. + def self.entity_expansion_limit + return @@entity_expansion_limit + end + @@entity_expansion_text_limit = 10_240 # Set the entity expansion limit. By default the limit is set to 10240. |