[GitHub] tomcat pull request #55: change the comment

[XUZHOUWANG]

GitHub user XUZHOUWANG opened a pull request:

https://github.com/apache/tomcat/pull/55

change the comment

'Parse session id in URL' -> 'Parse session id in cookie'

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/XUZHOUWANG/tomcat patch-1

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/55.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #55


commit ae5af2464e55148d18b3628af41833681c41a9b6
Author: John Andrew <741342...@qq.com>
Date:   2017-05-10T03:45:27Z

change the comment

'Parse session id in URL' -> 'Parse session id in cookie'




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

svn commit: r1794661 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/ha/session/ java/org/apache/ca

[ebourg]

Author: ebourg
Date: Tue May  9 23:15:45 2017
New Revision: 1794661

URL: http://svn.apache.org/viewvc?rev=1794661=rev
Log:
Use base collection types in private code

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/Tool.java

tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java

tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java
tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java
tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/trunk/java/org/apache/coyote/RequestGroupInfo.java
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java

tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextService.java

tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
URL: 

svn commit: r1794651 [1/3] - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/ant/ java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/authenticator/ java/org/apache/catalin

[ebourg]

Author: ebourg
Date: Tue May  9 22:22:59 2017
New Revision: 1794651

URL: http://svn.apache.org/viewvc?rev=1794651=rev
Log:
Removed unnecessary parentheses in return statements

Modified:
tomcat/trunk/java/org/apache/catalina/SessionEvent.java
tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java
tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java
tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java

tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java

svn commit: r1794651 [2/3] - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/ant/ java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/authenticator/ java/org/apache/catalin

[ebourg]

Modified: 
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1794651=1794650=1794651=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Tue 
May  9 22:22:59 2017
@@ -426,9 +426,7 @@ public abstract class WebappClassLoaderB
  *   the parent first. The default in Tomcat is false.
  */
 public boolean getDelegate() {
-
-return (this.delegate);
-
+return this.delegate;
 }
 
 
@@ -522,7 +520,7 @@ public abstract class WebappClassLoaderB
  * @return the clearReferencesStopThreads flag for this Context.
  */
 public boolean getClearReferencesStopThreads() {
-return (this.clearReferencesStopThreads);
+return this.clearReferencesStopThreads;
 }
 
 
@@ -541,7 +539,7 @@ public abstract class WebappClassLoaderB
  * @return the clearReferencesStopTimerThreads flag for this Context.
  */
 public boolean getClearReferencesStopTimerThreads() {
-return (this.clearReferencesStopTimerThreads);
+return this.clearReferencesStopTimerThreads;
 }
 
 
@@ -560,7 +558,7 @@ public abstract class WebappClassLoaderB
  * @return the clearReferencesLogFactoryRelease flag for this Context.
  */
 public boolean getClearReferencesLogFactoryRelease() {
-return (this.clearReferencesLogFactoryRelease);
+return this.clearReferencesLogFactoryRelease;
 }
 
 
@@ -581,7 +579,7 @@ public abstract class WebappClassLoaderB
  * Context.
  */
 public boolean getClearReferencesHttpClientKeepAliveThread() {
-return (this.clearReferencesHttpClientKeepAliveThread);
+return this.clearReferencesHttpClientKeepAliveThread;
 }
 
 
@@ -743,7 +741,7 @@ public abstract class WebappClassLoaderB
 sb.append(transformer).append("\r\n");
 }
 }
-return (sb.toString());
+return sb.toString();
 }
 
 
@@ -849,7 +847,7 @@ public abstract class WebappClassLoaderB
 }
 log.debug("  Loaded by " + cl.toString());
 }
-return (clazz);
+return clazz;
 
 }
 
@@ -987,7 +985,7 @@ public abstract class WebappClassLoaderB
 if (url != null) {
 if (log.isDebugEnabled())
 log.debug("  --> Returning '" + url.toString() + "'");
-return (url);
+return url;
 }
 }
 
@@ -996,7 +994,7 @@ public abstract class WebappClassLoaderB
 if (url != null) {
 if (log.isDebugEnabled())
 log.debug("  --> Returning '" + url.toString() + "'");
-return (url);
+return url;
 }
 
 // (3) Delegate to parent unconditionally if not already attempted
@@ -1005,14 +1003,14 @@ public abstract class WebappClassLoaderB
 if (url != null) {
 if (log.isDebugEnabled())
 log.debug("  --> Returning '" + url.toString() + "'");
-return (url);
+return url;
 }
 }
 
 // (4) Resource was not found
 if (log.isDebugEnabled())
 log.debug("  --> Resource not found, returning null");
-return (null);
+return null;
 
 }
 
@@ -1105,9 +1103,7 @@ public abstract class WebappClassLoaderB
  */
 @Override
 public Class loadClass(String name) throws ClassNotFoundException {
-
-return (loadClass(name, false));
-
+return loadClass(name, false);
 }
 
 
@@ -1154,7 +1150,7 @@ public abstract class WebappClassLoaderB
 log.debug("  Returning class from cache");
 if (resolve)
 resolveClass(clazz);
-return (clazz);
+return clazz;
 }
 
 // (0.1) Check our previously loaded class cache
@@ -1164,7 +1160,7 @@ public abstract class WebappClassLoaderB
 log.debug("  Returning class from cache");
 if (resolve)
 resolveClass(clazz);
-return (clazz);
+return clazz;
 }
 
 // (0.2) Try loading the class with the system class loader, to 
prevent
@@ -1195,7 +1191,7 @@ public abstract class WebappClassLoaderB
 if (clazz != null) {
 if (resolve)
 resolveClass(clazz);
-return (clazz);
+return clazz;
 }
 } catch (ClassNotFoundException e) {
 // Ignore
@@ -1230,7 +1226,7 @@ public abstract class WebappClassLoaderB
 

svn commit: r1794651 [3/3] - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/ant/ java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/authenticator/ java/org/apache/catalin

[ebourg]

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1794651=1794650=1794651=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Tue May  9 
22:22:59 2017
@@ -43,6 +43,6 @@ public class AjpNioProtocol extends Abst
 
 @Override
 protected String getNamePrefix() {
-return ("ajp-nio");
+return "ajp-nio";
 }
 }

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1794651=1794650=1794651=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue May  9 
22:22:59 2017
@@ -228,7 +228,7 @@ public class Http11Processor extends Abs
 // Check for compatible MIME-TYPE
 String[] compressibleMimeTypes = 
protocol.getCompressibleMimeTypes();
 if (compressibleMimeTypes != null) {
-return (startsWithStringArray(compressibleMimeTypes, 
response.getContentType()));
+return startsWithStringArray(compressibleMimeTypes, 
response.getContentType());
 }
 }
 

Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.java?rev=1794651=1794650=1794651=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Tue May  9 22:22:59 
2017
@@ -7,7 +7,7 @@ public class ELParser/*@bgen(jjtree)*/im
   protected JJTELParserState jjtree = new JJTELParserState();
 public static Node parse(String ref) throws ELException {
 try {
-return (new ELParser(new StringReader(ref))).CompositeExpression();
+return new ELParser(new StringReader(ref)).CompositeExpression();
 } catch (ParseException pe) {
 throw new ELException(pe.getMessage());
 }

Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.jjt?rev=1794651=1794650=1794651=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Tue May  9 22:22:59 2017
@@ -43,7 +43,7 @@ public class ELParser {
 
 public static Node parse(String ref) throws ELException {
 try {
-return (new ELParser(new StringReader(ref))).CompositeExpression();
+return new ELParser(new StringReader(ref)).CompositeExpression();
 } catch (ParseException pe) {
 throw new ELException(pe.getMessage());
 }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java?rev=1794651=1794650=1794651=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java Tue May  
9 22:22:59 2017
@@ -50,8 +50,8 @@ public class AttributeParser {
 public static String getUnquoted(String input, char quote,
 boolean isELIgnored, boolean isDeferredSyntaxAllowedAsLiteral,
 boolean strict, boolean quoteAttributeEL) {
-return (new AttributeParser(input, quote, isELIgnored,
-isDeferredSyntaxAllowedAsLiteral, strict, 
quoteAttributeEL)).getUnquoted();
+return new AttributeParser(input, quote, isELIgnored,
+isDeferredSyntaxAllowedAsLiteral, strict, 
quoteAttributeEL).getUnquoted();
 }
 
 /* The quoted input string. */

Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java?rev=1794651=1794650=1794651=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java Tue May  
9 22:22:59 2017
@@ -835,9 +835,9 @@ public class JspRuntimeLibrary {
 String relativePath) {
 
 if (relativePath.startsWith("/"))
-return (relativePath);
+return 

Re: [VOTE] Release Apache Tomcat 9.0.0.M21

[Martin Grigorov]

On Fri, May 5, 2017 at 11:03 AM, Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.0.M21 release is now available for voting.
>
> This is a milestone release for the 9.0.x branch. It should be
> noted that, as a milestone release:
> - Servlet 4.0 is not finalised
> - The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0
>
> The major changes compared to the 9.0.0.M20 release are:
>
> - Update the default URIEncoding for a Connector to UTF-8 as required
>   by the Servlet 4.0 specification.
>
> - Various improvements to the handling of static custom error pages
>
> - Update to Eclipse JDT Compiler 4.6.3
>
> Along with lots of other bug fixes and improvements
>
> For full details, see the changelog:
> http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M21/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1133/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M21/
>
> The proposed 9.0.0.M21 release is:
> [ ] Broken - do not release
> [ X ] Alpha - go ahead and release as 9.0.0.M21
>


Regards,
Martin


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

Re: [VOTE] Release Apache Tomcat 8.5.15

[Martin Grigorov]

On Fri, May 5, 2017 at 1:38 PM, Mark Thomas  wrote:

> The proposed Apache Tomcat 8.5.15 release is now available for voting.
>
> The major changes compared to the 8.5.13 release are:
>
> - Various improvements to the handling of static custom error pages
>
> - Update to Eclipse JDT Compiler 4.6.3
>
> - Review those places where Tomcat re-encodes a URI or URI component
>   and ensure that that correct encoding is consistently applied.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.15/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1134/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_15/
>
> The proposed 8.5.15 release is:
> [ ] Broken - do not release
> [ X ] Stable - go ahead and release as 8.5.15
>

Regards,
Martin


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

Re: [VOTE] Release Apache Tomcat 8.5.15

[Felix Schumacher]

Am 5. Mai 2017 13:38:24 MESZ schrieb Mark Thomas :
>The proposed Apache Tomcat 8.5.15 release is now available for voting.
>
>The major changes compared to the 8.5.13 release are:
>
>- Various improvements to the handling of static custom error pages
>
>- Update to Eclipse JDT Compiler 4.6.3
>
>- Review those places where Tomcat re-encodes a URI or URI component
>  and ensure that that correct encoding is consistently applied.
>
>It can be obtained from:
>https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.15/
>The Maven staging repo is:
>https://repository.apache.org/content/repositories/orgapachetomcat-1134/
>The svn tag is:
>http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_15/
>
>The proposed 8.5.15 release is:
>[ ] Broken - do not release
>[x] Stable - go ahead and release as 8.5.15

Felix

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

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

[Bug 61032] min pool size is not being respected

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61032

Jelmer  changed:

   What|Removed |Added

URL||https://github.com/apache/t
   ||omcat/pull/54

-- 
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: [VOTE] Release Apache Tomcat 8.5.15

[Emmanuel Bourg]

Le 5/05/2017 à 13:38, Mark Thomas a écrit :

> [X] Stable - go ahead and release as 8.5.15

+1, the 3 test suites passed on Debian 9 (amd64) with OpenJDK 8u131.

Emmanuel Bourg




signature.asc
Description: OpenPGP digital signature

svn commit: r1794556 - in /tomcat/trunk/java/org/apache: catalina/ catalina/core/ catalina/filters/ catalina/startup/ catalina/tribes/tipis/ catalina/valves/ coyote/ coyote/http11/ coyote/http2/ tomca

[ebourg]

Author: ebourg
Date: Tue May  9 12:38:17 2017
New Revision: 1794556

URL: http://svn.apache.org/viewvc?rev=1794556=rev
Log:
Inner enums are implicitly static

Modified:
tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java

tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/tomcat/buildutil/CheckEol.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java

Modified: tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java?rev=1794556=1794555=1794556=diff
==
--- tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java (original)
+++ tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java Tue May  9 
12:38:17 2017
@@ -430,7 +430,7 @@ public interface WebResourceRoot extends
  */
 void gc();
 
-static enum ResourceSetType {
+enum ResourceSetType {
 PRE,
 RESOURCE_JAR,
 POST,

Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1794556=1794555=1794556=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Tue 
May  9 12:38:17 2017
@@ -736,7 +736,7 @@ public class DefaultInstanceManager impl
 }
 
 
-private static enum AnnotationCacheEntryType {
+private enum AnnotationCacheEntryType {
 FIELD, SETTER, POST_CONSTRUCT, PRE_DESTROY
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1794556=1794555=1794556=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Tue May  9 
12:38:17 2017
@@ -1022,7 +1022,7 @@ public class CorsFilter extends GenericF
  * Enumerates varies types of CORS requests. Also, provides utility methods
  * to determine the request type.
  */
-protected static enum CORSRequestType {
+protected enum CORSRequestType {
 /**
  * A simple HTTP request, i.e. it shouldn't be pre-flighted.
  */

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java?rev=1794556=1794555=1794556=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java 
Tue May  9 12:38:17 2017
@@ -247,7 +247,7 @@ public class HttpHeaderSecurityFilter ex
 }
 
 
-private static enum XFrameOption {
+private enum XFrameOption {
 DENY("DENY"),
 SAME_ORIGIN("SAMEORIGIN"),
 ALLOW_FROM("ALLOW-FROM");

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java?rev=1794556=1794555=1794556=diff

svn commit: r1794554 - in /tomcat/trunk: java/org/apache/catalina/ant/ java/org/apache/catalina/ha/deploy/ java/org/apache/catalina/servlets/ java/org/apache/catalina/startup/ java/org/apache/catalina

[ebourg]

Author: ebourg
Date: Tue May  9 12:33:07 2017
New Revision: 1794554

URL: http://svn.apache.org/viewvc?rev=1794554=rev
Log:
Removed unnecessary semicolons

Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java
tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java

tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java

Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1794554=1794553=1794554=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Tue May 
 9 12:33:07 2017
@@ -211,7 +211,7 @@ public abstract class AbstractCatalinaTa
 // Send the request data (if any)
 if (istream != null) {
 try (BufferedOutputStream ostream = new BufferedOutputStream(
-hconn.getOutputStream(), 1024);) {
+hconn.getOutputStream(), 1024)) {
 byte buffer[] = new byte[1024];
 while (true) {
 int n = istream.read(buffer);

Modified: tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java?rev=1794554=1794553=1794554=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java Tue May  9 
12:33:07 2017
@@ -93,7 +93,7 @@ public class ValidatorTask extends BaseR
 // SecurityManager assume that untrusted applications may be deployed.
 Digester digester = DigesterFactory.newDigester(
 true, true, null, Globals.IS_SECURITY_ENABLED);
-try (InputStream stream = new BufferedInputStream(new 
FileInputStream(file.getCanonicalFile()));) {
+try (InputStream stream = new BufferedInputStream(new 
FileInputStream(file.getCanonicalFile( {
 InputSource is = new 
InputSource(file.toURI().toURL().toExternalForm());
 is.setByteStream(stream);
 digester.parse(is);

Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=1794554=1794553=1794554=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Tue 
May  9 12:33:07 2017
@@ -748,7 +748,7 @@ public class FarmWarDeployer extends Clu
 }
 
 try (java.io.FileInputStream is = new java.io.FileInputStream(from);
-java.io.FileOutputStream os = new java.io.FileOutputStream(to, 
false);) {
+java.io.FileOutputStream os = new java.io.FileOutputStream(to, 
false)) {
 byte[] buf = new byte[4096];
 while (true) {
 int len = is.read(buf);

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1794554=1794553=1794554=diff
==
--- 

svn commit: r1794551 - in /tomcat/trunk/java/org/apache: catalina/filters/RemoteIpFilter.java tomcat/websocket/server/WsHandshakeRequest.java

[ebourg]

Author: ebourg
Date: Tue May  9 12:22:53 2017
New Revision: 1794551

URL: http://svn.apache.org/viewvc?rev=1794551=rev
Log:
Use Collections.singletonList() instead of Arrays.asList() when wrapping only 
one element

Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1794551=1794550=1794551=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Tue May  
9 12:22:53 2017
@@ -19,7 +19,6 @@ package org.apache.catalina.filters;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Enumeration;
@@ -586,7 +585,7 @@ public class RemoteIpFilter extends Gene
 }
 
 public void setHeader(String name, String value) {
-List values = Arrays.asList(value);
+List values = Collections.singletonList(value);
 Map.Entry header = getHeaderEntry(name);
 if (header == null) {
 headers.put(name, values);

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java?rev=1794551=1794550=1794551=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java 
Tue May  9 12:22:53 2017
@@ -79,7 +79,7 @@ public class WsHandshakeRequest implemen
 for (Entry entry : pathParams.entrySet()) {
 newParameters.put(entry.getKey(),
 Collections.unmodifiableList(
-Arrays.asList(entry.getValue(;
+Collections.singletonList(entry.getValue(;
 }
 parameterMap = Collections.unmodifiableMap(newParameters);
 



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

[Bug 57665] support x-forwarded-host

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=57665

--- Comment #15 from Stefan Fussenegger  ---
(In reply to Richard Swart from comment #14)
> Note that proxies like Apache with mod_proxy will create a comma separate
> list of the X-Forwarded-Host if the incoming request already contains a
> X-Forwarded-Host header (similar to X-Forwarded-For). Rfc7239 is not
> completely clear whether this is allowed or not, but it still common
> practice. 
> 
> The patch does not seem to support this (at least no unit test covers this
> situation).

This case is actually covered with this line:

String hostAndPort[] = hostHeaderValue.split(",")[0].trim().split(":", 2);

-- 
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