String: set default re subprocess timeout to 0.1, since that should be quite enough.

Conflicts:

	plugins/String/config.py
This commit is contained in:
Daniel Folkinshteyn 2011-08-12 16:38:36 -04:00 committed by Valentin Lorentz
parent e11dc28025
commit 0e3002d1f8
2 changed files with 8 additions and 1 deletions

View File

@ -53,4 +53,11 @@ conf.registerGlobalValue(String.levenshtein, 'max',
this variable, to limit the size of arguments passed to the levenshtein this variable, to limit the size of arguments passed to the levenshtein
command."""))) command.""")))
conf.registerGroup(String, 're')
conf.registerGlobalValue(String.re, 'timeout',
registry.PositiveFloat(0.1, """Determines the maximum time, in seconds, that
a regular expression is given to execute before being terminated. Since
there is a possibility that user input for the re command can cause it to
eat up large amounts of ram or cpu time, it's a good idea to keep this
low. Most normal regexps should not take very long at all."""))
# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:

View File

@ -1,3 +1,3 @@
"""stick the various versioning attributes in here, so we only have to change """stick the various versioning attributes in here, so we only have to change
them once.""" them once."""
version = '0.83.4.1+limnoria (2011-08-13T01:56:21+0200)' version = '0.83.4.1+limnoria (2011-08-13T01:57:03+0200)'