issue #326 allow relaxed Content-Disposition to apply to Content-Disposition properties

Author: mobileAgent

Diff for: doc/release/CHANGES.txt

@@ -30,6 +30,7 @@ GH  317	use System.lineSeparator() instead of System.getProperty(...)
 GH  321	URLName.getURL() returns incorrect url.
 GH  322	Dots in local part of emails not handled properly
 GH  323	Support loading protocol providers using ServiceLoader
+GH  326	Apply relaxed Content-Disposition parsing to Content-Disposition parameters
 
 
 		  CHANGES IN THE 1.6.1 RELEASE

Diff for: mail/src/main/java/javax/mail/internet/ContentDisposition.java

@@ -105,7 +105,14 @@ public ContentDisposition(String s) throws ParseException {
 	// Then parameters ..
 	String rem = h.getRemainder();
 	if (rem != null)
-	    list = new ParameterList(rem);
+            try {
+                list = new ParameterList(rem);
+            } catch (ParseException px) {
+                if (contentDispositionStrict) {
+                    throw px;
+                }
+            }
+        }
     }
 
     /**

Diff for: mail/src/test/java/javax/mail/internet/ContentDispositionNoStrict.java

@@ -64,6 +64,16 @@ public void testDecode() throws Exception {
         }
     }
 
+    @Test
+    public void testDecodeWithParams() throws Exception {
+        try {
+            ContentDisposition cd = new ContentDisposition(" ; size=12345");
+            assertNull("Content disposition must parse to null in non-strict mode", cd.getDisposition());
+        } catch (ParseException px) {
+            fail("Exception must not be thrown in non-strict mode");
+        }
+    }
+
     @AfterClass
     public static void after() {
         System.clearProperty("mail.mime.contentdisposition.strict");