February 2015 - jbossweb-commits - Jboss List Archives

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-02-20 04:56:23 -0500 (Fri, 20 Feb 2015) New Revision: 2596 Added: tags/JBOSSWEB_7_5_7_FINAL/ Log: Web 7.5.7

9 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2595 - branches/7.5.x.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-02-20 04:55:19 -0500 (Fri, 20 Feb 2015) New Revision: 2595 Modified: branches/7.5.x/pom.xml Log: Web 7.5.7 Modified: branches/7.5.x/pom.xml =================================================================== --- branches/7.5.x/pom.xml 2015-02-20 09:07:58 UTC (rev 2594) +++ branches/7.5.x/pom.xml 2015-02-20 09:55:19 UTC (rev 2595) @@ -33,7 +33,7 @@ <groupId>org.jboss.web</groupId> <artifactId>jbossweb</artifactId> - <version>7.5.6.Final</version> + <version>7.5.7.Final</version> <name>JBoss Web</name> <description>Servlet 3.0 container</description>

9 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2594 - in branches/7.5.x: src/main/java/org/apache/jasper/compiler and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-02-20 04:07:58 -0500 (Fri, 20 Feb 2015) New Revision: 2594 Modified: branches/7.5.x/pom.xml branches/7.5.x/src/main/java/org/apache/jasper/compiler/JDTCompiler.java branches/7.5.x/src/main/java/org/apache/jasper/compiler/SmapUtil.java Log: BZ1193553: Add support for putting nice Java 8 code in JSPs. Modified: branches/7.5.x/pom.xml =================================================================== --- branches/7.5.x/pom.xml 2015-02-13 15:57:42 UTC (rev 2593) +++ branches/7.5.x/pom.xml 2015-02-20 09:07:58 UTC (rev 2594) @@ -45,7 +45,7 @@ <version.org.jboss.spec.javax.el>1.0.1.Final</version.org.jboss.spec.javax.el> <version.org.jboss.spec.javax.servlet>1.0.1.Final</version.org.jboss.spec.javax.servlet> <version.org.jboss.spec.javax.servlet.jsp>1.0.1.Final</version.org.jboss.spec.javax.servlet.jsp> - <version.org.eclipse.jdt.core.compiler.ecj>4.3.1</version.org.eclipse.jdt.core.compiler.ecj> + <version.org.eclipse.jdt.core.compiler.ecj>4.4.1</version.org.eclipse.jdt.core.compiler.ecj>  <maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.target>1.6</maven.compiler.target> Modified: branches/7.5.x/src/main/java/org/apache/jasper/compiler/JDTCompiler.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/jasper/compiler/JDTCompiler.java 2015-02-13 15:57:42 UTC (rev 2593) +++ branches/7.5.x/src/main/java/org/apache/jasper/compiler/JDTCompiler.java 2015-02-20 09:07:58 UTC (rev 2594) @@ -328,6 +328,9 @@ } else if(opt.equals("1.7")) { settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7); + } else if(opt.equals("1.8")) { + settings.put(CompilerOptions.OPTION_Source, + CompilerOptions.VERSION_1_8); } else { JasperLogger.COMPILER_LOGGER.unknownSourceJvm(opt); settings.put(CompilerOptions.OPTION_Source, @@ -369,6 +372,11 @@ CompilerOptions.VERSION_1_7); settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_7); + } else if(opt.equals("1.8")) { + settings.put(CompilerOptions.OPTION_TargetPlatform, + CompilerOptions.VERSION_1_8); + settings.put(CompilerOptions.OPTION_Compliance, + CompilerOptions.VERSION_1_8); } else { JasperLogger.COMPILER_LOGGER.unknownTargetJvm(opt); settings.put(CompilerOptions.OPTION_TargetPlatform, Modified: branches/7.5.x/src/main/java/org/apache/jasper/compiler/SmapUtil.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/jasper/compiler/SmapUtil.java 2015-02-13 15:57:42 UTC (rev 2593) +++ branches/7.5.x/src/main/java/org/apache/jasper/compiler/SmapUtil.java 2015-02-20 09:07:58 UTC (rev 2594) @@ -439,16 +439,23 @@ switch (tag) { case 7 : // Class case 8 : // String + case 16 : // MethodType if (log.isDebugEnabled()) log.debug(i + " copying 2 bytes"); copy(2); break; + case 15 : // MethodHandle + if (log.isDebugEnabled()) + log.debug(i + " copying 3 bytes"); + copy(3); + break; case 9 : // Field case 10 : // Method case 11 : // InterfaceMethod case 3 : // Integer case 4 : // Float case 12 : // NameAndType + case 18 : // InvokeDynamic if (log.isDebugEnabled()) log.debug(i + " copying 4 bytes"); copy(4);

9 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2593 - tags.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-02-13 10:57:42 -0500 (Fri, 13 Feb 2015) New Revision: 2593 Added: tags/JBOSSWEB_7_5_6_FINAL/ Log: 7.5.6 build.

9 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2592 - branches/7.5.x.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2015-02-13 10:38:03 -0500 (Fri, 13 Feb 2015) New Revision: 2592 Modified: branches/7.5.x/pom.xml Log: 7.5.6 build. Modified: branches/7.5.x/pom.xml =================================================================== --- branches/7.5.x/pom.xml 2015-02-03 20:04:33 UTC (rev 2591) +++ branches/7.5.x/pom.xml 2015-02-13 15:38:03 UTC (rev 2592) @@ -33,7 +33,7 @@ <groupId>org.jboss.web</groupId> <artifactId>jbossweb</artifactId> - <version>7.5.5.Final</version> + <version>7.5.6.Final</version> <name>JBoss Web</name> <description>Servlet 3.0 container</description>

9 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2591 - branches/JBOSSWEB_7_4_9_FINAL_BZ-1188833/src/main/java/org/apache/catalina/authenticator.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2015-02-03 15:04:33 -0500 (Tue, 03 Feb 2015) New Revision: 2591 Modified: branches/JBOSSWEB_7_4_9_FINAL_BZ-1188833/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java Log: [BZ-1188833] Ensure concurrent requests that require DIGEST auth receive unique nonces Modified: branches/JBOSSWEB_7_4_9_FINAL_BZ-1188833/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java =================================================================== --- branches/JBOSSWEB_7_4_9_FINAL_BZ-1188833/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2015-02-03 19:43:43 UTC (rev 2590) +++ branches/JBOSSWEB_7_4_9_FINAL_BZ-1188833/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2015-02-03 20:04:33 UTC (rev 2591) @@ -90,6 +90,14 @@ /** + * The last timestamp used to generate a nonce. Each nonce should get a + * unique timestamp. + */ + protected long lastTimestamp = 0; + protected final Object lastTimestampLock = new Object(); + + + /** * Maximum number of server nonces to keep in the cache. If not specified, * the default value of 1000 is used. */ @@ -303,6 +311,13 @@ long currentTime = System.currentTimeMillis(); + synchronized (lastTimestampLock) { + if (currentTime > lastTimestamp) { + lastTimestamp = currentTime; + } else { + currentTime = ++lastTimestamp; + } + } String ipTimeKey = request.getRemoteAddr() + ":" + currentTime + ":" + getKey(); Property changes on: branches/JBOSSWEB_7_4_9_FINAL_BZ-1188833/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java:2589

9 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2590 - branches.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2015-02-03 14:43:43 -0500 (Tue, 03 Feb 2015) New Revision: 2590 Added: branches/JBOSSWEB_7_4_9_FINAL_BZ-1188833/ Log: [BZ-1188833] create one off patch branch

9 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2589 - in branches/7.4.x: src and 1 other directories.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2015-02-03 11:39:06 -0500 (Tue, 03 Feb 2015) New Revision: 2589 Modified: branches/7.4.x/ branches/7.4.x/src/ branches/7.4.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java branches/7.4.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java Log: [JBWEB-258] Ensure concurrent requests that require DIGEST auth receive unique nonces Property changes on: branches/7.4.x ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.5.x:2588 Property changes on: branches/7.4.x/src ___________________________________________________________________ Modified: svn:mergeinfo - /branches/8.0.x/src:2529 + /branches/7.5.x/src:2588 /branches/8.0.x/src:2529 Modified: branches/7.4.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2015-02-03 16:17:45 UTC (rev 2588) +++ branches/7.4.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2015-02-03 16:39:06 UTC (rev 2589) @@ -90,6 +90,14 @@ /** + * The last timestamp used to generate a nonce. Each nonce should get a + * unique timestamp. + */ + protected long lastTimestamp = 0; + protected final Object lastTimestampLock = new Object(); + + + /** * Maximum number of server nonces to keep in the cache. If not specified, * the default value of 1000 is used. */ @@ -303,6 +311,13 @@ long currentTime = System.currentTimeMillis(); + synchronized (lastTimestampLock) { + if (currentTime > lastTimestamp) { + lastTimestamp = currentTime; + } else { + currentTime = ++lastTimestamp; + } + } String ipTimeKey = request.getRemoteAddr() + ":" + currentTime + ":" + getKey(); Property changes on: branches/7.4.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.5.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java:2574 /branches/8.0.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java:2529 + /branches/7.5.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java:2574,2588 /branches/8.0.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java:2529

9 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2588 - branches/7.5.x/src/main/java/org/apache/catalina/authenticator.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2015-02-03 11:17:45 -0500 (Tue, 03 Feb 2015) New Revision: 2588 Modified: branches/7.5.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java Log: [JBWEB-258] Ensure concurrent requests that require DIGEST auth receive unique nonces Modified: branches/7.5.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2015-01-27 12:51:50 UTC (rev 2587) +++ branches/7.5.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2015-02-03 16:17:45 UTC (rev 2588) @@ -90,6 +90,14 @@ /** + * The last timestamp used to generate a nonce. Each nonce should get a + * unique timestamp. + */ + protected long lastTimestamp = 0; + protected final Object lastTimestampLock = new Object(); + + + /** * Maximum number of server nonces to keep in the cache. If not specified, * the default value of 1000 is used. */ @@ -303,6 +311,13 @@ long currentTime = System.currentTimeMillis(); + synchronized (lastTimestampLock) { + if (currentTime > lastTimestamp) { + lastTimestamp = currentTime; + } else { + currentTime = ++lastTimestamp; + } + } String ipTimeKey = request.getRemoteAddr() + ":" + currentTime + ":" + getKey();

9 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits February 2015