You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2005/12/06 21:05:42 UTC
svn commit: r354530 -
/spamassassin/trunk/lib/Mail/SpamAssassin/PluginHandler.pm
Author: felicity
Date: Tue Dec 6 12:05:40 2005
New Revision: 354530
URL: http://svn.apache.org/viewcvs?rev=354530&view=rev
Log:
bug 4722: if we've already loaded a plugin via path specification, don't bother trying to load it again (causes warnings when functions get redefined)
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/PluginHandler.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PluginHandler.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/PluginHandler.pm?rev=354530&r1=354529&r2=354530&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PluginHandler.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PluginHandler.pm Tue Dec 6 12:05:40 2005
@@ -83,6 +83,12 @@
$path = Mail::SpamAssassin::Util::untaint_file_path(
File::Spec->rel2abs($path)
);
+
+ if (exists $INC{$path}) {
+ dbg("plugin: not loading $package from $path, already loaded");
+ return;
+ }
+
dbg("plugin: loading $package from $path");
$ret = do $path;
}