You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/04/03 20:12:40 UTC

[tomcat] branch master updated (f6d471f -> 4d5048f)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


    from f6d471f  Remove reloadable attribute from Loader (it is duplicated on Context)
     new b248604  Remove additional work-around for old Adobe REader bug
     new 4d5048f  Update unit tests now space is not inserted.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/tomcat/util/http/parser/MediaType.java     |  4 ----
 test/org/apache/tomcat/util/http/parser/TestMediaType.java | 12 ++++++------
 2 files changed, 6 insertions(+), 10 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 02/02: Update unit tests now space is not inserted.

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 4d5048f9826627ad9f80627bf28ff7b15bd489ac
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Apr 3 21:12:27 2020 +0100

    Update unit tests now space is not inserted.
---
 test/org/apache/tomcat/util/http/parser/TestMediaType.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/org/apache/tomcat/util/http/parser/TestMediaType.java b/test/org/apache/tomcat/util/http/parser/TestMediaType.java
index 06c234e..6f16f14 100644
--- a/test/org/apache/tomcat/util/http/parser/TestMediaType.java
+++ b/test/org/apache/tomcat/util/http/parser/TestMediaType.java
@@ -142,9 +142,9 @@ public class TestMediaType {
         StringReader sr = new StringReader(sb.toString());
         MediaType m = MediaType.parseMediaType(sr);
 
-        Assert.assertEquals("foo/bar; charset=UTF-8; a=b", m.toString());
+        Assert.assertEquals("foo/bar;charset=UTF-8;a=b", m.toString());
         Assert.assertEquals(CHARSET, m.getCharset());
-        Assert.assertEquals("foo/bar; a=b", m.toStringNoCharset());
+        Assert.assertEquals("foo/bar;a=b", m.toStringNoCharset());
     }
 
 
@@ -184,8 +184,8 @@ public class TestMediaType {
         Assert.assertEquals("\"application/smil;charset=UTF-8\"",
                 m.getParameterValue("Type"));
 
-        String expected = "multipart/related; boundary=1_4F50BD36_CDF8C28; " +
-                "start=\"<31671603.smil>\"; " +
+        String expected = "multipart/related;boundary=1_4F50BD36_CDF8C28;" +
+                "start=\"<31671603.smil>\";" +
                 "type=\"application/smil;charset=UTF-8\"";
         Assert.assertEquals(expected, m.toString());
         Assert.assertEquals(expected, m.toStringNoCharset());
@@ -211,7 +211,7 @@ public class TestMediaType {
         Assert.assertEquals("UTF-8", m.getCharset());
 
         // Note: Invalid input is filtered out
-        Assert.assertEquals("text/html; charset=UTF-8", m.toString());
+        Assert.assertEquals("text/html;charset=UTF-8", m.toString());
         Assert.assertEquals("UTF-8", m.getCharset());
     }
 
@@ -231,7 +231,7 @@ public class TestMediaType {
         Assert.assertEquals("UTF-8", m.getParameterValue("charset"));
         Assert.assertEquals("UTF-8", m.getCharset());
 
-        Assert.assertEquals("text/html; charset=UTF-8", m.toString());
+        Assert.assertEquals("text/html;charset=UTF-8", m.toString());
     }
 
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 01/02: Remove additional work-around for old Adobe REader bug

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit b248604987681e0c9b1a8e36217624e8560f1c02
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Apr 3 21:11:30 2020 +0100

    Remove additional work-around for old Adobe REader bug
---
 java/org/apache/tomcat/util/http/parser/MediaType.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/MediaType.java b/java/org/apache/tomcat/util/http/parser/MediaType.java
index 2c548c0..52203cf 100644
--- a/java/org/apache/tomcat/util/http/parser/MediaType.java
+++ b/java/org/apache/tomcat/util/http/parser/MediaType.java
@@ -103,10 +103,6 @@ public class MediaType {
                             continue;
                         }
                         result.append(';');
-                        // Workaround for Adobe Read 9 plug-in on IE bug
-                        // Can be removed after 26 June 2013 (EOL of Reader 9)
-                        // See BZ 53814
-                        result.append(' ');
                         result.append(entry.getKey());
                         result.append('=');
                         result.append(entry.getValue());


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org