[tomcat] branch 8.5.x updated: Ensure that members registered in the addSuspects list are static members.
This is an automated email from the ASF dual-hosted git repository. kfujino pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 075985c Ensure that members registered in the addSuspects list are static members. 075985c is described below commit 075985c5169f6e4623719e0f26064d723dd4075e Author: kfujino AuthorDate: Tue Mar 5 17:08:24 2019 +0900 Ensure that members registered in the addSuspects list are static members. --- .../catalina/tribes/group/interceptors/TcpFailureDetector.java| 4 +++- webapps/docs/changelog.xml| 8 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java index d805fe7..2220f20 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java +++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java @@ -133,7 +133,9 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai membership.memberAlive(member); notify = true; } else { -addSuspects.put(member, Long.valueOf(System.currentTimeMillis())); +if (member instanceof StaticMember) { +addSuspects.put(member, Long.valueOf(System.currentTimeMillis())); +} } } } diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 2a9fe56..2ef5914 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -182,6 +182,14 @@ + + + +Ensure that members registered in the addSuspects list are static +members. (kfujino) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re:java.lang.NullPointerException on sun.nio.ch.Util.getTemporaryDirectBuffer
I found the application code clear thread local. so cause the exception. However, developers are averse to modify the code. -- ?? ?? ?? 11??605?? ??215000 ??+86 18860923261 ??jianjun@dev.bessystem.com -- Original -- From: "??"; Date: Mon, Mar 4, 2019 05:27 PM To: "Tomcat Developers List"; Subject: java.lang.NullPointerException on sun.nio.ch.Util.getTemporaryDirectBuffer I get the exception in tomcat 8.5.19 Error processing request java.lang.NullPointerException at sun.nio.ch.Util.getTemporaryDirectBuffer(Util.java:230) at sun.nio.ch.IOUtil.write(IOUtil.java:58) at sun.nio.ch.SocketChannelImpl.write(SocketChannelImpl.java:471) at org.apache.tomcat.util.net.NioChannel.write(NioChannel.java:134) at org.apache.tomcat.util.net.NioBlockingSelector.write(NioBlockingSelector.java:101) at org.apache.tomcat.util.net.NioSelectorPool.write(NioSelectorPool.java:157) at org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.doWrite(NioEndpoint.java:1262) at org.apache.tomcat.util.net.SocketWrapperBase.doWrite(SocketWrapperBase.java:670) at org.apache.tomcat.util.net.SocketWrapperBase.flushBlocking(SocketWrapperBase.java:607) at org.apache.tomcat.util.net.SocketWrapperBase.flush(SocketWrapperBase.java:597) at org.apache.coyote.http11.Http11OutputBuffer.flushBuffer(Http11OutputBuffer.java:581) at org.apache.coyote.http11.Http11OutputBuffer.finishResponse(Http11OutputBuffer.java:330) at org.apache.coyote.http11.Http11Processor.finishResponse(Http11Processor.java:1488) Looking forward to some help. thinks. -- ?? ?? ?? 11??605?? ??215000 ??+86 18860923261 ??jianjun@dev.bessystem.com
buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/1680 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 075985c5169f6e4623719e0f26064d723dd4075e Blamelist: kfujino Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Sync for fillReadBuffer as javadoc says
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new f148ae1 Sync for fillReadBuffer as javadoc says f148ae1 is described below commit f148ae1be37697c29d10779de89fe9f74b4867ba Author: remm AuthorDate: Tue Mar 5 10:19:03 2019 +0100 Sync for fillReadBuffer as javadoc says --- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index de44f37..3b0e3d5 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -1504,20 +1504,19 @@ public class Nio2Endpoint extends AbstractJsseEndpoint
Re: buildbot failure in on tomcat-85-trunk
On Mon, Mar 4, 2019 at 10:07 PM wrote: > The Buildbot has detected a new failure on builder tomcat-85-trunk while > building tomcat. Full details are available at: > https://ci.apache.org/builders/tomcat-85-trunk/builds/1679 > > Buildbot URL: https://ci.apache.org/ > > Buildslave for this Build: silvanus_ubuntu > > Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' > triggered this build > Build Source Stamp: [branch 8.5.x] 4ccde94cd79791faeca6421512c51409770002b5 > Blamelist: Mark Thomas > > BUILD FAILED: failed compile_1 > TestSsl.NIO2 did hang. No idea which test (maybe testRenegotiateWorks). Rémy > > Sincerely, > -The Buildbot > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[tomcat] branch 8.5.x updated: Sync for fillReadBuffer as javadoc says
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 5bbccbc Sync for fillReadBuffer as javadoc says 5bbccbc is described below commit 5bbccbc2f3cd57cd12273d9ad02e0d727b2e128b Author: remm AuthorDate: Tue Mar 5 10:19:03 2019 +0100 Sync for fillReadBuffer as javadoc says --- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index 547ed23..226e421 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -1472,20 +1472,19 @@ public class Nio2Endpoint extends AbstractJsseEndpoint { if (readNotify) { return; } -/*if (readPending.availablePermits() == 0) { -readInterest = true; -} else { -// If no read is pending, start waiting for data -awaitBytes(); -}*/ -readInterest = true; if (readPending.tryAcquire()) { -try { -fillReadBuffer(false); -} catch (IOException e) { -// Will never happen -setError(e); +// No read pending, so await bytes +synchronized (readCompletionHandler) { +readInterest = true; +try { +fillReadBuffer(false); +} catch (IOException e) { +// Will never happen +setError(e); +} } +} else { +readInterest = true; } } } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: java.lang.NullPointerException on sun.nio.ch.Util.getTemporaryDirectBuffer
This thread belongs on the users@ mailing list. Mark On 05/03/2019 08:23, jianjun.guo wrote: > I found the application code clear thread local. > so cause the exception. > However, developers are averse to modify the code. > > > > -- > ?? > ?? ?? > 11??605?? > ??215000 > ??+86 18860923261 > ??jianjun@dev.bessystem.com > > > > > > > -- Original -- > From: "??"; > Date: Mon, Mar 4, 2019 05:27 PM > To: "Tomcat Developers List"; > > Subject: java.lang.NullPointerException on > sun.nio.ch.Util.getTemporaryDirectBuffer > > > I get the exception in tomcat 8.5.19 > Error processing request > java.lang.NullPointerException > at sun.nio.ch.Util.getTemporaryDirectBuffer(Util.java:230) > at sun.nio.ch.IOUtil.write(IOUtil.java:58) > at sun.nio.ch.SocketChannelImpl.write(SocketChannelImpl.java:471) > at org.apache.tomcat.util.net.NioChannel.write(NioChannel.java:134) > at > org.apache.tomcat.util.net.NioBlockingSelector.write(NioBlockingSelector.java:101) > at > org.apache.tomcat.util.net.NioSelectorPool.write(NioSelectorPool.java:157) > at > org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.doWrite(NioEndpoint.java:1262) > at > org.apache.tomcat.util.net.SocketWrapperBase.doWrite(SocketWrapperBase.java:670) > at > org.apache.tomcat.util.net.SocketWrapperBase.flushBlocking(SocketWrapperBase.java:607) > at > org.apache.tomcat.util.net.SocketWrapperBase.flush(SocketWrapperBase.java:597) > at > org.apache.coyote.http11.Http11OutputBuffer.flushBuffer(Http11OutputBuffer.java:581) > at > org.apache.coyote.http11.Http11OutputBuffer.finishResponse(Http11OutputBuffer.java:330) > at > org.apache.coyote.http11.Http11Processor.finishResponse(Http11Processor.java:1488) > > > > Looking forward to some help. thinks. > > > > > > > -- > ?? > ?? ?? > 11??605?? > ??215000 > ??+86 18860923261 > ??jianjun@dev.bessystem.com > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63210] Tomcat failing to shutdown if EvictionTimer thread is running
https://bz.apache.org/bugzilla/show_bug.cgi?id=63210 Mark Thomas changed: What|Removed |Added Resolution|FIXED |--- Status|RESOLVED|REOPENED --- Comment #13 from Mark Thomas --- That is actually a much neater solution. I'll rework the fix. Thanks. -- 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
[tomcat] branch master updated: Improve fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63210
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 The following commit(s) were added to refs/heads/master by this push: new 8066eb5 Improve fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63210 8066eb5 is described below commit 8066eb5f5e5459fed5827546b1b60d434f4a1090 Author: Mark Thomas AuthorDate: Tue Mar 5 10:50:19 2019 + Improve fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63210 Close AutoCloseable DataSources by default. Covers DBCP 2 and custom factories as well as any other DataSources that need to be closed. --- java/org/apache/catalina/core/NamingContextListener.java | 16 +++- webapps/docs/config/context.xml | 16 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java index 5c124c8..f6f2132 100644 --- a/java/org/apache/catalina/core/NamingContextListener.java +++ b/java/org/apache/catalina/core/NamingContextListener.java @@ -1011,23 +1011,21 @@ public class NamingContextListener if (("javax.sql.DataSource".equals(ref.getClassName()) || "javax.sql.XADataSource".equals(ref.getClassName())) && resource.getSingleton()) { -String factory = (String) resource.getProperty("factory"); -if ((factory == null || factory.equals(Constants.DBCP_DATASOURCE_FACTORY)) && -!resource.getCloseMethodConfigured()) { -// Using Tomcat's built-in factory (DBCP2) and DBCP2 DataSources -// require an explicit close -resource.setCloseMethod("close"); -} +Object actualResource = null; try { ObjectName on = createObjectName(resource); -Object actualResource = envCtx.lookup(resource.getName()); +actualResource = envCtx.lookup(resource.getName()); Registry.getRegistry(null, null).registerComponent(actualResource, on, null); objectNames.put(resource.getName(), on); } catch (Exception e) { log.warn(sm.getString("naming.jmxRegistrationFailed", e)); } +// Bug 63210. DBCP2 DataSources require an explicit close. This goes +// further and cleans up and AutoCloseable DataSource by default. +if (actualResource instanceof AutoCloseable && !resource.getCloseMethodConfigured()) { +resource.setCloseMethod("close"); +} } - } diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 27a49a4..306568c 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -1212,14 +1212,14 @@ it is no longer required. This is intended to speed up clean-up of resources that would otherwise happen as part of garbage collection. This attribute is ignored if the singleton attribute is -false. If not specified, no default is defined and no close method will -be called. -For Apache Commons DBCP 2 and Apache Tomcat JDBC connection pools -you can use closeMethod="close". Note that Apache Commons -DBCP 2 requires this to be set for a clean shutdown. When using the -default Tomcat connection pool (based on DBCP 2) Tomcat will set this -attribute automatically unless it is explictly set to the empty -string. +false. +For javax.sql.DataSource and +javax.sql.XADataSource resources that implement +AutoCloseable such as Apache Commons DBCP 2 and the default +Apache Tomcat connection pool, this attribute is defaults to +close. This may be disabled by setting the attribute to the +empty string. For all other resource types no default is defined and no +close method will be called by default. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Improve fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63210
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 The following commit(s) were added to refs/heads/8.5.x by this push: new bf13078 Improve fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63210 bf13078 is described below commit bf13078a8d0efb04d367e976e2c38ef3d0a2943b Author: Mark Thomas AuthorDate: Tue Mar 5 10:50:19 2019 + Improve fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63210 Close AutoCloseable DataSources by default. Covers DBCP 2 and custom factories as well as any other DataSources that need to be closed. --- java/org/apache/catalina/core/NamingContextListener.java | 16 +++- webapps/docs/config/context.xml | 16 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java index fe5ad1c..aa4d64a 100644 --- a/java/org/apache/catalina/core/NamingContextListener.java +++ b/java/org/apache/catalina/core/NamingContextListener.java @@ -1011,23 +1011,21 @@ public class NamingContextListener if (("javax.sql.DataSource".equals(ref.getClassName()) || "javax.sql.XADataSource".equals(ref.getClassName())) && resource.getSingleton()) { -String factory = (String) resource.getProperty("factory"); -if ((factory == null || factory.equals(Constants.DBCP_DATASOURCE_FACTORY)) && -!resource.getCloseMethodConfigured()) { -// Using Tomcat's built-in factory (DBCP2) and DBCP2 DataSources -// require an explicit close -resource.setCloseMethod("close"); -} +Object actualResource = null; try { ObjectName on = createObjectName(resource); -Object actualResource = envCtx.lookup(resource.getName()); +actualResource = envCtx.lookup(resource.getName()); Registry.getRegistry(null, null).registerComponent(actualResource, on, null); objectNames.put(resource.getName(), on); } catch (Exception e) { log.warn(sm.getString("naming.jmxRegistrationFailed", e)); } +// Bug 63210. DBCP2 DataSources require an explicit close. This goes +// further and cleans up and AutoCloseable DataSource by default. +if (actualResource instanceof AutoCloseable && !resource.getCloseMethodConfigured()) { +resource.setCloseMethod("close"); +} } - } diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index c424a6f..5eacd12 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -1200,14 +1200,14 @@ it is no longer required. This is intended to speed up clean-up of resources that would otherwise happen as part of garbage collection. This attribute is ignored if the singleton attribute is -false. If not specified, no default is defined and no close method will -be called. -For Apache Commons DBCP 2 and Apache Tomcat JDBC connection pools -you can use closeMethod="close". Note that Apache Commons -DBCP 2 requires this to be set for a clean shutdown. When using the -default Tomcat connection pool (based on DBCP 2) Tomcat will set this -attribute automatically unless it is explictly set to the empty -string. +false. +For javax.sql.DataSource and +javax.sql.XADataSource resources that implement +AutoCloseable such as Apache Commons DBCP 2 and the default +Apache Tomcat connection pool, this attribute is defaults to +close. This may be disabled by setting the attribute to the +empty string. For all other resource types no default is defined and no +close method will be called by default. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63210] Tomcat failing to shutdown if EvictionTimer thread is running
https://bz.apache.org/bugzilla/show_bug.cgi?id=63210 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|REOPENED|RESOLVED --- Comment #14 from Mark Thomas --- Improved fix applied (fixed versions as before). -- 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
[tomcat] branch master updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63206
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 The following commit(s) were added to refs/heads/master by this push: new 267b8d8 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63206 267b8d8 is described below commit 267b8d8852db44dbad249453099ef6e9c26a4e9f Author: Mark Thomas AuthorDate: Tue Mar 5 13:15:23 2019 + Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63206 Add createUploadTargets to Context --- java/org/apache/catalina/Context.java | 22 ++ .../catalina/connector/LocalStrings.properties | 2 ++ java/org/apache/catalina/connector/Request.java| 9 + java/org/apache/catalina/core/StandardContext.java | 14 ++ .../org/apache/catalina/startup/FailedContext.java | 5 + test/org/apache/tomcat/unittest/TesterContext.java | 5 + webapps/docs/changelog.xml | 7 +++ webapps/docs/config/context.xml| 7 +++ 8 files changed, 71 insertions(+) diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java index 192d1d2..5e3d285 100644 --- a/java/org/apache/catalina/Context.java +++ b/java/org/apache/catalina/Context.java @@ -1871,4 +1871,26 @@ public interface Context extends Container, ContextBind { public void decrementInProgressAsyncCount(); + + +/** + * Configure whether Tomcat will attempt to create an upload target used by + * this web application if it does not exist when the web application + * attempts to use it. + * + * @param createUploadTargets {@code true} if Tomcat should attempt to + * create the upload target, otherwise {@code false} + */ +public void setCreateUploadTargets(boolean createUploadTargets); + + +/** + * Will Tomcat attempt to create an upload target used by this web + * application if it does not exist when the web application attempts to use + * it? + * + * @return {@code true} if Tomcat will attempt to create an upload target + * otherwise {@code false} + */ +public boolean getCreateUploadTargets(); } diff --git a/java/org/apache/catalina/connector/LocalStrings.properties b/java/org/apache/catalina/connector/LocalStrings.properties index a7b5fee..bb018d9 100644 --- a/java/org/apache/catalina/connector/LocalStrings.properties +++ b/java/org/apache/catalina/connector/LocalStrings.properties @@ -60,6 +60,8 @@ coyoteRequest.sessionCreateCommitted=Cannot create a session after the response coyoteRequest.sessionEndAccessFail=Exception triggered ending access to session while recycling request coyoteRequest.setAttribute.namenull=Cannot call setAttribute with a null name coyoteRequest.trailersNotReady=It is illegal to call getTrailerFields() before isTrailerFieldsReady() has returned true +coyoteRequest.uploadCreate=Creating the temporary upload location [{0}] as it is required by the servlet [{1}] +coyoteRequest.uploadCreateFail=Failed to create the upload location [{0}] coyoteRequest.uploadLocationInvalid=The temporary upload location [{0}] is not valid coyoteResponse.encoding.invalid=The encoding [{0}] is not recognised by the JRE diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java index 2cb29fc..db51182 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -2815,6 +2815,15 @@ public class Request implements HttpServletRequest { } } +if (!location.exists() && context.getCreateUploadTargets()) { +log.warn(sm.getString("coyoteRequest.uploadCreate", +location.getAbsolutePath(), getMappingData().wrapper.getName())); +if (!location.mkdirs()) { +log.warn(sm.getString("coyoteRequest.uploadCreateFail", +location.getAbsolutePath())); +} +} + if (!location.isDirectory()) { parameters.setParseFailedReason(FailReason.MULTIPART_CONFIG_INVALID); partsParseException = new IOException( diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index a61130c..5885b02 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -822,10 +822,24 @@ public class StandardContext extends ContainerBase private final AtomicLong inProgressAsyncCount = new AtomicLong(0); +private boolean createUploadTargets = false; + // - Context Properties @Override +public void setCreateUploadTargets(boolean createUploadTargets) { +this.createUploadTargets
[tomcat] branch 8.5.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63206
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 The following commit(s) were added to refs/heads/8.5.x by this push: new a3277bb Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63206 a3277bb is described below commit a3277bb34b5307edf477c377a06be884bb39ee4a Author: Mark Thomas AuthorDate: Tue Mar 5 13:15:23 2019 + Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63206 Add createUploadTargets to Context # Conflicts: # java/org/apache/catalina/connector/LocalStrings.properties --- java/org/apache/catalina/Context.java | 22 ++ .../catalina/connector/LocalStrings.properties | 2 ++ java/org/apache/catalina/connector/Request.java| 9 + java/org/apache/catalina/core/StandardContext.java | 14 ++ .../org/apache/catalina/startup/FailedContext.java | 5 + test/org/apache/tomcat/unittest/TesterContext.java | 5 + webapps/docs/changelog.xml | 7 +++ webapps/docs/config/context.xml| 7 +++ 8 files changed, 71 insertions(+) diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java index 23e43b9..8471fa4 100644 --- a/java/org/apache/catalina/Context.java +++ b/java/org/apache/catalina/Context.java @@ -1901,4 +1901,26 @@ public interface Context extends Container, ContextBind { public void decrementInProgressAsyncCount(); + + +/** + * Configure whether Tomcat will attempt to create an upload target used by + * this web application if it does not exist when the web application + * attempts to use it. + * + * @param createUploadTargets {@code true} if Tomcat should attempt to + * create the upload target, otherwise {@code false} + */ +public void setCreateUploadTargets(boolean createUploadTargets); + + +/** + * Will Tomcat attempt to create an upload target used by this web + * application if it does not exist when the web application attempts to use + * it? + * + * @return {@code true} if Tomcat will attempt to create an upload target + * otherwise {@code false} + */ +public boolean getCreateUploadTargets(); } diff --git a/java/org/apache/catalina/connector/LocalStrings.properties b/java/org/apache/catalina/connector/LocalStrings.properties index e8ebf6f..b70b187 100644 --- a/java/org/apache/catalina/connector/LocalStrings.properties +++ b/java/org/apache/catalina/connector/LocalStrings.properties @@ -50,6 +50,8 @@ coyoteRequest.postTooLarge=Parameters were not parsed because the size of the po coyoteRequest.chunkedPostTooLarge=Parameters were not parsed because the size of the posted data was too big. Because this request was a chunked request, it could not be processed further. Use the maxPostSize attribute of the connector to resolve this if the application should accept large POSTs. coyoteRequest.alreadyAuthenticated=This request has already been authenticated coyoteRequest.authenticate.ise=Cannot call authenticate() after the response has been committed +coyoteRequest.uploadCreate=Creating the temporary upload location [{0}] as it is required by the servlet [{1}] +coyoteRequest.uploadCreateFail=Failed to create the upload location [{0}] coyoteRequest.uploadLocationInvalid=The temporary upload location [{0}] is not valid coyoteRequest.sessionEndAccessFail=Exception triggered ending access to session while recycling request coyoteRequest.sendfileNotCanonical=Unable to determine canonical name of file [{0}] specified for use with sendfile diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java index 92e279f..8aed515 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -2867,6 +2867,15 @@ public class Request implements org.apache.catalina.servlet4preview.http.HttpSer } } +if (!location.exists() && context.getCreateUploadTargets()) { +log.warn(sm.getString("coyoteRequest.uploadCreate", +location.getAbsolutePath(), getMappingData().wrapper.getName())); +if (!location.mkdirs()) { +log.warn(sm.getString("coyoteRequest.uploadCreateFail", +location.getAbsolutePath())); +} +} + if (!location.isDirectory()) { parameters.setParseFailedReason(FailReason.MULTIPART_CONFIG_INVALID); partsParseException = new IOException( diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 298b006..7533d77 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/
[tomcat] branch 7.0.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63206
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new 6e3551b Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63206 6e3551b is described below commit 6e3551b7ff2623ee89a179beeb63f62f2e8d6d37 Author: Mark Thomas AuthorDate: Tue Mar 5 13:15:23 2019 + Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63206 Add createUploadTargets to Context # Conflicts: # java/org/apache/catalina/connector/LocalStrings.properties # Conflicts: # webapps/docs/changelog.xml --- java/org/apache/catalina/Context.java | 22 ++ .../catalina/connector/LocalStrings.properties | 2 ++ java/org/apache/catalina/connector/Request.java| 9 + java/org/apache/catalina/core/StandardContext.java | 14 ++ .../org/apache/catalina/startup/FailedContext.java | 5 + test/org/apache/tomcat/unittest/TesterContext.java | 5 + webapps/docs/changelog.xml | 11 +++ webapps/docs/config/context.xml| 7 +++ 8 files changed, 75 insertions(+) diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java index 1503b91..c4409d0 100644 --- a/java/org/apache/catalina/Context.java +++ b/java/org/apache/catalina/Context.java @@ -1765,4 +1765,26 @@ public interface Context extends Container { public void decrementInProgressAsyncCount(); + + +/** + * Configure whether Tomcat will attempt to create an upload target used by + * this web application if it does not exist when the web application + * attempts to use it. + * + * @param createUploadTargets {@code true} if Tomcat should attempt to + * create the upload target, otherwise {@code false} + */ +public void setCreateUploadTargets(boolean createUploadTargets); + + +/** + * Will Tomcat attempt to create an upload target used by this web + * application if it does not exist when the web application attempts to use + * it? + * + * @return {@code true} if Tomcat will attempt to create an upload target + * otherwise {@code false} + */ +public boolean getCreateUploadTargets(); } diff --git a/java/org/apache/catalina/connector/LocalStrings.properties b/java/org/apache/catalina/connector/LocalStrings.properties index 923824c..a6c8efe 100644 --- a/java/org/apache/catalina/connector/LocalStrings.properties +++ b/java/org/apache/catalina/connector/LocalStrings.properties @@ -73,6 +73,8 @@ coyoteRequest.postTooLarge=Parameters were not parsed because the size of the po coyoteRequest.chunkedPostTooLarge=Parameters were not parsed because the size of the posted data was too big. Because this request was a chunked request, it could not be processed further. Use the maxPostSize attribute of the connector to resolve this if the application should accept large POSTs. coyoteRequest.alreadyAuthenticated=This request has already been authenticated coyoteRequest.authenticate.ise=Cannot call authenticate() after the response has been committed +coyoteRequest.uploadCreate=Creating the temporary upload location [{0}] as it is required by the servlet [{1}] +coyoteRequest.uploadCreateFail=Failed to create the upload location [{0}] coyoteRequest.uploadLocationInvalid=The temporary upload location [{0}] is not valid coyoteRequest.sessionEndAccessFail=Exception triggered ending access to session while recycling request coyoteRequest.sendfileNotCanonical=Unable to determine canonical name of file [{0}] specified for use with sendfile diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java index 815daee..8a18bc9 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -2874,6 +2874,15 @@ implements HttpServletRequest { } } +if (!location.exists() && context.getCreateUploadTargets()) { +log.warn(sm.getString("coyoteRequest.uploadCreate", +location.getAbsolutePath(), getMappingData().wrapper.getName())); +if (!location.mkdirs()) { +log.warn(sm.getString("coyoteRequest.uploadCreateFail", +location.getAbsolutePath())); +} +} + if (!location.isDirectory()) { parameters.setParseFailedReason(FailReason.MULTIPART_CONFIG_INVALID); partsParseException = new IOException( diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 21addb4..0de8aad 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/co
[Bug 63206] Try to create parent directories before writing an uploaded file to disk
https://bz.apache.org/bugzilla/show_bug.cgi?id=63206 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #9 from Mark Thomas --- Fixed in: - trunk for 9.0.17 onwards - 8.5.x for 8.5.39 onwards - 7.0.x for 7.0.94 onwards New attribute on Context: createUploadTargets Defaults to false -- 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
[tomcat] branch master updated (267b8d8 -> b35d947)
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 267b8d8 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63206 new 6220f11 Update French translations new 86d03a8 Update Korean translations new e6df3b8 Update Japanese translations new f2fd6c0 Update Spanish translations new 77bb2be Update Chinese (Simplified) translations new e13a65a Update Czech translations new b433299 Update Russian translations new b35d947 Add credit for translations to 2019-03-05 The 20604 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/javax/el/LocalStrings_cs.properties | 1 + java/javax/el/LocalStrings_es.properties | 1 + java/javax/el/LocalStrings_zh_CN.properties | 3 +++ java/javax/servlet/http/LocalStrings_es.properties| 1 + .../catalina/authenticator/LocalStrings_es.properties | 1 + .../catalina/connector/LocalStrings_cs.properties | 1 + .../catalina/connector/LocalStrings_es.properties | 3 +++ .../catalina/connector/LocalStrings_zh_CN.properties | 2 ++ .../apache/catalina/core/LocalStrings_cs.properties | 7 +++ .../apache/catalina/core/LocalStrings_es.properties | 5 + .../catalina/core/LocalStrings_zh_CN.properties | 1 + .../apache/catalina/deploy/LocalStrings_es.properties | 1 + .../catalina/filters/LocalStrings_es.properties | 1 + .../catalina/ha/deploy/LocalStrings_cs.properties | 1 + .../catalina/ha/deploy/LocalStrings_es.properties | 7 +++ .../catalina/ha/session/LocalStrings_cs.properties| 2 ++ .../catalina/ha/session/LocalStrings_es.properties| 2 ++ .../apache/catalina/ha/tcp/LocalStrings_cs.properties | 2 ++ .../apache/catalina/ha/tcp/LocalStrings_es.properties | 1 + .../apache/catalina/loader/LocalStrings_es.properties | 2 ++ .../catalina/manager/LocalStrings_cs.properties | 4 .../catalina/manager/LocalStrings_es.properties | 5 + .../catalina/manager/LocalStrings_ru.properties | 2 +- .../catalina/manager/host/LocalStrings_es.properties | 3 ++- .../catalina/manager/host/LocalStrings_fr.properties | 2 ++ .../manager/host/LocalStrings_zh_CN.properties| 2 ++ .../apache/catalina/mapper/LocalStrings_cs.properties | 1 + .../LocalStrings_es.properties| 2 +- .../LocalStrings_zh_CN.properties | 2 +- .../apache/catalina/realm/LocalStrings_cs.properties | 3 +++ .../apache/catalina/realm/LocalStrings_es.properties | 1 + .../catalina/servlets/LocalStrings_es.properties | 4 .../catalina/session/LocalStrings_cs.properties | 2 ++ .../catalina/session/LocalStrings_es.properties | 2 ++ .../catalina/startup/LocalStrings_cs.properties | 7 +++ .../catalina/startup/LocalStrings_es.properties | 6 ++ .../catalina/startup/LocalStrings_zh_CN.properties| 2 ++ .../catalina/tribes/group/LocalStrings_es.properties | 3 +++ .../group/interceptors/LocalStrings_es.properties | 3 +++ .../group/interceptors/LocalStrings_zh_CN.properties | 1 + .../catalina/tribes/io/LocalStrings_es.properties | 1 + .../tribes/jmx}/LocalStrings_es.properties| 2 +- .../tribes/membership/LocalStrings_cs.properties | 1 + .../tribes/membership/LocalStrings_es.properties | 3 +++ .../tribes/membership/LocalStrings_fr.properties | 1 + .../tribes/membership/LocalStrings_zh_CN.properties | 2 ++ .../membership/cloud/LocalStrings_es.properties | 3 +++ .../tribes/transport/LocalStrings_es.properties | 1 + .../tribes/transport/bio/LocalStrings_es.properties | 4 .../tribes/transport/nio/LocalStrings_cs.properties | 5 + .../tribes/transport/nio/LocalStrings_es.properties | 8 .../catalina/tribes/util/LocalStrings_cs.properties | 2 ++ .../catalina/tribes/util/LocalStrings_es.properties | 1 + .../apache/catalina/users/LocalStrings_es.properties | 1 + .../apache/catalina/util/LocalStrings_es.properties | 4 .../apache/catalina/valves/LocalStrings_cs.properties | 3 +++ .../apache/catalina/valves/LocalStrings_es.properties | 5 + .../catalina/webresources/LocalStrings_es.properties | 4 java/org/apache/coyote/LocalStrings_cs.properties | 4 +++- .../apache/coyote/http11/LocalStrings_cs.properties | 1 + .../apache/coyote/http11/LocalStrings_es.properties | 3 +++ .../apache/coyote/http2/LocalStrings_cs.properties| 2 ++ .../apache/coyote/http2/LocalStrings_es.properties| 19 +++ .../apache/coyote/http2/LocalStrings_zh_CN.properties | 3 +++ .../jasper/re
Re: [tomcat] branch master updated (267b8d8 -> b35d947)
Am 05.03.2019 um 14:45 schrieb ma...@apache.org: 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 267b8d8 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63206 new 6220f11 Update French translations new 86d03a8 Update Korean translations new e6df3b8 Update Japanese translations new f2fd6c0 Update Spanish translations new 77bb2be Update Chinese (Simplified) translations new e13a65a Update Czech translations new b433299 Update Russian translations new b35d947 Add credit for translations to 2019-03-05 The 20604 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. Hopefully not :) Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] csutherl merged pull request #141: Update BUILDING and CONTRIBUTING docs after the svn->git migration.
csutherl merged pull request #141: Update BUILDING and CONTRIBUTING docs after the svn->git migration. URL: https://github.com/apache/tomcat/pull/141 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update BUILDING and CONTRIBUTING docs after the svn->git migration
This is an automated email from the ASF dual-hosted git repository. csutherl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new f1cc7fc Update BUILDING and CONTRIBUTING docs after the svn->git migration new 5e28428 Merge pull request #141 from csutherl/master f1cc7fc is described below commit f1cc7fcefa844b13622812e9fd875b18f68b0df7 Author: Coty Sutherland AuthorDate: Fri Mar 1 13:50:03 2019 -0500 Update BUILDING and CONTRIBUTING docs after the svn->git migration --- BUILDING.txt| 10 +- CONTRIBUTING.md | 47 ++- 2 files changed, 23 insertions(+), 34 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index 77fd6c8..331184a 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -93,13 +93,13 @@ source distribution, do the following: (3.1) Checkout or obtain the source code for Tomcat @VERSION_MAJOR_MINOR@ -Checkout the source using SVN, selecting a tag for released version or -trunk for the current development code, or download and unpack a source +Clone the source using git, then checkout a specific major branch or +master for the latest code development, or download and unpack a source package. - * Tomcat SVN repository URL: + * Tomcat GitHub repository URL: - https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/ +https://github.com/apache/tomcat * Source packages can be downloaded from: @@ -184,7 +184,7 @@ each release package has the appropriate line-endings. (4) Updating sources and rebuilding It is recommended that you regularly update the downloaded Tomcat @VERSION_MAJOR_MINOR@ -sources using your SVN client. +sources using your git client. For a quick rebuild of only modified code you can use: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a13c5c9..74eac26 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ # Contributing to Apache Tomcat Firstly, thanks for your interest in contributing! I hope that this will be a -pleasant first experience for you, and that you will return to continue +pleasant experience for you, and that you will return to continue contributing. Please visit our [Get Involved page](https://tomcat.apache.org/getinvolved.html) @@ -38,12 +38,12 @@ the issues marked 'Beginner', link below. Please note that the Beginner keyword is pretty new to the project, so if there aren't any issues in the filter feel free to ask on the [dev list](https://tomcat.apache.org/lists.html#tomcat-dev). -* [Beginner issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=Beginner&keywords_type=allwords&list_id=160824&product=Tomcat%207&product=Tomcat%208&product=Tomcat%209&query_format=advanced) - +* [Beginner issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=Beginner&keywords_type=allwords&list_id=160824&product=Tomcat%207&product=Tomcat%208.5&product=Tomcat%209&query_format=advanced) - issues which should only require a few lines of code, and a test or two to resolve. The list above shows all bugs that are marked 'Beginner' and are open in the -currently supported Tomcat versions (7, 8, and 9). +currently supported Tomcat versions (7, 8.5, and 9). If you prefer C over Java, you may also take a look at the tomcat-native and Tomcat Connectors products in Bugzilla. @@ -57,11 +57,8 @@ committers of the project for review and acceptance. You can provide a patch in one of the following ways (in order of preference): +* GitHub Pull Request * Patch attachment to the Bugzilla issue -* Github Pull Request -> **Note:** Github is a mirror of the SVN repository that Tomcat is stored in -and therefore it can't be merged outright. Your contribution will be converted -into an SVN patch and committed with a mention of your name for credit. * Email the patch to the developer list. This is not preferred, but if no bug is associated with the patch, or you would like a developer review, an email may be appropriate. @@ -73,51 +70,43 @@ source code. ## Download The Source Distribution -This method works if you want to submit a patch (like you would do for SVN), but +This method works if you want to submit a patch via email, but the difference in using the sources distribution and a VCS is that you have to manually generate the patch file by using diff. If this is what you want, you can download the sources from the "Source Code Distributions" section of the Download Page. There is one such page for every major Tomcat version: + - [Tomcat 9](https://tomcat.apache.org/download-90.cgi) - [Tomcat 8](https://tomcat.apache.org/download-80.cgi) - [Tomcat 7](https://tomcat.apache.org/download-70.cgi) -## SVN +# Manual Patch Generation
Re: [tomcat] branch master updated (267b8d8 -> b35d947)
On 05/03/2019 13:54, Rainer Jung wrote: > Am 05.03.2019 um 14:45 schrieb ma...@apache.org: >> 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 267b8d8 Fix >> https://bz.apache.org/bugzilla/show_bug.cgi?id=63206 >> new 6220f11 Update French translations >> new 86d03a8 Update Korean translations >> new e6df3b8 Update Japanese translations >> new f2fd6c0 Update Spanish translations >> new 77bb2be Update Chinese (Simplified) translations >> new e13a65a Update Czech translations >> new b433299 Update Russian translations >> new b35d947 Add credit for translations to 2019-03-05 >> >> The 20604 revisions listed above as "new" are entirely new to this >> repository and will be described in separate emails. > > Hopefully not :) There is a glitch in the Git Mailer. I thought infra fixed it last week but it looks like it is back. I'll open a ticket. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] csutherl commented on issue #141: Update BUILDING and CONTRIBUTING docs after the svn->git migration.
csutherl commented on issue #141: Update BUILDING and CONTRIBUTING docs after the svn->git migration. URL: https://github.com/apache/tomcat/pull/141#issuecomment-469688472 I've accepted the PR and will follow up on the dev@ list with a discussion on an `svn:eol-style` equivalent. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1279 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] 6e3551b7ff2623ee89a179beeb63f62f2e8d6d37 Blamelist: Mark Thomas BUILD FAILED: failed compile Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63206] Try to create parent directories before writing an uploaded file to disk
https://bz.apache.org/bugzilla/show_bug.cgi?id=63206 --- Comment #10 from Remy Maucherat --- (In reply to Andy Wilkinson from comment #3) > > Tomcat shouldn't be creating directories unless explicitly directed to do > > so. > > That seems a little arbitrary to apply that rule in this case. Tomcat > already creates directories in several places. A few examples from a > non-exhaustive search of the codebase: > > - JspCompilationContext will create the output directory if needed during > JSP compilation [1] > - Tomcat will create the base directory during startup if needed [2] > - StandardContext will create its work directory if needed [3] The examples are misleading: - Per webapp folders will always be automatically created (obviously), this is part of the webapp deployment process - For the last one (the main folder), this is probably a relic of old days and we might not do it right now as it's not actually very useful -- 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
Git Migration: What is the svn:eol-style equilvalent?
Hi, I updated the BUILDING and CONTRIBUTING documents so that GitHub users no longer see instructions for SVN after our migration, however I had a few questions. Does anyone know of a git equivalent to svn:eol-style that we should be using? It is mentioned in the "git-svn quirks" section of https://wiki.apache.org/general/GitAtApache, but before trying it I wanted to get some feedback from everyone. Secondly, the SVN references in MERGE.txt should be cleaned up at this point, right? Is the git section still up to date (I see it was updated last on Jan 29, so probably)? Thanks! Coty
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4110 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] b35d94711dcb8539ec5b6274e5e762ada7d4264f Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: ws police
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 The following commit(s) were added to refs/heads/master by this push: new 3048c58 ws police 3048c58 is described below commit 3048c58f622ebcc20cb370f828eb472b18820e3b Author: Mark Thomas AuthorDate: Tue Mar 5 14:49:53 2019 + ws police --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 74eac26..58ea4f9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,7 +84,7 @@ Download Page. There is one such page for every major Tomcat version: If you have chosen to attach a patch to the Bugzilla issue (or email one), then you'll need to download the sources as noted above, make your -desired changes and then manually generate your patch using diff (other +desired changes and then manually generate your patch using diff (other other tool). # GitHub - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: ws police
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 The following commit(s) were added to refs/heads/master by this push: new ebde6fe ws police ebde6fe is described below commit ebde6feadcddea10814d326bf3accfe31dea8b67 Author: Mark Thomas AuthorDate: Tue Mar 5 14:53:15 2019 + ws police --- .../catalina/tribes/membership/cloud/LocalStrings_es.properties | 2 +- java/org/apache/coyote/http2/LocalStrings_es.properties | 4 ++-- java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties| 2 +- java/org/apache/tomcat/websocket/LocalStrings_es.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties index a8c094c..440aabf 100644 --- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties +++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties @@ -18,4 +18,4 @@ abstractStream.trustManagerError=No se pudo crear el administrador de confianza cloudMembershipService.stopFail=No se pudo detener el servicio de miembros estáticos, nivel: [{0}] -kubernetesMembershipProvider.invalidPod=Algunos atributos requeridos faltan en el Pod +kubernetesMembershipProvider.invalidPod=Algunos atributos requeridos faltan en el Pod diff --git a/java/org/apache/coyote/http2/LocalStrings_es.properties b/java/org/apache/coyote/http2/LocalStrings_es.properties index b4ad738..5f57c9a 100644 --- a/java/org/apache/coyote/http2/LocalStrings_es.properties +++ b/java/org/apache/coyote/http2/LocalStrings_es.properties @@ -27,7 +27,7 @@ hpack.invalidCharacter=El carácter Unicode [{0}] en el punto del código [{1}] http2Parser.headerLimitSize=Conexión [{0}], Flujo [{1}], Tamaño total de la cabecera my grade http2Parser.headers.wrongStream=La conexión [{0}], tiene cabeceras en progreso para stream [{1}] pero un frame para stream [{2}] fue recibido -http2Parser.preface.invalid=Se presentó un prefacio de conexión inválido [{0}] +http2Parser.preface.invalid=Se presentó un prefacio de conexión inválido [{0}] http2Parser.processFrameData.window=Conexión [{0}], El cliente mandó más datos que los permitidos por el flujo de ventana. http2Parser.processFrameHeaders.decodingDataLeft=Datos sobrantes luego de decodificar HPACK - Estos datos se deberían haber consumido http2Parser.processFramePushPromise=Conexión [{0}], Flujo [{1}], Push promise frames no deben ser enviadas por el cliente @@ -35,7 +35,7 @@ http2Parser.processFramePushPromise=Conexión [{0}], Flujo [{1}], Push promise f stream.closed=Conexión [{0}], Flujo [{1}], Imposible escribir en el flujo una vez que ha sido crear stream.header.debug=Conexión [{0}], Flujo [{1}], cabecera HTTP [{2}], Valor [{3}]\n stream.header.noPath=Conexión [{0}], Flujo [{1}], El [:path] de la seudo cabecera estaba vacía -stream.header.unknownPseudoHeader=Conexión [{0}], Flujo [{1}], Se recibió una Pseudo cabecera desconocida [{2}] +stream.header.unknownPseudoHeader=Conexión [{0}], Flujo [{1}], Se recibió una Pseudo cabecera desconocida [{2}] stream.inputBuffer.reset=Reinicio de flujo stream.inputBuffer.signal=Se adicionaron datos al inBuffer cuando el hilo esta esperando. Señalizando al hilo que a continuar stream.reprioritisation.debug=Conexión [{0}], Flujo [{1}], Exclusivo [{2}], Padre [{3}], Peso [{4}] diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties b/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties index 1f0e35b..ee9f792 100644 --- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties +++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties @@ -19,7 +19,7 @@ engine.noSession=El identificador de la sesión SSL no está disponible engine.openSSLError=Error de OpenSSL: [{0}] mensage: [{1}]\n engine.writeToSSLFailed=Fallo al escribir hacia SSL, resultado: [{0}] -keyManager.nullCertificateChain=Cadena de certificado nulo +keyManager.nullCertificateChain=Cadena de certificado nulo openssl.addedClientCaCert=Ceritifcado CA de cliente adicionado: [{0}] openssl.trustManagerMissing=No se encontró un manejador confiable diff --git a/java/org/apache/tomcat/websocket/LocalStrings_es.properties b/java/org/apache/tomcat/websocket/LocalStrings_es.properties index 741a33a..3103366 100644 --- a/java/org/apache/tomcat/websocket/LocalStrings_es.properties +++ b/java/org/apache/tomcat/websocket/LocalStrings_es.properties @@ -19,7 +19,7 @@ perMessageDeflate.duplicateParameter=La definición del parámetro de extención perMessageDeflate.invalidWindowSize=Una ventana inválida de tamaño [{1}] fue especificada para [{0}]. Los valores válidos son números entre 8 y 15 incluyendo los extremos. util.notToken=Un par
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4111 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 5e284283bac15530c6c34017e79d87e13fc8ef5b Blamelist: Coty Sutherland ,Coty Sutherland Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63213] Logging Unbalanced parenthesis error in catalina log during user login
https://bz.apache.org/bugzilla/show_bug.cgi?id=63213 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #4 from Mark Thomas --- I've been able to test this with the latest 9.0.x. The bug is still present. I'm working on a fix. -- 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
[tomcat] branch master updated: Fix edge case causing a missing initial notification
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new e4f2ee2 Fix edge case causing a missing initial notification e4f2ee2 is described below commit e4f2ee28babfd53b4d0141e78ecd0eb3836a4296 Author: remm AuthorDate: Tue Mar 5 16:28:55 2019 +0100 Fix edge case causing a missing initial notification This could be seen on CI #4110, which I managed to reproduce. Hopefully will not cause regressions. --- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index 3b0e3d5..bba8d97 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -1504,19 +1504,19 @@ public class Nio2Endpoint extends AbstractJsseEndpoint 0) { +// Special case where the read completes inline, there is no notification +// in that case and it cannot happen elsewhere + getEndpoint().processSocket(Nio2SocketWrapper.this, SocketEvent.OPEN_READ, true); } +} catch (IOException e) { +// Will never happen +setError(e); } -} else { -readInterest = true; } } } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix edge case causing a missing initial notification
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new e450a49 Fix edge case causing a missing initial notification e450a49 is described below commit e450a49d8a6ee4f7243b2f7b0773c0ecce4b8406 Author: remm AuthorDate: Tue Mar 5 16:28:55 2019 +0100 Fix edge case causing a missing initial notification This could be seen on CI #4110, which I managed to reproduce. Hopefully will not cause regressions. --- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index 226e421..b551659 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -1472,19 +1472,19 @@ public class Nio2Endpoint extends AbstractJsseEndpoint { if (readNotify) { return; } +readInterest = true; if (readPending.tryAcquire()) { // No read pending, so await bytes -synchronized (readCompletionHandler) { -readInterest = true; -try { -fillReadBuffer(false); -} catch (IOException e) { -// Will never happen -setError(e); +try { +if (fillReadBuffer(false) > 0) { +// Special case where the read completes inline, there is no notification +// in that case and it cannot happen elsewhere + getEndpoint().processSocket(Nio2SocketWrapper.this, SocketEvent.OPEN_READ, true); } +} catch (IOException e) { +// Will never happen +setError(e); } -} else { -readInterest = true; } } } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git Migration: What is the svn:eol-style equilvalent?
Coty, On Tue, Mar 5, 2019 at 6:23 AM Coty Sutherland wrote: > Hi, > > I updated the BUILDING and CONTRIBUTING documents so that GitHub users no > longer see instructions for SVN after our migration, however I had a few > questions. Does anyone know of a git equivalent to svn:eol-style that we > should be using? It is mentioned in the "git-svn quirks" section of > https://wiki.apache.org/general/GitAtApache, but before trying it I wanted > to get some feedback from everyone. > Do we use CRLF anywhere or do we always use LF everywhere and only adding the CRLF when archiving as .zip? If we do use CRLF anywhere, can there be a mixture of LF and CRLF in the same file? (I expect not) What about .bat files? I would expect those to always have CRLF, no? Git has a config file called .gitattributes [1] which allows to set the ending according to the file type (pattern), e.g. *.battext eol=crlf Another option to consider is core.eol [2]. Thanks, Igal [1] https://git-scm.com/docs/gitattributes [2] https://git-scm.com/docs/git-config#git-config-coreeol > > Secondly, the SVN references in MERGE.txt should be cleaned up at this > point, right? Is the git section still up to date (I see it was updated > last on Jan 29, so probably)? > > > > Thanks! > Coty >
Re: Git Migration: What is the svn:eol-style equilvalent?
On 05/03/2019 14:23, Coty Sutherland wrote: > Hi, > > I updated the BUILDING and CONTRIBUTING documents so that GitHub users no > longer see instructions for SVN after our migration, however I had a few > questions. Does anyone know of a git equivalent to svn:eol-style that we > should be using? It is mentioned in the "git-svn quirks" section of > https://wiki.apache.org/general/GitAtApache, but before trying it I wanted > to get some feedback from everyone. Reading https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration It looks like we want: Windows: git config --global core.autocrlf true Linux/OSX: git config --global core.autocrlf input > Secondly, the SVN references in MERGE.txt should be cleaned up at this > point, right? Now or the next time we pull in a set of changes. Commons is in the process of moving (has moved?) all the active components to git so there is something to be said for leaving it until we next do a merge and updating then once all of Commons is on Git. > Is the git section still up to date (I see it was updated > last on Jan 29, so probably)? It is. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git Migration: What is the svn:eol-style equilvalent?
On 05/03/2019 17:20, Igal Sapir wrote: > Coty, > > On Tue, Mar 5, 2019 at 6:23 AM Coty Sutherland wrote: > >> Hi, >> >> I updated the BUILDING and CONTRIBUTING documents so that GitHub users no >> longer see instructions for SVN after our migration, however I had a few >> questions. Does anyone know of a git equivalent to svn:eol-style that we >> should be using? It is mentioned in the "git-svn quirks" section of >> https://wiki.apache.org/general/GitAtApache, but before trying it I wanted >> to get some feedback from everyone. >> > > Do we use CRLF anywhere or do we always use LF everywhere and only adding > the CRLF when > archiving as .zip? If we do use CRLF anywhere, can there be a mixture of > LF and CRLF in the > same file? (I expect not) > > What about .bat files? I would expect those to always have CRLF, no? Git > has a config > file called .gitattributes [1] which allows to set the ending according to > the file type (pattern), e.g. > > *.battext eol=crlf > > Another option to consider is core.eol [2]. The svn policy was to always use platform line-endings on checkout (so you could easy edit .bat files on Linux and .sh on Windows) and 'fix' the line endings during the build process. Mark > > Thanks, > > Igal > > [1] https://git-scm.com/docs/gitattributes > [2] https://git-scm.com/docs/git-config#git-config-coreeol > > > >> >> Secondly, the SVN references in MERGE.txt should be cleaned up at this >> point, right? Is the git section still up to date (I see it was updated >> last on Jan 29, so probably)? >> >> >> >> Thanks! >> Coty >> > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63213
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 The following commit(s) were added to refs/heads/master by this push: new 41fd4cc Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63213 41fd4cc is described below commit 41fd4cc3b0b0c44d26c82ae86a8cc4979de80045 Author: Mark Thomas AuthorDate: Tue Mar 5 19:19:32 2019 + Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63213 Ensure the correct escaping of group names when searching for nested groups when the JNDIRealm is configured with roleNested set to true. --- java/org/apache/catalina/realm/JNDIRealm.java | 3 ++- webapps/docs/changelog.xml| 5 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java index d14e612..a518c38 100644 --- a/java/org/apache/catalina/realm/JNDIRealm.java +++ b/java/org/apache/catalina/realm/JNDIRealm.java @@ -2021,7 +2021,8 @@ public class JNDIRealm extends RealmBase { Map newThisRound = new HashMap<>(); // Stores the groups we find in this iteration for (Entry group : newGroups.entrySet()) { -filter = roleFormat.format(new String[] { group.getKey(), group.getValue(), group.getValue() }); +filter = roleFormat.format(new String[] { doRFC2254Encoding(group.getKey()), +group.getValue(), group.getValue() }); if (containerLog.isTraceEnabled()) { containerLog.trace("Perform a nested group search with base "+ roleBase + " and filter " + filter); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 3336cf3..914b36b 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -76,6 +76,11 @@ This ensures that a non-daemon thread is not left running that will prevent Tomcat from shutting down cleanly. (markt) + +63213: Ensure the correct escaping of group names when +searching for nested groups when the JNDIRealm is configured with +roleNested set to true. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63213
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 The following commit(s) were added to refs/heads/8.5.x by this push: new 30d2d07 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63213 30d2d07 is described below commit 30d2d07c4e51c7d52dd8958ecdcdf539a3eb32b3 Author: Mark Thomas AuthorDate: Tue Mar 5 19:19:32 2019 + Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63213 Ensure the correct escaping of group names when searching for nested groups when the JNDIRealm is configured with roleNested set to true. --- java/org/apache/catalina/realm/JNDIRealm.java | 3 ++- webapps/docs/changelog.xml| 5 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java index 7bc59e9..cb22241 100644 --- a/java/org/apache/catalina/realm/JNDIRealm.java +++ b/java/org/apache/catalina/realm/JNDIRealm.java @@ -2029,7 +2029,8 @@ public class JNDIRealm extends RealmBase { Map newThisRound = new HashMap<>(); // Stores the groups we find in this iteration for (Entry group : newGroups.entrySet()) { -filter = roleFormat.format(new String[] { group.getKey(), group.getValue(), group.getValue() }); +filter = roleFormat.format(new String[] { doRFC2254Encoding(group.getKey()), +group.getValue(), group.getValue() }); if (containerLog.isTraceEnabled()) { containerLog.trace("Perform a nested group search with base "+ roleBase + " and filter " + filter); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 6269449..bdc69cf 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -102,6 +102,11 @@ This ensures that a non-daemon thread is not left running that will prevent Tomcat from shutting down cleanly. (markt) + +63213: Ensure the correct escaping of group names when +searching for nested groups when the JNDIRealm is configured with +roleNested set to true. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63213
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new 2e606a4 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63213 2e606a4 is described below commit 2e606a4824fdd626b28891c3d27dc63e5fdbcb19 Author: Mark Thomas AuthorDate: Tue Mar 5 19:19:32 2019 + Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63213 Ensure the correct escaping of group names when searching for nested groups when the JNDIRealm is configured with roleNested set to true. --- java/org/apache/catalina/realm/JNDIRealm.java | 3 ++- webapps/docs/changelog.xml| 5 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java index 49392eb..ddd07ae 100644 --- a/java/org/apache/catalina/realm/JNDIRealm.java +++ b/java/org/apache/catalina/realm/JNDIRealm.java @@ -2076,7 +2076,8 @@ public class JNDIRealm extends RealmBase { Map newThisRound = new HashMap(); // Stores the groups we find in this iteration for (Entry group : newGroups.entrySet()) { -filter = roleFormat.format(new String[] { group.getKey(), group.getValue(), group.getValue() }); +filter = roleFormat.format(new String[] { doRFC2254Encoding(group.getKey()), +group.getValue(), group.getValue() }); if (containerLog.isTraceEnabled()) { containerLog.trace("Perform a nested group search with base "+ roleBase + " and filter " + filter); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 50b06f5..438bc5e 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -68,6 +68,11 @@ location specified by the Servlet does not already exist. The deafult value is false. (markt) + +63213: Ensure the correct escaping of group names when +searching for nested groups when the JNDIRealm is configured with +roleNested set to true. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63213] Logging Unbalanced parenthesis error in catalina log during user login
https://bz.apache.org/bugzilla/show_bug.cgi?id=63213 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #5 from Mark Thomas --- Thanks for the report. Fixed in: - trunk for 9.0.17 onwards - 8.5.x for 8.5.39 onwards - 7.0.x for 7.0.94 onwards -- 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: Tomcat Site Redesign
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 3/4/19 01:02, Igal Sapir wrote: > I have uploaded the Tomcat site redesign to a temporary location > for review: http://people.apache.org/~isapir/mockups/tomcat-site/ > > The source can be seen at https://github.com/isapir/tomcat-website > > This includes all of the pages for the website, but not the > documentation for the different versions, connector, native, > webapps, etc. as of yet. > > There are three things that I would like to discuss: > > 1) Feedback, especially if anything is broken or doesn't look > right. If we have "Download | Changelog for x.y.z" for tcnative, we should have it for Tomcat itself. The links are indeed there... they are just buried in the text above the "Download" link. Let's be consistent if possible. > 2) I can concatenate some resource files etc., but it would be much > better> to switch to HTTP/2. Why, exactly? Scripting the forced-download of a few dependent resources is more work than ... not doing that. > 3) We should create a repo for the site, e.g. tomcat-site or > tomcat-website. Do you mean in git? There is already a repo for the site in Subversion: https://svn.apache.org/repos/asf/tomcat/site/trunk - -chris -BEGIN PGP SIGNATURE- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlx+0tYACgkQHPApP6U8 pFiTIQ/+Ly/+GhpBkPV61w7SdvFXxv8YCPofueEle6d3djYuQ7tSZGIaIVPopPux XqmWxGF017EviNXVG0C67sKnqbqQEG9F3b20s4hBQc0HR9m9w8682dZRgzSpd7d3 s2vJlYr/OQou5wEbA+ma4npLKSSHFVl8Skvk0pNCTpPfxL76rpKLbSRuwirel7zA op3h80vVrODQgofZ2PaIWQKPEKxt4Re5Yk8/oqGZJ/z7YpNQr2511LPxE528ULPE Lz0C9atD7hOByTTzf8L+UfZbIfIkh6uBidmRq25DYvXoMJ+c/uFYYvhsi9e22ztI 70DjXKSRTp2E0STFFICsiN1BAhOYoXQ2WXv+xLpoBJ0klyRhpRCduvVuS6JhHecy M2/s2D7k4lJjsZMtkp76nrXaYwEWj/s2xRMJ816WuDYWWzJ4mIW8rdpNoYHhvrB4 Uc8ym6QI29IgLJXGsymv8FWFVsxzXgHVus3YilVX05lEDAi/KdX3CqNi3QhmzrOm FWU+EOcn/CBS3EkDT5FVJCM6LZi5fLWtX/dOFqUEoRCo7tnADPFPS8NTRum6sa9T K7rOXrmIMNiImRUaOVH7/R+5GJ69DEm2+aPj+AGVX0r6aX8IgfVCfFWaN2Faw/TQ TfhRijPNtbT6WKjJWdARSRpLbSqZSTmN27wl4cERnGsLH9Z4xq4= =nzbr -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4114 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 41fd4cc3b0b0c44d26c82ae86a8cc4979de80045 Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat Site Redesign
On 05/03/2019 19:49, Christopher Schultz wrote: > Igal, > > On 3/4/19 01:02, Igal Sapir wrote: >> I have uploaded the Tomcat site redesign to a temporary location >> for review: http://people.apache.org/~isapir/mockups/tomcat-site/ > >> The source can be seen at https://github.com/isapir/tomcat-website > >> This includes all of the pages for the website, but not the >> documentation for the different versions, connector, native, >> webapps, etc. as of yet. > >> There are three things that I would like to discuss: > >> 1) Feedback, especially if anything is broken or doesn't look >> right. > > If we have "Download | Changelog for x.y.z" for tcnative, we should > have it for Tomcat itself. The links are indeed there... they are just > buried in the text above the "Download" link. Let's be consistent if > possible. > >> 2) I can concatenate some resource files etc., but it would be much >> better> to switch to HTTP/2. > > Why, exactly? Scripting the forced-download of a few dependent > resources is more work than ... not doing that. And, with client-side caching, very hard to get right. Mark > >> 3) We should create a repo for the site, e.g. tomcat-site or >> tomcat-website. > > Do you mean in git? There is already a repo for the site in Subversion: > https://svn.apache.org/repos/asf/tomcat/site/trunk > > -chris > > - > 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 63191] RemoteEndpoint.Async#sendText(String, SendHandler) never calls the callback
https://bz.apache.org/bugzilla/show_bug.cgi?id=63191 --- Comment #9 from Mark Thomas --- It is not clear that Tomcat not calling the callback for Async.sendText() is the cause of CometD failing to complete a Promise rather than the other way around. With Callbacks triggering the sending of new messages it is possible some sort of deadlock is entered but it isn't clear what the sequence of events leading to this issue is at this point. Until we know that any attempt to fix this issue is going to be largely guess work. Knowing the sort of thing that is happening, we can do a code inspection and try and find potential deadlocks but - if the issue is in Tomcat - finding it that way is going to involve a large amount of luck. -- 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 63223] org.apache.coyote.http2.Http2UpgradeHandler.pruneClosedStreams
https://bz.apache.org/bugzilla/show_bug.cgi?id=63223 --- Comment #3 from Mark Thomas --- We can look at reducing the logging frequency but the remainder of this issue belongs on the users@ list for now. -- 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: Tomcat Site Redesign
Chris, Thank you for the feedback: On Tue, Mar 5, 2019 at 11:49 AM Christopher Schultz < ch...@christopherschultz.net> wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Igal, > > On 3/4/19 01:02, Igal Sapir wrote: > > I have uploaded the Tomcat site redesign to a temporary location > > for review: http://people.apache.org/~isapir/mockups/tomcat-site/ > > > > The source can be seen at https://github.com/isapir/tomcat-website > > > > This includes all of the pages for the website, but not the > > documentation for the different versions, connector, native, > > webapps, etc. as of yet. > > > > There are three things that I would like to discuss: > > > > 1) Feedback, especially if anything is broken or doesn't look > > right. > > If we have "Download | Changelog for x.y.z" for tcnative, we should > have it for Tomcat itself. The links are indeed there... they are just > buried in the text above the "Download" link. Let's be consistent if > possible. > +1 for consistency. I did not change the text of the pages, only the layout and L&F. For example, the tables are now styled differently if you look at the Which Version page of the old and new site, and I've added a couple of icons e.g. Download and Bug. We can easily change the text later but I rather my commits be focused on the layout only (as much as possible). > > > 2) I can concatenate some resource files etc., but it would be much > > better> to switch to HTTP/2. > > Why, exactly? Scripting the forced-download of a few dependent > resources is more work than ... not doing that. > I'm not talking about Push, but simply HTTP/2 so that the resources can be downloaded over one connection via multiplexing. I actually made a video about this a few months ago [1]. It is a one time server configuration - no scripting needed. All of the major web servers, including httpd [2], support it. I just checked and even the main apache.org site is using http/1.1. I'm surprised that the Apache websites are not configured already for http/2. > > > 3) We should create a repo for the site, e.g. tomcat-site or > > tomcat-website. > > Do you mean in git? There is already a repo for the site in Subversion: > https://svn.apache.org/repos/asf/tomcat/site/trunk > > Yes, I mean in git. We discussed it last week in another thread. Best, Igal [1] https://youtu.be/jhqrRT4fvOA?t=61 [2] https://httpd.apache.org/docs/2.4/howto/http2.html > - -chris > -BEGIN PGP SIGNATURE- > Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ > > iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlx+0tYACgkQHPApP6U8 > pFiTIQ/+Ly/+GhpBkPV61w7SdvFXxv8YCPofueEle6d3djYuQ7tSZGIaIVPopPux > XqmWxGF017EviNXVG0C67sKnqbqQEG9F3b20s4hBQc0HR9m9w8682dZRgzSpd7d3 > s2vJlYr/OQou5wEbA+ma4npLKSSHFVl8Skvk0pNCTpPfxL76rpKLbSRuwirel7zA > op3h80vVrODQgofZ2PaIWQKPEKxt4Re5Yk8/oqGZJ/z7YpNQr2511LPxE528ULPE > Lz0C9atD7hOByTTzf8L+UfZbIfIkh6uBidmRq25DYvXoMJ+c/uFYYvhsi9e22ztI > 70DjXKSRTp2E0STFFICsiN1BAhOYoXQ2WXv+xLpoBJ0klyRhpRCduvVuS6JhHecy > M2/s2D7k4lJjsZMtkp76nrXaYwEWj/s2xRMJ816WuDYWWzJ4mIW8rdpNoYHhvrB4 > Uc8ym6QI29IgLJXGsymv8FWFVsxzXgHVus3YilVX05lEDAi/KdX3CqNi3QhmzrOm > FWU+EOcn/CBS3EkDT5FVJCM6LZi5fLWtX/dOFqUEoRCo7tnADPFPS8NTRum6sa9T > K7rOXrmIMNiImRUaOVH7/R+5GJ69DEm2+aPj+AGVX0r6aX8IgfVCfFWaN2Faw/TQ > TfhRijPNtbT6WKjJWdARSRpLbSqZSTmN27wl4cERnGsLH9Z4xq4= > =nzbr > -END PGP SIGNATURE- > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Bug 63235] New: Defer potentially expensive Charset.availableCharsets() call
https://bz.apache.org/bugzilla/show_bug.cgi?id=63235 Bug ID: 63235 Summary: Defer potentially expensive Charset.availableCharsets() call Product: Tomcat 9 Version: 9.0.16 Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: pw...@pivotal.io Target Milestone: - The `org.apache.tomcat.util.buf.B2CConverter` class includes a static `encodingToCharsetCache` map populated in a static initializer by calling `Charset.availableCharsets()`. This is quite an expensive operation and it may be unnecessary as calls to `B2CConverter.getCharset` often use the standard `UTF-8` charset. Some local testing shows that if we don't create the cache then we save 157 classes from being loaded and improve startup time. -- 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
[GitHub] [tomcat] philwebb opened a new pull request #142: Defer creation of encodingToCharsetCache
philwebb opened a new pull request #142: Defer creation of encodingToCharsetCache URL: https://github.com/apache/tomcat/pull/142 Defer creation of `encodingToCharsetCache` until absolutely necessary and update `B2CConverter.getCharset` to first attempt a direct lookup using `Charset.forName`. This change helps improve startup time and reduces the number of classes loaded when `B2CConverter` is only called with standard charsets. See https://bz.apache.org/bugzilla/show_bug.cgi?id=63235 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63235] Defer potentially expensive Charset.availableCharsets() call
https://bz.apache.org/bugzilla/show_bug.cgi?id=63235 --- Comment #1 from Phillip Webb --- Pull request for consideration: https://github.com/apache/tomcat/pull/142 -- 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 63236] New: Reduce duplicate Strings
https://bz.apache.org/bugzilla/show_bug.cgi?id=63236 Bug ID: 63236 Summary: Reduce duplicate Strings Product: Tomcat 9 Version: 9.0.16 Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: pw...@pivotal.io Target Milestone: - Some profiling of Tomcat reveals that it currently creates quite a few duplicate String values. Most of these appear to be from objects created when parsing the `mbeans-descriptors.xml` files. For example, `java.lang.String` is a very common `type` attribute. By using a Map technique as describe in https://shipilev.net/jvm/anatomy-quarks/10-string-intern/ we could reduce memory consumption. -- 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
[GitHub] [tomcat] philwebb opened a new pull request #143: Apply deduplication to certain loaded and created Strings
philwebb opened a new pull request #143: Apply deduplication to certain loaded and created Strings URL: https://github.com/apache/tomcat/pull/143 Apply deduplication to certain loaded and created Strings by using a static Map. This applies the same technique as described in https://shipilev.net/jvm/anatomy-quarks/10-string-intern/ to reduce the number of String instances that ultimately contain the same contents. See Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63236 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63236] Reduce duplicate Strings
https://bz.apache.org/bugzilla/show_bug.cgi?id=63236 --- Comment #1 from Phillip Webb --- Pull request available at https://github.com/apache/tomcat/pull/143 -- 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 63237] New: Consider processing mbeans-descriptors.xml at compile time
https://bz.apache.org/bugzilla/show_bug.cgi?id=63237 Bug ID: 63237 Summary: Consider processing mbeans-descriptors.xml at compile time Product: Tomcat 9 Version: 9.0.16 Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: pw...@pivotal.io Target Milestone: - Tomcat currently parses `mbeans-descriptors.xml` files when it first starts to build MBean information. If MBeans could be created directly, rather than by parsing XML then startup time could be improved. This is particularly relevant when using an embedded Tomcat with a serverless architecture. One possible solution might be to parse the XML files during the build process and generate source code that directly creates the required objects. This would save needing to read and parse XML during startup. -- 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
[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x has an issue affecting its community integration. This issue affects 4 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... - tomcat-tc7.0.x-test-bio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... - tomcat-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on junit exists, no need to add for property junit.jar. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Failed to extract fallback artifacts from Gump Repository The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x (Type: Build) Work ended in a state of : Failed Elapsed: 12 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20190306.jar [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar:/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar:/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20190306.jar:/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar - proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/commons-dbcp-1.x/build.xml downloadgz-2: testexist: [echo] Testing for /srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar downloadfile-2: build-deps: build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp build-manifests: build-tomcat-dbcp: compile-prepare: download-validate: validate: compile-java6: [javac] Compiling 1324 source files to /srv/gump/public/workspace/tomcat-7.0.x/output/classes [javac] /srv/gump/public/workspace/tomcat-7.0.x/java/javax/el/ResourceBundleELResolver.java:109: warning: [unchecked] getFeatureDescriptors(ELContext,Object) in ResourceBundleELResolver overrides getFeatureDescriptors(ELContext,Object) in ELResolver [javac] public Iterator getFeatureDescriptors( [javac] ^ [javac] return type requires unchecked conversion from Iterator to Iterator [javac] /srv/gump/public/workspace/tomcat-7.0.x/java/org/apache/catalina/connector/Request.java:2879: error: cannot find symbol [javac] location.getAbsolutePath(), g
[Bug 63237] Consider processing mbeans-descriptors.xml at compile time
https://bz.apache.org/bugzilla/show_bug.cgi?id=63237 Tommy Ludwig changed: What|Removed |Added CC||tommy.ludwig.c...@gmail.com -- 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 63191] RemoteEndpoint.Async#sendText(String, SendHandler) never calls the callback
https://bz.apache.org/bugzilla/show_bug.cgi?id=63191 --- Comment #10 from Boris Petrov --- (In reply to Mark Thomas from comment #9) > It is not clear that Tomcat not calling the callback for Async.sendText() is > the cause of CometD failing to complete a Promise rather than the other way > around. I'm not sure I understand how the other way around is possible. Is "Async.sendText" somehow calling back to user code (before the response callback I mean)? How else could it be possible that someone calling "Async.sendText" is responsible for it not calling the callback? Perhaps we can start digging from there? > Until we know that any attempt to > fix this issue is going to be largely guess work. > > Knowing the sort of thing that is happening, we can do a code inspection and > try and find potential deadlocks but - if the issue is in Tomcat - finding > it that way is going to involve a large amount of luck. OK, please suggest what we do now. I'm not sure how to proceed. How can I help more? Do you have some sort of stress-tests that you can rewrite to use the async connectors/code? I think it should be fairly easy to reproduce the problem seeing how it happens all the time when I try it. -- 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