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 2019/06/24 12:51:44 UTC
[tomcat] branch 8.5.x updated (486e49e -> 41db6c8)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 486e49e Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=49464
new cda33ce Fix charset name for UTF-32LE in bom detection.
new 41db6c8 Remove mappings provided by the JVM
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:
.../apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java | 7 -------
webapps/docs/changelog.xml | 3 +++
2 files changed, 3 insertions(+), 7 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 02/02: Remove mappings provided by the JVM
Posted by Mark Thomas <ma...@apache.org>.
On 24/06/2019 15:27, Mark Thomas wrote:
> On 24/06/2019 13:56, Konstantin Kolinko wrote:
>> пн, 24 июн. 2019 г. в 15:51, <ma...@apache.org>:
>>>
>>> This is an automated email from the ASF dual-hosted git repository.
>>>
>>> markt pushed a commit to branch 8.5.x
>>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>>
>>> commit 41db6c85dfb6f704e2911fb2e41a72e6944852ae
>>> Author: Mark Thomas <ma...@apache.org>
>>> AuthorDate: Mon Jun 24 10:09:55 2019 +0100
>>>
>>> Remove mappings provided by the JVM
>>
>> There are different JVM implementations out there. Are you sure of this change?
>
> As I can be. The mapping was created because older Sun JREs didn't
> support "iso-2022-cn" (the first one I tested). Not because some vendors
> hadn't implemented them.
>
> The original file dates back over 12 years:
>
> http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-spec-javamail-1.4/src/main/java/javax/mail/internet/MimeUtility.java?annotate=421852&pathrev=421852
>
> If you go back to Java 5 they are all known.
>
> Java 1.4 only iso-2022-cn is unknown.
>
> I'm having trouble testing with Java 1.3 (looks like a JRE install issue
> - not unreasonable given its age)
With thanks to Microsoft for providing an MSDN license so I could switch
to Windows...
On Java 1.3.1:
iso-2022-cn - UNKNOWN
iso-2022-kr - UNKNOWN
utf8 - UNKNOWN
Travelling even further down memory lane...
On Java 1.2.2 is the same as 1.3.1
Keep in mind I am testing the latest versions of these. Earlier point
releases may have had other issues.
I did try 1.1.8 but that won't install on 64-bit Windows 7.
But you get the idea.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 02/02: Remove mappings provided by the JVM
Posted by Mark Thomas <ma...@apache.org>.
On 24/06/2019 13:56, Konstantin Kolinko wrote:
> пн, 24 июн. 2019 г. в 15:51, <ma...@apache.org>:
>>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> markt pushed a commit to branch 8.5.x
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>
>> commit 41db6c85dfb6f704e2911fb2e41a72e6944852ae
>> Author: Mark Thomas <ma...@apache.org>
>> AuthorDate: Mon Jun 24 10:09:55 2019 +0100
>>
>> Remove mappings provided by the JVM
>
> There are different JVM implementations out there. Are you sure of this change?
As I can be. The mapping was created because older Sun JREs didn't
support "iso-2022-cn" (the first one I tested). Not because some vendors
hadn't implemented them.
The original file dates back over 12 years:
http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-spec-javamail-1.4/src/main/java/javax/mail/internet/MimeUtility.java?annotate=421852&pathrev=421852
If you go back to Java 5 they are all known.
Java 1.4 only iso-2022-cn is unknown.
I'm having trouble testing with Java 1.3 (looks like a JRE install issue
- not unreasonable given its age)
Mark
>
>> ---
>> .../apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java | 7 -------
>> 1 file changed, 7 deletions(-)
>>
>> diff --git a/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java b/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
>> index b5b4cdd..a6200ca 100644
>> --- a/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
>> +++ b/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
>> @@ -68,15 +68,8 @@ public final class MimeUtility {
>> private static final Map<String, String> MIME2JAVA = new HashMap<>();
>>
>> static {
>> - MIME2JAVA.put("iso-2022-cn", "ISO2022CN");
>> - MIME2JAVA.put("iso-2022-kr", "ISO2022KR");
>> - MIME2JAVA.put("utf-8", "UTF8");
>> - MIME2JAVA.put("utf8", "UTF8");
>> MIME2JAVA.put("ja_jp.iso2022-7", "ISO2022JP");
>> MIME2JAVA.put("ja_jp.eucjp", "EUCJIS");
>> - MIME2JAVA.put("euc-kr", "KSC5601");
>> - MIME2JAVA.put("euckr", "KSC5601");
>> - MIME2JAVA.put("us-ascii", "ISO-8859-1");
>> MIME2JAVA.put("x-us-ascii", "ISO-8859-1");
>> }
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 02/02: Remove mappings provided by the JVM
Posted by Konstantin Kolinko <kn...@gmail.com>.
пн, 24 июн. 2019 г. в 15:51, <ma...@apache.org>:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch 8.5.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
> commit 41db6c85dfb6f704e2911fb2e41a72e6944852ae
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Mon Jun 24 10:09:55 2019 +0100
>
> Remove mappings provided by the JVM
There are different JVM implementations out there. Are you sure of this change?
> ---
> .../apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java b/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
> index b5b4cdd..a6200ca 100644
> --- a/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
> +++ b/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
> @@ -68,15 +68,8 @@ public final class MimeUtility {
> private static final Map<String, String> MIME2JAVA = new HashMap<>();
>
> static {
> - MIME2JAVA.put("iso-2022-cn", "ISO2022CN");
> - MIME2JAVA.put("iso-2022-kr", "ISO2022KR");
> - MIME2JAVA.put("utf-8", "UTF8");
> - MIME2JAVA.put("utf8", "UTF8");
> MIME2JAVA.put("ja_jp.iso2022-7", "ISO2022JP");
> MIME2JAVA.put("ja_jp.eucjp", "EUCJIS");
> - MIME2JAVA.put("euc-kr", "KSC5601");
> - MIME2JAVA.put("euckr", "KSC5601");
> - MIME2JAVA.put("us-ascii", "ISO-8859-1");
> MIME2JAVA.put("x-us-ascii", "ISO-8859-1");
> }
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Remove mappings provided by the JVM
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 41db6c85dfb6f704e2911fb2e41a72e6944852ae
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 24 10:09:55 2019 +0100
Remove mappings provided by the JVM
---
.../apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java | 7 -------
1 file changed, 7 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java b/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
index b5b4cdd..a6200ca 100644
--- a/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
+++ b/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
@@ -68,15 +68,8 @@ public final class MimeUtility {
private static final Map<String, String> MIME2JAVA = new HashMap<>();
static {
- MIME2JAVA.put("iso-2022-cn", "ISO2022CN");
- MIME2JAVA.put("iso-2022-kr", "ISO2022KR");
- MIME2JAVA.put("utf-8", "UTF8");
- MIME2JAVA.put("utf8", "UTF8");
MIME2JAVA.put("ja_jp.iso2022-7", "ISO2022JP");
MIME2JAVA.put("ja_jp.eucjp", "EUCJIS");
- MIME2JAVA.put("euc-kr", "KSC5601");
- MIME2JAVA.put("euckr", "KSC5601");
- MIME2JAVA.put("us-ascii", "ISO-8859-1");
MIME2JAVA.put("x-us-ascii", "ISO-8859-1");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Fix charset name for UTF-32LE in bom detection.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cda33ce11b0a354b39861016bee440ad5af03c9b
Author: zhanhb <63...@users.noreply.github.com>
AuthorDate: Fri Jun 21 20:42:45 2019 +0800
Fix charset name for UTF-32LE in bom detection.
Patch by zhanhb vi Github. Closes #173 on Github
---
webapps/docs/changelog.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8328fb2..32c49c4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,9 @@
when the file encoding is not compatible with the required response
encoding. (markt)
</fix>
+ <fix>Fix typo in UTF-32LE charset name. Patch by zhanhb vi Github.
+ (fschumacher)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org