Author: bago
Date: Thu Nov 29 04:15:50 2007
New Revision: 599406
URL: http://svn.apache.org/viewvc?rev=599406&view=rev
Log:
"exp=" have to result in PermError. Update the exp parsing string and our
mailzone-tests.yml to reflect this change in the specification (JSPF-56).
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java
james/jspf/trunk/src/test/resources/org/apache/james/jspf/mailzone-tests.yml
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java?rev=599406&r1=599405&r2=599406&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java
(original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java
Thu Nov 29 04:15:50 2007
@@ -86,9 +86,12 @@
* NOTE: the last +"?" has been added to support RFC4408 ERRATA for the
EXP modifier.
* An "exp=" should not result in a perm error but should be ignored.
* Errata: http://www.openspf.org/RFC_4408/Errata#empty-exp
+ *
+ * NOTE: the last +"?" has been then removed because OpenSPF released a
new testsuite
+ * requiring a PermError on "exp=" (see JSPF-56).
*/
public static final String REGEX = "[eE][xX][pP]" + "\\="
- + SPFTermsRegexps.DOMAIN_SPEC_REGEX+"?";
+ + SPFTermsRegexps.DOMAIN_SPEC_REGEX;
private MacroExpand macroExpand;
Modified:
james/jspf/trunk/src/test/resources/org/apache/james/jspf/mailzone-tests.yml
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/test/resources/org/apache/james/jspf/mailzone-tests.yml?rev=599406&r1=599405&r2=599406&view=diff
==============================================================================
---
james/jspf/trunk/src/test/resources/org/apache/james/jspf/mailzone-tests.yml
(original)
+++
james/jspf/trunk/src/test/resources/org/apache/james/jspf/mailzone-tests.yml
Thu Nov 29 04:15:50 2007
@@ -822,7 +822,9 @@
helo: 118.spf1-test.mailzone.com
host: 192.0.2.200
mailfrom: 118.spf1-test.mailzone.com
- result: fail
+ # this has been changed to permerror because of the latest openspf updates
+ # result: fail
+ result: permerror
zonedata:
01.spf1-test.mailzone.com:
- TXT: v=spf1
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
