FIXED bug #771051: if not validating config file, don't look for DTD

diff --git a/HISTORY b/HISTORY
index 7ed45d3..b38ac1d 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,6 @@
-$Id: HISTORY,v 1.18 2003/07/15 10:34:22 maxcooper Exp $
-$Revision: 1.18 $
-$Date: 2003/07/15 10:34:22 $
+$Id: HISTORY,v 1.19 2003/10/25 08:12:20 maxcooper Exp $
+$Revision: 1.19 $
+$Date: 2003/10/25 08:12:20 $
 
 
 Security Filter v@PROJECT.VERSION@
@@ -12,6 +12,11 @@ This document describes the history of the Security Filter project by lising the
 changes made for each release.
 
 
+Changes since last release:
+===========================
+* SecurityFilter no longer looks for the DTD if validation of the config file is disabled.
+
+
 Release 1.1-b1, 2003-Jul-15
 ===========================
 * Added support for BASIC authentication scheme.

diff --git a/src/share/org/securityfilter/config/SecurityConfig.java b/src/share/org/securityfilter/config/SecurityConfig.java
index dcfb88f..ea9dfe0 100644 (file)
--- a/src/share/org/securityfilter/config/SecurityConfig.java
+++ b/src/share/org/securityfilter/config/SecurityConfig.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/config/SecurityConfig.java,v 1.10 2003/07/14 18:53:46 maxcooper Exp $
- * $Revision: 1.10 $
- * $Date: 2003/07/14 18:53:46 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/config/SecurityConfig.java,v 1.11 2003/10/25 08:09:39 maxcooper Exp $
+ * $Revision: 1.11 $
+ * $Date: 2003/10/25 08:09:39 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -73,7 +73,7 @@ import java.util.List;
  * @author Torgeir Veimo (torgeir@pobox.com)
  * @author Max Cooper (max@maxcooper.com)
  * @author Daya Sharma (iamdaya@yahoo.com, billydaya@sbcglobal.net)
- * @version $Revision: 1.10 $ $Date: 2003/07/14 18:53:46 $
+ * @version $Revision: 1.11 $ $Date: 2003/10/25 08:09:39 $
  */
 public class SecurityConfig {
 
@@ -248,7 +248,10 @@ public class SecurityConfig {
 
       Digester digester = new Digester();
 
-      registerLocalDTDs(digester);
+      // only register the DTDs if we will be validating
+      if (validating) {
+         registerLocalDTDs(digester);
+      }
 
       digester.push(this);
       digester.setValidating(validating);