[Bug 62971] New: Revert the fix for 49464 in tomcat 9
https://bz.apache.org/bugzilla/show_bug.cgi?id=62971 Bug ID: 62971 Summary: Revert the fix for 49464 in tomcat 9 Product: Tomcat 9 Version: 9.0.13 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: zhouyanm...@gmail.com Target Milestone: - I encountered weird issue and I found this http://tomcat.10.x6.nabble.com/Tomcat-8-5-19-corrupts-static-text-files-encoded-with-UTF-8-td5065877.html Tomcat introduce such regress in 8.5.19 and reverted it soon in 8.5.20, but this still exists in tomcat 9.0, and not documented in migration guide https://tomcat.apache.org/migration-9.html I think it's bad to assume file encoding as Charset.defaultCharset(), especially on windows, normally system is not utf-8 encoding, and files like js are utf-8, if non-ascii characters included, it parse failed by browser. The change resolved some edge cases but bring a big regression issue, if you insist on it, please update the migration guide. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 49464] DefaultServlet and CharacterEncoding
https://bz.apache.org/bugzilla/show_bug.cgi?id=49464 Remy Maucherat changed: What|Removed |Added CC||zhouyanm...@gmail.com --- Comment #8 from Remy Maucherat --- *** Bug 62971 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62971] Revert the fix for 49464 in tomcat 9
https://bz.apache.org/bugzilla/show_bug.cgi?id=62971 Remy Maucherat changed: What|Removed |Added OS||All Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Remy Maucherat --- *** This bug has been marked as a duplicate of bug 49464 *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1847854 - /tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Mark,
On 11/30/18 15:59, ma...@apache.org wrote:
> Author: markt Date: Fri Nov 30 20:59:37 2018 New Revision: 1847854
>
> URL: http://svn.apache.org/viewvc?rev=1847854&view=rev Log:
> Clean-up file created during test
It was actually intentional to leave this file behind after the test,
but after verifying that "different JVM instances" wasn't the problem
with the implementation (the stupidly non-thread-safeness of the
interceptor was) it's really no longer necessary.
Thanks,
- -chris
> Modified:
> tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEn
cryptInterceptor.java
>
> Modified:
> tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEn
cryptInterceptor.java
>
>
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribe
s/group/interceptors/TestEncryptInterceptor.java?rev=1847854&r1=1847853&
r2=1847854&view=diff
> ==
>
>
- ---
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncr
yptInterceptor.java
(original)
> +++
> tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEn
cryptInterceptor.java
> Fri Nov 30 20:59:37 2018 @@ -25,6 +25,7 @@ import
> java.util.Collection; import org.hamcrest.core.IsEqual; import
> org.hamcrest.core.IsNot;
>
> +import org.junit.AfterClass; import org.junit.Assert; import
> org.junit.Before; import org.junit.FixMethodOrder; @@ -51,6 +52,8
> @@ import org.apache.catalina.tribes.io.XBy */
> @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class
> TestEncryptInterceptor { +private static final String
> MESSAGE_FILE = "message.bin"; + private static final String
> encryptionKey128 = "cafebabedeadbeefbeefcafecafebabe"; private
> static final String encryptionKey192 =
> "cafebabedeadbeefbeefcafecafebabedeadbeefbeefcafe"; private static
> final String encryptionKey256 =
> "cafebabedeadbeefcafebabedeadbeefcafebabedeadbeefcafebabedeadbeef";
>
>
@@ -58,6 +61,15 @@ public class TestEncryptInterceptor {
> EncryptInterceptor src; EncryptInterceptor dest;
>
> + +@AfterClass +public static void cleanup() { +
> File f = new File(MESSAGE_FILE); +if (f.isFile()) { +
> Assert.assertTrue(f.delete()); +} +} + @Before public
> void setup() { src = new EncryptInterceptor(); @@ -294,7 +306,7 @@
> public class TestEncryptInterceptor {
>
> byte[] bytes =
> ((ValueCaptureInterceptor)src.getNext()).getValue();
>
> -try (FileOutputStream out = new
> FileOutputStream("message.bin")) { +try (FileOutputStream
> out = new FileOutputStream(MESSAGE_FILE)) { out.write(bytes); }
>
> @@ -303,7 +315,7 @@ public class TestEncryptInterceptor { bytes =
> new byte[8192]; int read;
>
> -try (FileInputStream in = new
> FileInputStream("message.bin")) { +try (FileInputStream in
> = new FileInputStream(MESSAGE_FILE)) { read = in.read(bytes); }
>
> @@ -339,7 +351,7 @@ public class TestEncryptInterceptor {
>
> @Test public void testPickup() throws Exception { -File
> file = new File("message.bin"); +File file = new
> File(MESSAGE_FILE); if(!file.exists()) { System.err.println("File
> message.bin does not exist. Skipping test."); return; @@ -350,7
> +362,7 @@ public class TestEncryptInterceptor { byte[] bytes = new
> byte[8192]; int read;
>
> -try (FileInputStream in = new
> FileInputStream("message.bin")) { +try (FileInputStream in
> = new FileInputStream(file)) { read = in.read(bytes); }
>
>
>
>
> -
>
>
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlwEZS0ACgkQHPApP6U8
pFjNuw/+JiY+Urw3K+v1+A9CvG8Ix4Zb3j3TSTTnv7RAGX4Bx4O3drEutnyPquZt
ATCyS9NUlUCUaDj0Mvxd/S3HSv7Rd+aOtbtHAZgx1evSacDpMA4EdBwr2aq5+nfp
3Wi2TH6E3ZvbtGcB/+bXp/cy2egF01d9AgpCt1zI0XMeKxSZGEjochZb/3efbfiF
YTYctblCRCZ6RlhOmcd1ADG8zOGc2bqwyXbeFgzS5mSwWjXN3DOSzHKdkGjg24ug
FWupbm5ppjhl4XqE/M3tnHjHwmFKmpt4Kc7+b8+1AVsRQRUEdHsJqJ27Hp2Rvm0d
gZBbp7+SHw1xi89um6GGuZP4kxIkUrcpV14nqNo9UvkQ3m7Lt8WjNqV/sF/jvIQR
3ks31sVK446t4B/kgW/abZoScxRvJbzNN4MVCXviApVDEwEReizSgzWqTNbG3w3p
gpglZsYdbvtkd6tPq9mNO6MuZusBfnI2apLDh1WtjzadOJwZYC7FgB9T90P6iLP9
U2lEk692G0qiTYYK18/DqBrF7y5SiH9MJ/kwpIICmdDUYU5sbBcJvTPaPF+XlzWM
ZiG9y6Lc6ZnG7ILMTtlgU5eJ3/t4K6+rG1avhP7uf9QVOZepEdHAO1o0RPo07shv
Ro9ET2w8CEALTK6bEF6c/STWeknUNOT/7ts9TUlKubivaHGs/rQ=
=Eb8a
-END PGP SIGNATURE-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1848023 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud: AbstractStreamProvider.java CloudMembershipService.java
Author: kfujino Date: Mon Dec 3 07:04:27 2018 New Revision: 1848023 URL: http://svn.apache.org/viewvc?rev=1848023&view=rev Log: Fix mistaken references to Constants.Package. Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java?rev=1848023&r1=1848022&r2=1848023&view=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java Mon Dec 3 07:04:27 2018 @@ -36,7 +36,6 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; -import org.apache.catalina.tribes.membership.Constants; import org.apache.catalina.tribes.util.StringManager; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java?rev=1848023&r1=1848022&r2=1848023&view=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java Mon Dec 3 07:04:27 2018 @@ -25,7 +25,6 @@ import org.apache.catalina.tribes.Member import org.apache.catalina.tribes.MembershipProvider; import org.apache.catalina.tribes.MembershipService; import org.apache.catalina.tribes.jmx.JmxRegistry; -import org.apache.catalina.tribes.membership.Constants; import org.apache.catalina.tribes.membership.MemberImpl; import org.apache.catalina.tribes.membership.MembershipServiceBase; import org.apache.catalina.tribes.util.StringManager; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1848024 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud: CloudMembershipService.java CloudMembershipServiceMBean.java
Author: kfujino
Date: Mon Dec 3 07:48:20 2018
New Revision: 1848024
URL: http://svn.apache.org/viewvc?rev=1848024&view=rev
Log:
follow-up for r1847685
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipServiceMBean.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java?rev=1848024&r1=1848023&r2=1848024&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
Mon Dec 3 07:48:20 2018
@@ -226,4 +226,14 @@ public class CloudMembershipService exte
public void setReadTimeout(int readTimeout) {
properties.setProperty("readTimeout", String.valueOf(readTimeout));
}
+
+@Override
+public long getExpirationTime() {
+String expirationTime = properties.getProperty("expirationTime");
+return Long.parseLong(expirationTime);
+}
+
+public void setExpirationTime(long expirationTime) {
+properties.setProperty("expirationTime",
String.valueOf(expirationTime));
+}
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipServiceMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipServiceMBean.java?rev=1848024&r1=1848023&r2=1848024&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipServiceMBean.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipServiceMBean.java
Mon Dec 3 07:48:20 2018
@@ -27,6 +27,8 @@ public interface CloudMembershipServiceM
public int getReadTimeout();
+public long getExpirationTime();
+
// Operation
public Properties getProperties();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
