Author: bago
Date: Mon Sep 25 07:23:45 2006
New Revision: 449688
URL: http://svn.apache.org/viewvc?view=rev&rev=449688
Log:
Fix for 2 failing tests:
1) SPF open group changed his mind about the MX limit
2) The trim we did on the returned SPF was trimming a null in the spf record
and we were not failing: now we don't trim it and correctly fail to parse it!
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java?view=diff&rev=449688&r1=449687&r2=449688
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java Mon Sep 25
07:23:45 2006
@@ -339,7 +339,8 @@
Iterator all = spfR.iterator();
while (all.hasNext()) {
- String compare = all.next().toString().trim();
+ // DO NOT trim the result!
+ String compare = all.next().toString();
// TODO is this correct? we remove the first and last char
if the
// result has an initial "
@@ -349,7 +350,8 @@
compare.length() - 1);
}
- if (compare.startsWith(spfVersion + " ") ||
compare.equals(spfVersion)) {
+ // We trim the compare value only for the comparison
+ if (compare.trim().startsWith(spfVersion + " ") ||
compare.trim().equals(spfVersion)) {
if (returnValue == null) {
returnValue = compare;
} else {
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java?view=diff&rev=449688&r1=449687&r2=449688
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java
(original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java
Mon Sep 25 07:23:45 2006
@@ -90,11 +90,6 @@
return null;
}
- // check if the maximum lookup count is reached
- if (dnsProbe.getRecordLimit() > 0 && records.size() >
dnsProbe.getRecordLimit()) {
- throw new PermErrorException("Maximum MX lookup count
reached");
- }
-
for (int i = 0; i < records.size(); i++) {
String mx = (String) records.get(i);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
