[jira] [Closed] (MTOMCAT-287) Selenium integration test fails in Jenkins on Windows
[ https://issues.apache.org/jira/browse/MTOMCAT-287?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Dennis Lundberg closed MTOMCAT-287. --- Resolution: Duplicate > Selenium integration test fails in Jenkins on Windows > - > > Key: MTOMCAT-287 > URL: https://issues.apache.org/jira/browse/MTOMCAT-287 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.2 > Environment: Windows 7 >Reporter: Dennis Lundberg >Assignee: Olivier Lamy (*$^¨%`£) > > There seems to be more problems with integration tests on Windows, at least > on ASF Jenkins. This time it is in the Archetype module. The error message > from the failure is: > bq. Failed to execute goal org.codehaus.mojo:selenium-maven-plugin:2.3:xvfb > (xvfb) on project artifact.id-webapp-it: Execution xvfb of goal > org.codehaus.mojo:selenium-maven-plugin:2.3:xvfb failed: Execute failed: > java.io.IOException: Cannot run program "xauth": CreateProcess error=2, The > system cannot find the file specified > See > https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x-windows/2/org.apache.tomcat.maven$tomcat-maven-archetype/ > From what I can tell by searching on it, it is about running Selenium on a > headless Jenkins master/slave. See for instance these links: > http://jenkins-ci.361315.n4.nabble.com/Setting-up-Hudson-with-the-Selenium-Plugin-td1751742.html > http://blog.teamtreehouse.com/easy-automated-web-application-testing-with-hudson-and-selenium > I haven't set up Selenium myself before, so I don't know how to fix that. > Perhaps someone else can give hand. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-279) Snapshot repositiory missing files for 2.3-SNAPSHOT
[ https://issues.apache.org/jira/browse/MTOMCAT-279?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Dennis Lundberg closed MTOMCAT-279. --- Resolution: Invalid > Snapshot repositiory missing files for 2.3-SNAPSHOT > --- > > Key: MTOMCAT-279 > URL: https://issues.apache.org/jira/browse/MTOMCAT-279 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.3 >Reporter: Scott >Assignee: Olivier Lamy (*$^¨%`£) > > I am using the following plugin repository: > > apache.snapshots > Apache Snapshots > http://people.apache.org/repo/m2-snapshot-repository > > false > > > true > > > Here is the error from maven: > [DEBUG] Could not find metadata > org.apache.tomcat.maven:tomcat7-maven-plugin:2.3-SNAPSHOT/maven-metadata.xml > in local (/home/smitchel/.m2/repository) > [DEBUG] Failure to find > org.apache.tomcat.maven:tomcat7-maven-plugin:2.3-SNAPSHOT/maven-metadata.xml > in http://people.apache.org/repo/m2-snapshot-repository was cached in the > local repository, resolution will not be reattempted until the update > interval of apache.snapshots has elapsed or updates are forced > [DEBUG] Could not find metadata > org.apache.tomcat.maven:tomcat7-maven-plugin:2.3-SNAPSHOT/maven-metadata.xml > in local (/home/smitchel/.m2/repository) > [DEBUG] Failure to find > org.apache.tomcat.maven:tomcat7-maven-plugin:2.3-SNAPSHOT/maven-metadata.xml > in http://people.apache.org/repo/m2-snapshot-repository was cached in the > local repository, resolution will not be reattempted until the update > interval of apache.snapshots has elapsed or updates are forced > [WARNING] The POM for > org.apache.tomcat.maven:tomcat7-maven-plugin:jar:2.3-SNAPSHOT is missing, no > dependency information available > I tried deleting my local repo to do a re-download and the issue still exists. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-232) Mapping webapps to "/" does not work
[ https://issues.apache.org/jira/browse/MTOMCAT-232?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Dennis Lundberg closed MTOMCAT-232. --- Resolution: Incomplete > Mapping webapps to "/" does not work > > > Key: MTOMCAT-232 > URL: https://issues.apache.org/jira/browse/MTOMCAT-232 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.1 > Environment: Windows 7, Oracle JDK 1.6 >Reporter: Alessandro Giannone >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: moreinfo > > > This issue is essentially the same as MTOMCAT-133 except that it's specific > to the webapps portion on the configuration. > So if I configure an artifact as a webapp and use the contextPath property to > set the path to "/" then the JSTL libraries will output "/" incorrectly. > If I use the artifactId then the issue doesn't occur. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-292) Broken links on plugin site
Dennis Lundberg created MTOMCAT-292: --- Summary: Broken links on plugin site Key: MTOMCAT-292 URL: https://issues.apache.org/jira/browse/MTOMCAT-292 Project: Apache Tomcat Maven Plugin Issue Type: Bug Affects Versions: 2.2 Reporter: Dennis Lundberg Fix For: 2.3 There are a couple of broken links on the Tomcat 6 plugin site. The wrong default value for Tomcat manager URL is shown in the Tomcat 7 plugin usage page. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-292) Broken links on plugin site
[ https://issues.apache.org/jira/browse/MTOMCAT-292?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Dennis Lundberg updated MTOMCAT-292: Attachment: MTOMCAT-292.patch Here is a patch that fixes this issue. > Broken links on plugin site > --- > > Key: MTOMCAT-292 > URL: https://issues.apache.org/jira/browse/MTOMCAT-292 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug >Affects Versions: 2.2 >Reporter: Dennis Lundberg > Fix For: 2.3 > > Attachments: MTOMCAT-292.patch > > > There are a couple of broken links on the Tomcat 6 plugin site. > The wrong default value for Tomcat manager URL is shown in the Tomcat 7 > plugin usage page. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-292) Broken links on plugin site
[ https://issues.apache.org/jira/browse/MTOMCAT-292?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Dennis Lundberg updated MTOMCAT-292: Labels: patch (was: ) > Broken links on plugin site > --- > > Key: MTOMCAT-292 > URL: https://issues.apache.org/jira/browse/MTOMCAT-292 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug >Affects Versions: 2.2 >Reporter: Dennis Lundberg > Labels: patch > Fix For: 2.3 > > Attachments: MTOMCAT-292.patch > > > There are a couple of broken links on the Tomcat 6 plugin site. > The wrong default value for Tomcat manager URL is shown in the Tomcat 7 > plugin usage page. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-210) Tomcat7 plugin fails in multi module project when test dependencies are present
[
https://issues.apache.org/jira/browse/MTOMCAT-210?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg closed MTOMCAT-210.
---
Resolution: Incomplete
> Tomcat7 plugin fails in multi module project when test dependencies are
> present
> ---
>
> Key: MTOMCAT-210
> URL: https://issues.apache.org/jira/browse/MTOMCAT-210
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.1
>Reporter: Ludwig Magnusson
>Assignee: Olivier Lamy (*$^¨%`£)
> Fix For: moreinfo
>
>
> In a multi module project:
> parent
> - api
> - impl
> - webapp
> Suppose that the impl depends on api with scope compile and on the api tests
> with scope test:
>
> mygroup
> api
> ${project.version}
>
>
> mygroup
> api
> ${project.version}
> tests
> test
>
> This will cause tomcat7:run to fail. It says that it cannot find
> api-tests.jar even though it should not look for it. The plugin works if one
> runs "mvn test-compile tomcat7:run" because now the test classes are included
> in the reactor.
> This bug is not present in the tomcat6 plugin.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-220) Tomcat does not stop listening to given port
[ https://issues.apache.org/jira/browse/MTOMCAT-220?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Dennis Lundberg closed MTOMCAT-220. --- Resolution: Incomplete > Tomcat does not stop listening to given port > > > Key: MTOMCAT-220 > URL: https://issues.apache.org/jira/browse/MTOMCAT-220 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.1 > Environment: java 7; maven 3.0.5; ubuntu 12.10 (quantal) 64-bit >Reporter: Aivaras Ruzveltas >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: moreinfo > > > We have a multimodule Maven project containing many WAR applications: > . > ├── Parent > ├── ChildWar1 > ├── ChildWar2 > └── ... > We want to run integration tests for all of those WAR modules. But after > Tomcat is shutdown (shutdown MOJO at post-integration-test) first module, > main JVM keeps listening to specified port (lsof -i TCP:18082) and when > Tomcat is being started for second WAR module it fails with output: > [INFO] --- tomcat7-maven-plugin:2.1:run-war-only (start-tomcat7) @ ChildWar2 > --- > [INFO] Running war on http://localhost:18082/ChildWar2 > [INFO] Creating Tomcat server configuration at > /somedir/ChildWar2/target/tomcat > [INFO] create webapp with contextPath: /ChildWar2 > Apr 18, 2013 4:36:02 PM org.apache.coyote.AbstractProtocol init > INFO: Initializing ProtocolHandler ["http-bio-18082"] > Apr 18, 2013 4:36:02 PM org.apache.coyote.AbstractProtocol init > SEVERE: Failed to initialize end point associated with ProtocolHandler > ["http-bio-18082"] > java.net.BindException: Address already in use :18082 > at org.apache.tomcat.util.net.JIoEndpoint.bind(JIoEndpoint.java:406) > at > org.apache.tomcat.util.net.AbstractEndpoint.init(AbstractEndpoint.java:610) > at org.apache.coyote.AbstractProtocol.init(AbstractProtocol.java:429) > at > org.apache.coyote.http11.AbstractHttp11JsseProtocol.init(AbstractHttp11JsseProtocol.java:119) > at > org.apache.catalina.connector.Connector.initInternal(Connector.java:981) > at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:102) > at > org.apache.catalina.core.StandardService.initInternal(StandardService.java:559) > at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:102) > at > org.apache.catalina.core.StandardServer.initInternal(StandardServer.java:814) > at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:102) > at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:139) > at org.apache.catalina.startup.Tomcat.start(Tomcat.java:335) > at > org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo.startContainer(AbstractRunMojo.java:1091) > at > org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo.execute(AbstractRunMojo.java:512) > at > org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) > at > org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) > at > org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) > at > org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) > at > org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) > at > org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) > at > org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) > at > org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) > at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) > at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) > at org.apache.maven.cli.MavenCli.execute(MavenCli.java:537) > at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:196) > at org.apache.maven.cli.MavenCli.main(MavenCli.java:141) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at > sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:88) > at > sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:55) > at java.lang.reflect.Method.invoke(Method.java:613) > at > org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290) > at > org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230) > at > org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:409) > at > org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:352) > Caused by: java.net.BindException: Address already in use >
[jira] [Comment Edited] (MTOMCAT-260) Bad default value for maven.tomcat.path
[
https://issues.apache.org/jira/browse/MTOMCAT-260?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14190186#comment-14190186
]
Dennis Lundberg edited comment on MTOMCAT-260 at 3/2/15 8:20 AM:
-
The class {{AbstractExecWarMojo}} overrides the parameter path from its parent
{{AbstractTomcat7Mojo}}, but gives it a different defaultValue. The Javadocs
are also a bit different. If the behavior of the parameter is supposed to be
the same, then just remove the parameter from {{AbstractExecWarMojo}} an let it
use the inherited one.
was (Author: denn...@apache.org):
The class {{AbstractExecWarMojo}} overrides the parameter path from its parent
{{AbstractTomcat7Mojo}}, but gives it a different defaultValue. The Javadocs
are also a bit different. If the behavior of the parameter is supposed to be
the same, then just remove the parameter from {{AbstractExecWarMojo}} an let it
use the inherited on.
> Bad default value for maven.tomcat.path
> ---
>
> Key: MTOMCAT-260
> URL: https://issues.apache.org/jira/browse/MTOMCAT-260
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
>Affects Versions: 2.2
>Reporter: Stephen Buergler
>Priority: Minor
>
> I'm getting:
> {noformat}
> WARNING: A context path must either be an empty string or start with a '/'.
> The path [test] does not meet these criteria and has been changed to [/test]
> {noformat}
> http://tomcat.apache.org/maven-plugin-2.2/tomcat7-maven-plugin/exec-war-only-mojo.html
> Maybe the default for {{maven.tomcat.path}} should be
> '/$\{project.artifactId}' instead of '$\{project.artifactId}'
> Also, why not use '/' ? Maybe the description could elaborate on that more?
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Taglibs sub-site
2015-02-27 18:57 GMT+03:00 Jeremy Boynes : > On Feb 27, 2015, at 3:38 AM, kkoli...@apache.org wrote: >> >> Author: kkolinko >> Date: Fri Feb 27 11:38:13 2015 >> New Revision: 1662662 >> >> URL: http://svn.apache.org/r1662662 >> Log: >> Announcement for Standard Taglib 1.2.3. >> >> I do not like the CVE link (goes to announce@a.o mail archive) and CHANGES >> link (goes to SVN), as I noted in a FIXME comment in index.xml. Any better >> ideas? > > We could add a security-taglibs page to the main site and link from the > security.html page. +1. I think that is how it should be. > I find the frankensite, as Henri called it, a pain in general. I’m thinking > about merging it in with the main Tomcat site source and give it an overhaul > (including moving away from using Maven to build it). > > It integrates Taglibs more with the main Tomcat project structure. Does > anyone have any concern about that? Generally yes, but I see the following concerns: 1) How to maintain the list of changes. It is useful to update it in the same commit when you perform the changes. Well, it can be maintained in project and copied to the site after a release. 2) The site will be absent from the "sources" archive? Generally there is no requirement to include it, and usually the site is updated after a release. But a read-me is needed in the source archive. A changes list is useful to have as well, but not mandatory. 3) Maven can generate some "reports". Are those useful? The current standard taglib page does not use them. The RDC taglib page uses them, but from the look at those "Project Information" pages I think the same information can be represented as several simple pages. An exception is "dependencies" report, if anybody is using it. I am OK without it. It is also possible to keep the site sources in-project and generate it via Ant. (Weak precedents of using different technologies for the code and the site are mod_jk and tc-native. The site is built with Ant. The code uses different tools.) +1 to move site to Ant. +0.5 for everything else. (I'll see how it goes. It is better to review the actual changes). Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-260) Bad default value for maven.tomcat.path
[
https://issues.apache.org/jira/browse/MTOMCAT-260?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg updated MTOMCAT-260:
Attachment: MTOMCAT-260.patch
Here is a patch that removes the redundant and inconsistent
{{maven.tomcat.path}} parameter from {{AbstractExecWarMojo,java}}. Instead it
falls back to the one inherited from {{AbstractTomcat7Mojo.java}}. This solves
both the functionality and the documentation.
> Bad default value for maven.tomcat.path
> ---
>
> Key: MTOMCAT-260
> URL: https://issues.apache.org/jira/browse/MTOMCAT-260
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
>Affects Versions: 2.2
>Reporter: Stephen Buergler
>Priority: Minor
> Attachments: MTOMCAT-260.patch
>
>
> I'm getting:
> {noformat}
> WARNING: A context path must either be an empty string or start with a '/'.
> The path [test] does not meet these criteria and has been changed to [/test]
> {noformat}
> http://tomcat.apache.org/maven-plugin-2.2/tomcat7-maven-plugin/exec-war-only-mojo.html
> Maybe the default for {{maven.tomcat.path}} should be
> '/$\{project.artifactId}' instead of '$\{project.artifactId}'
> Also, why not use '/' ? Maybe the description could elaborate on that more?
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-260) Bad default value for maven.tomcat.path
[
https://issues.apache.org/jira/browse/MTOMCAT-260?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg updated MTOMCAT-260:
Fix Version/s: 2.3
Labels: patch (was: )
> Bad default value for maven.tomcat.path
> ---
>
> Key: MTOMCAT-260
> URL: https://issues.apache.org/jira/browse/MTOMCAT-260
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
>Affects Versions: 2.2
>Reporter: Stephen Buergler
>Priority: Minor
> Labels: patch
> Fix For: 2.3
>
> Attachments: MTOMCAT-260.patch
>
>
> I'm getting:
> {noformat}
> WARNING: A context path must either be an empty string or start with a '/'.
> The path [test] does not meet these criteria and has been changed to [/test]
> {noformat}
> http://tomcat.apache.org/maven-plugin-2.2/tomcat7-maven-plugin/exec-war-only-mojo.html
> Maybe the default for {{maven.tomcat.path}} should be
> '/$\{project.artifactId}' instead of '$\{project.artifactId}'
> Also, why not use '/' ? Maybe the description could elaborate on that more?
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57653] New: APR/native crash during HTTP upgrade
https://bz.apache.org/bugzilla/show_bug.cgi?id=57653
Bug ID: 57653
Summary: APR/native crash during HTTP upgrade
Product: Tomcat 9
Version: unspecified
Hardware: PC
OS: All
Status: NEW
Severity: normal
Priority: P2
Component: Connectors
Assignee: dev@tomcat.apache.org
Reporter: ma...@apache.org
Created attachment 32539
--> https://bz.apache.org/bugzilla/attachment.cgi?id=32539&action=edit
Crash log
With the patch below applied (it forces writes onto a separate thread when
using HTTP upgrade) repeated running of the
org.apache.coyote.http11.upgrade.TestUpgrade unit test eventually (after a few
minutes on OSX and Linux) triggers a JVM crash.
I suspect that a socket is closed in one thread while it is still in the
Poller. However, I have not yet been able to identify the code path that
triggers this.
I have attached the crash report.
Index: java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
===
--- java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
(revision 1663237)
+++ java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
(working copy)
@@ -21,11 +21,9 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.WriteListener;
-import org.apache.coyote.ContainerThreadMarker;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
-import org.apache.tomcat.util.net.DispatchType;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -114,11 +112,11 @@
synchronized (registeredLock) {
registered = true;
// Container is responsible for first call to onDataAvailable().
-if (ContainerThreadMarker.isContainerThread()) {
-socketWrapper.addDispatch(DispatchType.NON_BLOCKING_WRITE);
-} else {
+//if (ContainerThreadMarker.isContainerThread()) {
+//socketWrapper.addDispatch(DispatchType.NON_BLOCKING_WRITE);
+//} else {
socketWrapper.registerWriteInterest();
-}
+//}
}
this.listener = listener;
--
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: Stabilizing the trunk (9.0.x) build
On 27/02/2015 15:01, Mark Thomas wrote: > On 27/02/2015 14:42, Christopher Schultz wrote: >> On 2/27/15 7:00 AM, Mark Thomas wrote: >>> There is also an issue with APR on Linux that I can reproduce (with some >>> code changes) that triggers a crash every couple of runs. >> >> Next time is happens, can you give me the backtrace and register details >> (basically, the top of the Java hs_* file)? >> >> From my perspective, it should not be possible to crash tcnative if we >> can help it -- even if the Java code is all kinds of wrong. Throwing >> exceptions is fine, but taking-down the JVM is obnoxious :) > > I should be able to do this fairly easily. I'll open BZ item with the > info you requested when I have it. As requested: https://bz.apache.org/bugzilla/show_bug.cgi?id=57653 Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57653] APR/native crash during HTTP upgrade
https://bz.apache.org/bugzilla/show_bug.cgi?id=57653 --- Comment #1 from Remy Maucherat --- NIO2 also did double closes of the sockets running the websockets tests before the latest refactoring. Syncing closeSocket could be the only solution. -- 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
svn commit: r1663264 - in /tomcat/trunk: java/org/apache/catalina/servlets/DefaultServlet.java test/org/apache/catalina/servlets/TestDefaultServlet.java test/webapp/bug5nnnn/bug57601.jsp test/webapp/b
Author: markt
Date: Mon Mar 2 11:32:36 2015
New Revision: 1663264
URL: http://svn.apache.org/r1663264
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57601
Ensure HEAD requests return the correct content length (i.e. the same as for a
GET) when the requested resource includes a resource served by the Default
servlet.
Added:
tomcat/trunk/test/webapp/bug5/bug57601.jsp (with props)
tomcat/trunk/test/webapp/bug5/bug57601.txt (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1663264&r1=1663263&r2=1663264&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Mon Mar
2 11:32:36 2015
@@ -39,6 +39,7 @@ import java.util.Iterator;
import java.util.Locale;
import java.util.StringTokenizer;
+import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -411,13 +412,13 @@ public class DefaultServlet extends Http
* @exception ServletException if a servlet-specified error occurs
*/
@Override
-protected void doHead(HttpServletRequest request,
- HttpServletResponse response)
-throws IOException, ServletException {
-
-// Serve the requested resource, without the data content
-serveResource(request, response, false, fileEncoding);
-
+protected void doHead(HttpServletRequest request, HttpServletResponse
response)
+throws IOException, ServletException {
+// Serve the requested resource, without the data content unless we are
+// being included since in that case the content needs to be provided
so
+// the correct content length is reported for the including resource
+boolean serveContent =
DispatcherType.INCLUDE.equals(request.getDispatcherType());
+serveResource(request, response, serveContent, fileEncoding);
}
Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1663264&r1=1663263&r2=1663264&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Mon
Mar 2 11:32:36 2015
@@ -23,6 +23,7 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -35,6 +36,7 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import org.junit.Assert;
import org.junit.Test;
import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
@@ -340,6 +342,33 @@ public class TestDefaultServlet extends
assertTrue(client.isResponse404());
}
+/**
+ * Verifies that the same Content-Length is returned for both GET and HEAD
+ * operations when a static resource served by the DefaultServlet is
+ * included.
+ */
+@Test
+public void testBug57601() throws Exception {
+Tomcat tomcat = getTomcatInstanceTestWebapp(false, true);
+
+Map> resHeaders= new HashMap<>();
+String path = "http://localhost:"; + getPort() +
"/test/bug5/bug57601.jsp";
+ByteChunk out = new ByteChunk();
+
+int rc = getUrl(path, out, resHeaders);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+String length = resHeaders.get("Content-Length").get(0);
+Assert.assertEquals(Long.parseLong(length), out.getLength());
+out.recycle();
+
+rc = headUrl(path, out, resHeaders);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+Assert.assertEquals(0, out.getLength());
+Assert.assertEquals(length, resHeaders.get("Content-Length").get(0));
+
+tomcat.stop();
+}
+
public static int getUrl(String path, ByteChunk out,
Map> resHead) throws IOException {
out.recycle();
Added: tomcat/trunk/test/webapp/bug5/bug57601.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug5/bug57601.jsp?rev=1663264&view=auto
==
--- tomcat/trunk/test/webapp/bug5/bug57601.jsp (added)
+++ tomcat/trunk/test/webapp/bug5n
svn commit: r1663265 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/servlets/ test/org/apache/catalina/servlets/ test/webapp/bug5nnnn/ webapps/docs/
Author: markt Date: Mon Mar 2 11:34:59 2015 New Revision: 1663265 URL: http://svn.apache.org/r1663265 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=56701 Ensure HEAD requests return the correct content length (i.e. the same as for a GET) when the requested resource includes a resource served by the Default servlet. Patch by jboynes Added: tomcat/tc8.0.x/trunk/test/webapp/bug5/bug57601.jsp - copied unchanged from r1663264, tomcat/trunk/test/webapp/bug5/bug57601.jsp tomcat/tc8.0.x/trunk/test/webapp/bug5/bug57601.txt - copied unchanged from r1663264, tomcat/trunk/test/webapp/bug5/bug57601.txt Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 2 11:34:59 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,164
svn commit: r1663270 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/servlets/ test/org/apache/catalina/servlets/ test/webapp-3.0/bug5nnnn/ webapps/docs/
Author: markt Date: Mon Mar 2 11:44:11 2015 New Revision: 1663270 URL: http://svn.apache.org/r1663270 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57601 Ensure HEAD requests return the correct content length (i.e. the same as for a GET) when the requested resource includes a resource served by the Default servlet. Patch by jboynes Added: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug57601.jsp (with props) tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug57601.txt (with props) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 2 11:44:11 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1662986 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1 352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1
[Bug 57602] HttpServlet returns no content when included during a HEAD request
https://bz.apache.org/bugzilla/show_bug.cgi?id=57602 Bug 57602 depends on bug 57601, which changed state. Bug 57601 Summary: DefaultServlet returns no content when included during a HEAD request https://bz.apache.org/bugzilla/show_bug.cgi?id=57601 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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 57601] DefaultServlet returns no content when included during a HEAD request
https://bz.apache.org/bugzilla/show_bug.cgi?id=57601 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Fixed in trunk, 8.0.x for 8.0.21 onwards and in 7.0.x for 7.0.60 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
[Bug 37466] c:import doesn't work with HEAD requests
https://bz.apache.org/bugzilla/show_bug.cgi?id=37466 Bug 37466 depends on bug 57601, which changed state. Bug 57601 Summary: DefaultServlet returns no content when included during a HEAD request https://bz.apache.org/bugzilla/show_bug.cgi?id=57601 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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
svn commit: r1663277 - in /tomcat/trunk: java/javax/servlet/http/HttpServlet.java test/javax/servlet/http/TestHttpServlet.java
Author: markt
Date: Mon Mar 2 12:02:49 2015
New Revision: 1663277
URL: http://svn.apache.org/r1663277
Log:
Ensure HEAD requests return the correct content length (i.e. the same as for a
GET) when the requested resource includes a resource served by a servlet that
extends HttpServlet.
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1663277&r1=1663276&r2=1663277&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Mon Mar 2 12:02:49
2015
@@ -25,6 +25,7 @@ import java.text.MessageFormat;
import java.util.Enumeration;
import java.util.ResourceBundle;
+import javax.servlet.DispatcherType;
import javax.servlet.GenericServlet;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
@@ -236,10 +237,13 @@ public abstract class HttpServlet extend
protected void doHead(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
-NoBodyResponse response = new NoBodyResponse(resp);
-
-doGet(req, response);
-response.setContentLength();
+if (DispatcherType.INCLUDE.equals(req.getDispatcherType())) {
+doGet(req, resp);
+} else {
+NoBodyResponse response = new NoBodyResponse(resp);
+doGet(req, response);
+response.setContentLength();
+}
}
Modified: tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java?rev=1663277&r1=1663276&r2=1663277&view=diff
==
--- tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java (original)
+++ tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java Mon Mar 2
12:02:49 2015
@@ -17,6 +17,7 @@
package javax.servlet.http;
import java.io.IOException;
+import java.io.PrintWriter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -68,4 +69,76 @@ public class TestHttpServlet extends Tom
resp.setHeader("content-length", RESPONSE_LENGTH);
}
}
+
+
+/**
+ * Verifies that the same Content-Length is returned for both GET and HEAD
+ * operations when a Servlet includes content from another Servlet
+ */
+@Test
+public void testBug57602() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+StandardContext ctx = (StandardContext) tomcat.addContext("", null);
+
+Bug57602ServletOuter outer = new Bug57602ServletOuter();
+Tomcat.addServlet(ctx, "Bug57602ServletOuter", outer);
+ctx.addServletMapping("/outer", "Bug57602ServletOuter");
+
+Bug57602ServletInner inner = new Bug57602ServletInner();
+Tomcat.addServlet(ctx, "Bug57602ServletInner", inner);
+ctx.addServletMapping("/inner", "Bug57602ServletInner");
+
+tomcat.start();
+
+Map> resHeaders= new HashMap<>();
+String path = "http://localhost:"; + getPort() + "/outer";
+ByteChunk out = new ByteChunk();
+
+int rc = getUrl(path, out, resHeaders);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+String length = resHeaders.get("Content-Length").get(0);
+Assert.assertEquals(Long.parseLong(length), out.getLength());
+out.recycle();
+
+rc = headUrl(path, out, resHeaders);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+Assert.assertEquals(0, out.getLength());
+Assert.assertEquals(length, resHeaders.get("Content-Length").get(0));
+
+tomcat.stop();
+}
+
+
+private static class Bug57602ServletOuter extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.setContentType("text/plain");
+resp.setCharacterEncoding("UTF-8");
+PrintWriter pw = resp.getWriter();
+pw.println("Header");
+req.getRequestDispatcher("/inner").include(req, resp);
+pw.println("Footer");
+}
+}
+
+
+private static class Bug57602ServletInner extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.setContentType("text/plain");
+resp.setCharacterEncoding("U
svn commit: r1663278 - in /tomcat/tc8.0.x/trunk: ./ java/javax/servlet/http/HttpServlet.java test/javax/servlet/http/TestHttpServlet.java webapps/docs/changelog.xml
Author: markt Date: Mon Mar 2 12:04:23 2015 New Revision: 1663278 URL: http://svn.apache.org/r1663278 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=56702 Ensure HEAD requests return the correct content length (i.e. the same as for a GET) when the requested resource includes a resource served by a servlet that extends HttpServlet. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/javax/servlet/http/HttpServlet.java tomcat/tc8.0.x/trunk/test/javax/servlet/http/TestHttpServlet.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 2 12:04:23 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,16547
svn commit: r1663279 - in /tomcat/tc7.0.x/trunk: ./ java/javax/servlet/http/HttpServlet.java test/javax/servlet/http/TestHttpServlet.java webapps/docs/changelog.xml
Author: markt Date: Mon Mar 2 12:07:11 2015 New Revision: 1663279 URL: http://svn.apache.org/r1663279 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57602 Ensure HEAD requests return the correct content length (i.e. the same as for a GET) when the requested resource includes a resource served by a servlet that extends HttpServlet. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java tomcat/tc7.0.x/trunk/test/javax/servlet/http/TestHttpServlet.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 2 12:07:11 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1662986,1663265 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1 352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1
[Bug 57602] HttpServlet returns no content when included during a HEAD request
https://bz.apache.org/bugzilla/show_bug.cgi?id=57602 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Fixed in trunk, 8.0.x for 8.0.21 onwards and in 7.0.x for 7.0.60 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: Time for Taglibs to be sent to the archive?
2015-03-01 1:04 GMT+03:00 Jeremy Boynes : > Resurrecting this old thread[1] as the topic came up related to the site > changes. First message included for context below. > > TL;DR: Konstantin and I had interest in new work on Standard, Henri has > helped with logistics. No-one had any interest in RDC. A concern at the time > was lack of progress toward a release but since then we released 1.2.1 in > 2014/01 and recently 1.2.3. The 1.2 version has been picked up by some > downstream projects; to my knowledge, it is the only implementation available > under an Apache-style license. > > Rather than retire Taglibs now I would propose we attempt to reignite > community interest which will require steps beyond simply maintaining 1.2.x. > I’d propose the following: > > - Retire RDC to the Attic No objections here. Well, its site already says that it is retired, "2014/01/18 - The RDC Taglib has been retired." > - Fix the sub-site so it’s easier to maintain +1 > - Put Standard 1.2.x in maintenance mode for bug fixes only > - Start a tree/branch for new work without the limitations of the now-ancient > 1.2 spec > - Plan to release new work early & often I do not see a reason for branching. The library implements specification. In what direction is "trunk" supposed to go? Possible directions: a) Improve it for newer versions of Java, while still maintaining the same API? b) Extend the library outside of specification? c) Update it to newer versions of specification? I think there is no new specification version now, but maybe there is some development/plans? d) Work on built-in implementation of JSTL tags in Jasper? (Jasper Tag plugins) I mean: If there is no new development planned, we would better stay on the current trunk without separate maintenance branch. It is a bit more risky, but it has less overhead. I would like to fix some of many generics warnings shown by Eclipse IDE (either implement generics or to add @SupressWarning). No definite time slot for that though as I am not sure whether it is worth to spend time on that. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663298 - /tomcat/trunk/build.properties.default
Author: kkolinko
Date: Mon Mar 2 13:23:35 2015
New Revision: 1663298
URL: http://svn.apache.org/r1663298
Log:
Update to Checkstyle 6.4
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1663298&r1=1663297&r2=1663298&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Mar 2 13:23:35 2015
@@ -216,7 +216,7 @@ objenesis.loc=https://objenesis.googleco
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
# - Checkstyle, version 6.0 or later -
-checkstyle.version=6.3
+checkstyle.version=6.4
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663300 - in /tomcat/tc8.0.x/trunk: ./ build.properties.default webapps/docs/changelog.xml
Author: kkolinko Date: Mon Mar 2 13:29:34 2015 New Revision: 1663300 URL: http://svn.apache.org/r1663300 Log: Update to Checkstyle 6.4 Merged r1663298 from tomcat/trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/build.properties.default tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 2 13:29:34 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1
svn commit: r1663320 - in /tomcat/trunk/test/org/apache/coyote/http11: TestAbstractHttp11Processor.java TestHttp11InputBuffer.java TestHttp11OutputBuffer.java TestHttp11Processor.java TestInternalInpu
Author: markt
Date: Mon Mar 2 14:43:12 2015
New Revision: 1663320
URL: http://svn.apache.org/r1663320
Log:
Update test names to align with renamed implementation classes
Added:
tomcat/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
- copied, changed from r1663237,
tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
tomcat/trunk/test/org/apache/coyote/http11/TestHttp11OutputBuffer.java
- copied, changed from r1663237,
tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
- copied, changed from r1663237,
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
Removed:
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
Copied: tomcat/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
(from r1663237,
tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java?p2=tomcat/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java&p1=tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java&r1=1663237&r2=1663320&rev=1663320&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java Mon
Mar 2 14:43:12 2015
@@ -38,7 +38,7 @@ import org.apache.catalina.startup.Teste
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-public class TestInternalInputBuffer extends TomcatBaseTest {
+public class TestHttp11InputBuffer extends TomcatBaseTest {
/**
* Test case for https://bz.apache.org/bugzilla/show_bug.cgi?id=48839
Copied: tomcat/trunk/test/org/apache/coyote/http11/TestHttp11OutputBuffer.java
(from r1663237,
tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestHttp11OutputBuffer.java?p2=tomcat/trunk/test/org/apache/coyote/http11/TestHttp11OutputBuffer.java&p1=tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java&r1=1663237&r2=1663320&rev=1663320&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestHttp11OutputBuffer.java Mon
Mar 2 14:43:12 2015
@@ -24,7 +24,7 @@ import org.apache.catalina.startup.Simpl
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-public class TestInternalOutputBuffer extends TomcatBaseTest {
+public class TestHttp11OutputBuffer extends TomcatBaseTest {
@Test
public void testSendAck() throws Exception {
Copied: tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
(from r1663237,
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java?p2=tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java&p1=tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java&r1=1663237&r2=1663320&rev=1663320&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java Mon Mar
2 14:43:12 2015
@@ -54,7 +54,7 @@ import org.apache.tomcat.util.buf.ByteCh
import org.apache.tomcat.util.descriptor.web.SecurityCollection;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
-public class TestAbstractHttp11Processor extends TomcatBaseTest {
+public class TestHttp11Processor extends TomcatBaseTest {
@Test
public void testResponseWithErrorChunked() throws Exception {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663321 - /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
Author: jboynes
Date: Mon Mar 2 14:50:34 2015
New Revision: 1663321
URL: http://svn.apache.org/r1663321
Log:
Revert change the attempted to fix
https://bz.apache.org/bugzilla/show_bug.cgi?id=37466
The Servlet container should return content for a HEAD request and so there is
no need to coerce the HTTP method to GET to try an fool it into doing so.
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java?rev=1663321&r1=1663320&r2=1663321&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
Mon Mar 2 14:50:34 2015
@@ -37,7 +37,6 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import javax.servlet.jsp.JspException;
@@ -285,24 +284,21 @@ public abstract class ImportSupport exte
}
// from this context, get a dispatcher
-RequestDispatcher rd =
-c.getRequestDispatcher(stripSession(targetUrl));
+RequestDispatcher rd =
c.getRequestDispatcher(stripSession(targetUrl));
if (rd == null) {
throw new JspTagException(stripSession(targetUrl));
}
-// include the resource, using our custom wrapper
+// Wrap the response so we capture the capture the output.
+// This relies on the underlying container to return content even
if this is a HEAD
+// request. Some containers (e.g. Tomcat versions without the fix
for
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=57601 ) may not
do that.
ImportResponseWrapper irw =
-new ImportResponseWrapper(
-(HttpServletResponse) pageContext.getResponse());
+new ImportResponseWrapper((HttpServletResponse)
pageContext.getResponse());
-ImportRequestWrapper wrappedRequest =
-new ImportRequestWrapper(
-(HttpServletRequest) pageContext.getRequest());
-
-// spec mandates specific error handling form include()
+// spec mandates specific error handling from include()
try {
-rd.include(wrappedRequest, irw);
+rd.include(pageContext.getRequest(), irw);
} catch (IOException ex) {
throw new JspException(ex);
} catch (RuntimeException ex) {
@@ -387,22 +383,6 @@ public abstract class ImportSupport exte
}
/**
- * Wraps requests to allow us to enforce the method to be GET
- */
-private class ImportRequestWrapper extends HttpServletRequestWrapper {
-
-public ImportRequestWrapper(HttpServletRequest request) {
-super(request);
-}
-
-@Override
-public String getMethod() {
-return "GET";
-}
-
-}
-
-/**
* Wraps responses to allow us to retrieve results as Strings.
*/
private class ImportResponseWrapper extends HttpServletResponseWrapper {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 37466] c:import doesn't work with HEAD requests
https://bz.apache.org/bugzilla/show_bug.cgi?id=37466 Jeremy Boynes changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |INVALID --- Comment #11 from Jeremy Boynes --- Reverted the fix in http://svn.apache.org/r1663321 to be included in Taglibs 1.2.4 The associated change to Tomcat means the patch that addressed this is no longer appropriate. Resolving as INVALID. -- 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
svn commit: r1663323 - /tomcat/taglibs/standard/trunk/CHANGES.txt
Author: jboynes Date: Mon Mar 2 14:58:23 2015 New Revision: 1663323 URL: http://svn.apache.org/r1663323 Log: Update changelog for BZ# 37466 Modified: tomcat/taglibs/standard/trunk/CHANGES.txt Modified: tomcat/taglibs/standard/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/CHANGES.txt?rev=1663323&r1=1663322&r2=1663323&view=diff == --- tomcat/taglibs/standard/trunk/CHANGES.txt (original) +++ tomcat/taglibs/standard/trunk/CHANGES.txt Mon Mar 2 14:58:23 2015 @@ -1,3 +1,6 @@ +Changes in 1.2.4 release +37466 Reverted changes that overrode HTTP method when importing local resources. + Changes in 1.2.3 release 57560 Check protocol when resolving on older JREs - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663324 - /tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
Author: markt
Date: Mon Mar 2 15:02:30 2015
New Revision: 1663324
URL: http://svn.apache.org/r1663324
Log:
When an uncompressed part results in multiple compressed parts, ensure that the
OpCodes are correctly set.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java?rev=1663324&r1=1663323&r2=1663324&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java Mon
Mar 2 15:02:30 2015
@@ -316,16 +316,13 @@ public class PerMessageDeflate implement
List allCompressedParts = new ArrayList<>();
for (MessagePart uncompressedPart : uncompressedParts) {
-byte opCode = uncompressedPart.getOpCode();
-if (Util.isControl(opCode)) {
+if (Util.isControl(uncompressedPart.getOpCode())) {
// Control messages can appear in the middle of other messages
// and must not be compressed. Pass it straight through
allCompressedParts.add(uncompressedPart);
} else {
List compressedParts = new ArrayList<>();
ByteBuffer uncompressedPayload = uncompressedPart.getPayload();
-SendHandler uncompressedIntermediateHandler =
-uncompressedPart.getIntermediateHandler();
deflater.setInput(uncompressedPayload.array(),
uncompressedPayload.arrayOffset() +
uncompressedPayload.position(),
@@ -342,7 +339,8 @@ public class PerMessageDeflate implement
compressedPayload.remaining(), flush);
compressedPayload.position(compressedPayload.position() +
written);
-if (!uncompressedPart.isFin() &&
compressedPayload.hasRemaining() && deflater.needsInput()) {
+if (!uncompressedPart.isFin() &&
compressedPayload.hasRemaining() &&
+deflater.needsInput()) {
// This message part has been fully processed by the
// deflater. Fire the send handler for this message
part
// and move on to the next message part.
@@ -362,28 +360,24 @@ public class PerMessageDeflate implement
boolean fin = uncompressedPart.isFin();
boolean full = compressedPayload.limit() ==
compressedPayload.capacity();
boolean needsInput = deflater.needsInput();
-long blockingWriteTimeoutExpiry =
uncompressedPart.getBlockingWriteTimeoutExpiry();
if (fin && !full && needsInput) {
// End of compressed message. Drop EOM bytes and
output.
compressedPayload.limit(compressedPayload.limit() -
EOM_BYTES.length);
-compressedPart = new MessagePart(true,
getRsv(uncompressedPart),
-opCode, compressedPayload,
uncompressedIntermediateHandler,
-uncompressedIntermediateHandler,
blockingWriteTimeoutExpiry);
+compressedPart = createNewCompressedMessagePart(
+uncompressedPart, true, compressedPayload);
deflateRequired = false;
startNewMessage();
} else if (full && !needsInput) {
// Write buffer full and input message not fully read.
// Output and start new compressed part.
-compressedPart = new MessagePart(false,
getRsv(uncompressedPart),
-opCode, compressedPayload,
uncompressedIntermediateHandler,
-uncompressedIntermediateHandler,
blockingWriteTimeoutExpiry);
+compressedPart = createNewCompressedMessagePart(
+uncompressedPart, false, compressedPayload);
} else if (!fin && full && needsInput) {
// Write buffer full and input message not fully read.
// Output and get more data.
-compressedPart = new MessagePart(false,
getRsv(uncompressedPart),
-opCode, compressedPayload,
uncompressedIntermediateHandler,
-uncompressedIntermediateHandler,
blockingWriteTimeoutExpiry);
+compressedPart = createNewCompressedMessagePart(
+uncompressedPart, false, compressedPayload);
deflateRequired = false;
svn commit: r1663325 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/PerMessageDeflate.java webapps/docs/changelog.xml
Author: markt Date: Mon Mar 2 15:18:24 2015 New Revision: 1663325 URL: http://svn.apache.org/r1663325 Log: When an uncompressed part results in multiple compressed parts, ensure that the OpCodes are correctly set. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 2 15:18:24 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,16563
svn commit: r1663326 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/PerMessageDeflate.java webapps/docs/changelog.xml
Author: markt Date: Mon Mar 2 15:20:46 2015 New Revision: 1663326 URL: http://svn.apache.org/r1663326 Log: When an uncompressed part results in multiple compressed parts, ensure that the OpCodes are correctly set. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 2 15:20:46 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1662986,1663265,1663278 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1 352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1
svn commit: r1663366 - in /tomcat/sandbox/functional: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/jsp/ src/main/java/org/apache/jsp/functiona
Author: jboynes Date: Mon Mar 2 17:15:46 2015 New Revision: 1663366 URL: http://svn.apache.org/r1663366 Log: Strawman for using Java 8 functional interfaces in JSPs Added: tomcat/sandbox/functional/ (with props) tomcat/sandbox/functional/pom.xml (with props) tomcat/sandbox/functional/src/ tomcat/sandbox/functional/src/main/ tomcat/sandbox/functional/src/main/java/ tomcat/sandbox/functional/src/main/java/org/ tomcat/sandbox/functional/src/main/java/org/apache/ tomcat/sandbox/functional/src/main/java/org/apache/jsp/ tomcat/sandbox/functional/src/main/java/org/apache/jsp/functional/ tomcat/sandbox/functional/src/main/java/org/apache/jsp/functional/AbortException.java (with props) tomcat/sandbox/functional/src/main/java/org/apache/jsp/functional/Context.java (with props) tomcat/sandbox/functional/src/main/java/org/apache/jsp/functional/Fragment.java (with props) tomcat/sandbox/functional/src/main/java/org/apache/jsp/functional/Page.java (with props) tomcat/sandbox/functional/src/main/java/org/apache/jsp/functional/TagLibrary.java (with props) tomcat/sandbox/functional/src/test/ tomcat/sandbox/functional/src/test/java/ tomcat/sandbox/functional/src/test/java/samples/ tomcat/sandbox/functional/src/test/java/samples/basic/ tomcat/sandbox/functional/src/test/java/samples/basic/BasicTagLibrary.java (with props) tomcat/sandbox/functional/src/test/java/samples/basic/CoreTagLibrary.java (with props) tomcat/sandbox/functional/src/test/java/samples/jsp/ tomcat/sandbox/functional/src/test/java/samples/jsp/ContextImpl.java (with props) tomcat/sandbox/functional/src/test/java/samples/jsp/PageImpl.java (with props) tomcat/sandbox/functional/src/test/java/samples/servlet/ tomcat/sandbox/functional/src/test/java/samples/servlet/FragmentStream.java (with props) tomcat/sandbox/functional/src/test/java/samples/servlet/MultipleFragmentsAcceptContext.java (with props) tomcat/sandbox/functional/src/test/java/samples/servlet/PageConsumesFragment.java (with props) tomcat/sandbox/functional/src/test/java/samples/servlet/SingleFragmentAcceptsContext.java (with props) Propchange: tomcat/sandbox/functional/ -- --- svn:ignore (added) +++ svn:ignore Mon Mar 2 17:15:46 2015 @@ -0,0 +1,3 @@ +.idea +*.iml +target Added: tomcat/sandbox/functional/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/functional/pom.xml?rev=1663366&view=auto == --- tomcat/sandbox/functional/pom.xml (added) +++ tomcat/sandbox/functional/pom.xml Mon Mar 2 17:15:46 2015 @@ -0,0 +1,70 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + 4.0.0 + +org.apache.taglibs +taglibs-parent +3 + + + pom + + taglibs-functional + 0.1-SNAPSHOT + Apache Functional Taglib + + 2001 + +An experimental implementation of functional tags. + + + http://tomcat.apache.org/taglibs + + + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/sandbox/functional + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/sandbox/functional +http://svn.apache.org/viewvc/tomcat/taglibs/sandbox/functional + + + + + +org.apache.maven.plugins +maven-compiler-plugin +3.2 + + 1.8 + 1.8 + + + + + + + org.apache.tomcat + tomcat-jsp-api + 8.0.20 + + + javax.inject + javax.inject + 1 + + + Propchange: tomcat/sandbox/functional/pom.xml -- svn:eol-style = native Added: tomcat/sandbox/functional/src/main/java/org/apache/jsp/functional/AbortException.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/functional/src/main/java/org/apache/jsp/functional/AbortException.java?rev=1663366&view=auto == --- tomcat/sandbox/functional/src/main/java/org/apache/jsp/functional/AbortException.java (added) +++ tomcat/sandbox/functional/src/main/java/org/apache/jsp/functional/AbortException.java Mon Mar 2 17:15:46 2015 @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unle
Using functional interfaces for tags and JSP
After the recent thread around taglibs future, I wanted to explore the possibility of using Java8’s functional interfaces to implement tags. http://svn.apache.org/r1663366 is a straw man I used. To explain the approach here, I started with the thought that the SimpleTag model in JSP2.0 was a kind of functional implementation. Rather than having to define a class for each tag and a XML description of it, could we represent it as a single method and gain all the needed information through annotation and introspection. Basically I wanted to be able write a tag as something like void tagName(String attribute1, int attribute2, JspFragment body) TagLibrary describes the semantics I came up with, and BasicTagLibrary attempts to demonstrate how the various patterns used by today’s tags could be implemented with the new model. I think this can be supported on JSP2.x engines by using an annotation processor to generate SimpleTag implementations and the XML descriptor for the library. We could also use a ServletContainerInitializer to locate TagLibrary classes during webapp startup and pass the information to Jasper. However, I started to wonder if there was a more efficient model that could also be used for the JSPPage itself, one that might avoid generation for all cases not involving scriptlets. The thought was that a page can be represented by a series of fragments that are either: * text * text produced by EL ValueExpressions * tag invocations * scriptlets (but current best practices tend discourage that) The servlet samples contain various alternatives for representing such a page. I tried to make these work with the existing JSP APIs as much as possible but ran into a couple of impedance mismatches: * the JSP interfaces ofter have additional methods which prevent them being FunctionalInterfaces for example, JSPFragment is a abstract class and exposes two operations * JSP generally uses checked exceptions (JspException) whereas the j.u.function APIs do not. I introduced AbortException as a way to tunnel the checked exceptions to the higher levels * JSP historically has relied on life-cycle methods e.g. JspFactory’s get/releasePageContext. I explored using try-with-resources to control life-cycle instead The interfaces in o.a.jsp.functional try to address these issues. The code builds but I’ve not verified that it actually works as intended - that’s the next step :) Cheers Jeremy signature.asc Description: Message signed with OpenPGP using GPGMail
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.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-tc8.0.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 30 mins 24 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only 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 -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150302-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150302.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150302-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150302/bin /openssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/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/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu ild/lib/tomcat-spdy.
svn commit: r1663442 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt
Date: Mon Mar 2 21:44:57 2015
New Revision: 1663442
URL: http://svn.apache.org/r1663442
Log:
Clean-up post connector refactoring.
- reduce visibility
- remove unused code
- remove unnecessary accessors
- make utility methods static
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1663442&r1=1663441&r2=1663442&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Mar 2
21:44:57 2015
@@ -245,12 +245,32 @@ public class Http11Processor extends Abs
userDataHelper = new UserDataHelper(log);
inputBuffer = new Http11InputBuffer(request, maxHttpHeaderSize);
-request.setInputBuffer(getInputBuffer());
+request.setInputBuffer(inputBuffer);
outputBuffer = new Http11OutputBuffer(response, maxHttpHeaderSize);
-response.setOutputBuffer(getOutputBuffer());
+response.setOutputBuffer(outputBuffer);
-initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
+// Create and add the identity filters.
+inputBuffer.addFilter(new IdentityInputFilter(maxSwallowSize));
+outputBuffer.addFilter(new IdentityOutputFilter());
+
+// Create and add the chunked filters.
+inputBuffer.addFilter(
+new ChunkedInputFilter(maxTrailerSize, maxExtensionSize,
maxSwallowSize));
+outputBuffer.addFilter(new ChunkedOutputFilter());
+
+// Create and add the void filters.
+inputBuffer.addFilter(new VoidInputFilter());
+outputBuffer.addFilter(new VoidOutputFilter());
+
+// Create and add buffered input filter
+inputBuffer.addFilter(new BufferedInputFilter());
+
+// Create and add the chunked filters.
+//inputBuffer.addFilter(new GzipInputFilter());
+outputBuffer.addFilter(new GzipOutputFilter());
+
+pluggableFilterIndex = inputBuffer.getFilters().length;
}
@@ -488,13 +508,6 @@ public class Http11Processor extends Abs
}
}
-/**
- * Get the server header name.
- */
-public String getServer() {
-return server;
-}
-
/**
* Check if the resource could be compressed, if the client supports it.
@@ -572,7 +585,7 @@ public class Http11Processor extends Abs
* Specialized utility method: find a sequence of lower case bytes inside
* a ByteChunk.
*/
-protected int findBytes(ByteChunk bc, byte[] b) {
+private static int findBytes(ByteChunk bc, byte[] b) {
byte first = b[0];
byte[] buff = bc.getBuffer();
@@ -605,7 +618,7 @@ public class Http11Processor extends Abs
* Determine if we must drop the connection because of the HTTP status
* code. Use the same list of codes as Apache/httpd.
*/
-protected boolean statusDropsConnection(int status) {
+private static boolean statusDropsConnection(int status) {
return status == 400 /* SC_BAD_REQUEST */ ||
status == 408 /* SC_REQUEST_TIMEOUT */ ||
status == 411 /* SC_LENGTH_REQUIRED */ ||
@@ -618,53 +631,6 @@ public class Http11Processor extends Abs
/**
- * Exposes input buffer to super class to allow better code re-use.
- * @return The input buffer used by the processor.
- */
-protected Http11InputBuffer getInputBuffer() {
-return inputBuffer;
-}
-
-
-/**
- * Exposes output buffer to super class to allow better code re-use.
- * @return The output buffer used by the processor.
- */
-protected Http11OutputBuffer getOutputBuffer() {
-return outputBuffer;
-}
-
-
-/**
- * Initialize standard input and output filters.
- */
-protected void initializeFilters(int maxTrailerSize, int maxExtensionSize,
-int maxSwallowSize) {
-// Create and add the identity filters.
-getInputBuffer().addFilter(new IdentityInputFilter(maxSwallowSize));
-getOutputBuffer().addFilter(new IdentityOutputFilter());
-
-// Create and add the chunked filters.
-getInputBuffer().addFilter(
-new ChunkedInputFilter(maxTrailerSize, maxExtensionSize,
maxSwallowSize));
-getOutputBuffer().addFilter(new ChunkedOutputFilter());
-
-// Create and add the void filters.
-getInputBuffer().addFilter(new VoidInputFilter());
-getOutputBuffer().addFilter(new VoidOutputFilter());
-
-// Create and add buffered input filter
-getInputBuffer().addFilter(new BufferedInputFilter());
-
-// Create and add the chunked filters.
-//getInputBuffer().addFilter(new GzipInputFilter());
-
svn commit: r1663472 - /tomcat/trunk/build.properties.default
Author: kkolinko
Date: Mon Mar 2 23:24:38 2015
New Revision: 1663472
URL: http://svn.apache.org/r1663472
Log:
Update to Cobertura 2.1.1
This reverts use of snapshot build (r1644581).
I do not know whether logging configuration fix (r1644708) is required, but it
is likely. If it is required, one should not forget it when backporting.
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1663472&r1=1663471&r2=1663472&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Mar 2 23:24:38 2015
@@ -86,9 +86,6 @@ base-maven.loc=http://repo.maven.apache.
# Mirror, was used when there were problems with the main SF downloads site
# base-sf.loc=http://sunet.dl.sourceforge.net
-# Can be removed once we no longer require a Cobertura snapshot
-base-sonatype-snapshots=https://oss.sonatype.org/content/repositories/snapshots
-
# - Commons Logging, version 1.1 or later -
# If this version is updated, check the versions required for the dependencies
below
# - avalon-framework
@@ -222,11 +219,11 @@ checkstyle.loc=${base-sf.loc}/checkstyle
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
# - Cobertura code coverage tool -
-cobertura.version=2.1.0-SNAPSHOT
+cobertura.version=2.1.1
cobertura.home=${base.path}/cobertura-${cobertura.version}
cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
cobertura.lib=${cobertura.home}/lib
-cobertura.loc=${base-sonatype-snapshots}/net/sourceforge/cobertura/cobertura/${cobertura.version}/cobertura-2.1.0-20141121.083251-1-bin.tar.gz
+cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.1.1-bin.tar.gz
# - JVM settings for unit tests
java.net.preferIPv4Stack=false
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663522 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: kfujino
Date: Tue Mar 3 04:17:24 2015
New Revision: 1663522
URL: http://svn.apache.org/r1663522
Log:
Make sure that unpackWAR attribute of Context is handled correctly in
HostConfig.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1663522&r1=1663521&r2=1663522&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Mar 3
04:17:24 2015
@@ -601,7 +601,11 @@ public class HostConfig
// Add the eventual unpacked WAR and all the resources which will
be
// watched inside it
if (isExternalWar) {
-if (unpackWARs) {
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && context instanceof StandardContext) {
+unpackWAR = ((StandardContext) context).getUnpackWAR();
+}
+if (unpackWAR) {
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
Long.valueOf(expandedDocBase.lastModified()));
addWatchedResources(deployedApp,
expandedDocBase.getAbsolutePath(), context);
@@ -681,7 +685,11 @@ public class HostConfig
}
if (deploymentExists(cn.getName())) {
DeployedApplication app = deployed.get(cn.getName());
-if (!unpackWARs && app != null) {
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && host.findChild(cn.getName()) instanceof
StandardContext) {
+unpackWAR = ((StandardContext)
host.findChild(cn.getName())).getUnpackWAR();
+}
+if (!unpackWAR && app != null) {
// Need to check for a directory that should not be
// there
File dir = new File(appBase, cn.getBaseName());
@@ -921,7 +929,11 @@ public class HostConfig
} finally {
// If we're unpacking WARs, the docBase will be mutated after
// starting the context
-if (unpackWARs && context != null && context.getDocBase() != null)
{
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && context instanceof StandardContext) {
+unpackWAR = ((StandardContext) context).getUnpackWAR();
+}
+if (unpackWAR && context != null && context.getDocBase() != null) {
File docBase = new File(host.getAppBaseFile(),
cn.getBaseName());
deployedApp.redeployResources.put(docBase.getAbsolutePath(),
Long.valueOf(docBase.lastModified()));
@@ -1237,7 +1249,11 @@ public class HostConfig
app.redeployResources.put(resources[i],
Long.valueOf(resource.lastModified()));
app.timestamp = System.currentTimeMillis();
-if (unpackWARs) {
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && context instanceof StandardContext) {
+unpackWAR = ((StandardContext)
context).getUnpackWAR();
+}
+if (unpackWAR) {
addWatchedResources(app, context.getDocBase(),
context);
} else {
addWatchedResources(app, null, context);
@@ -1584,7 +1600,11 @@ public class HostConfig
host.addChild(context);
// Add the eventual unpacked WAR and all the resources which will be
// watched inside it
-if (isWar && unpackWARs) {
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && context instanceof StandardContext) {
+unpackWAR = ((StandardContext) context).getUnpackWAR();
+}
+if (isWar && unpackWAR) {
File docBase = new File(host.getAppBaseFile(),
context.getBaseName());
deployedApp.redeployResources.put(docBase.getAbsolutePath(),
Long.valueOf(docBase.lastModified()));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663523 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Mar 3 04:23:27 2015
New Revision: 1663523
URL: http://svn.apache.org/r1663523
Log:
Make sure that unpackWAR attribute of Context is handled correctly in
HostConfig.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1663523&r1=1663522&r2=1663523&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Tue
Mar 3 04:23:27 2015
@@ -601,7 +601,11 @@ public class HostConfig
// Add the eventual unpacked WAR and all the resources which will
be
// watched inside it
if (isExternalWar) {
-if (unpackWARs) {
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && context instanceof StandardContext) {
+unpackWAR = ((StandardContext) context).getUnpackWAR();
+}
+if (unpackWAR) {
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
Long.valueOf(expandedDocBase.lastModified()));
addWatchedResources(deployedApp,
expandedDocBase.getAbsolutePath(), context);
@@ -681,7 +685,11 @@ public class HostConfig
}
if (deploymentExists(cn.getName())) {
DeployedApplication app = deployed.get(cn.getName());
-if (!unpackWARs && app != null) {
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && host.findChild(cn.getName()) instanceof
StandardContext) {
+unpackWAR = ((StandardContext)
host.findChild(cn.getName())).getUnpackWAR();
+}
+if (!unpackWAR && app != null) {
// Need to check for a directory that should not be
// there
File dir = new File(appBase, cn.getBaseName());
@@ -921,7 +929,11 @@ public class HostConfig
} finally {
// If we're unpacking WARs, the docBase will be mutated after
// starting the context
-if (unpackWARs && context != null && context.getDocBase() != null)
{
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && context instanceof StandardContext) {
+unpackWAR = ((StandardContext) context).getUnpackWAR();
+}
+if (unpackWAR && context != null && context.getDocBase() != null) {
File docBase = new File(host.getAppBaseFile(),
cn.getBaseName());
deployedApp.redeployResources.put(docBase.getAbsolutePath(),
Long.valueOf(docBase.lastModified()));
@@ -1237,7 +1249,11 @@ public class HostConfig
app.redeployResources.put(resources[i],
Long.valueOf(resource.lastModified()));
app.timestamp = System.currentTimeMillis();
-if (unpackWARs) {
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && context instanceof StandardContext) {
+unpackWAR = ((StandardContext)
context).getUnpackWAR();
+}
+if (unpackWAR) {
addWatchedResources(app, context.getDocBase(),
context);
} else {
addWatchedResources(app, null, context);
@@ -1584,7 +1600,11 @@ public class HostConfig
host.addChild(context);
// Add the eventual unpacked WAR and all the resources which will be
// watched inside it
-if (isWar && unpackWARs) {
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && context instanceof StandardContext) {
+unpackWAR = ((StandardContext) context).getUnpackWAR();
+}
+if (isWar && unpackWAR) {
File docBase = new File(host.getAppBaseFile(),
context.getBaseName());
deployedApp.redeployResources.put(docBase.getAbsolutePath(),
Long.valueOf(docBase.lastModified()));
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1663523&r1=1663522&r2=1663523&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Mar 3 04:23:27 2015
@@ -86,6 +86,10 @@
57637: Do n
svn commit: r1663524 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Mar 3 04:24:18 2015
New Revision: 1663524
URL: http://svn.apache.org/r1663524
Log:
Make sure that unpackWAR attribute of Context is handled correctly in
HostConfig.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1663524&r1=1663523&r2=1663524&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Tue
Mar 3 04:24:18 2015
@@ -699,7 +699,11 @@ public class HostConfig
// Add the eventual unpacked WAR and all the resources which will
be
// watched inside it
if (isExternalWar) {
-if (unpackWARs) {
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && context instanceof StandardContext) {
+unpackWAR = ((StandardContext) context).getUnpackWAR();
+}
+if (unpackWAR) {
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
Long.valueOf(expandedDocBase.lastModified()));
addWatchedResources(deployedApp,
expandedDocBase.getAbsolutePath(), context);
@@ -779,7 +783,11 @@ public class HostConfig
}
if (deploymentExists(cn.getName())) {
DeployedApplication app = deployed.get(cn.getName());
-if (!unpackWARs && app != null) {
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && host.findChild(cn.getName()) instanceof
StandardContext) {
+unpackWAR = ((StandardContext)
host.findChild(cn.getName())).getUnpackWAR();
+}
+if (!unpackWAR && app != null) {
// Need to check for a directory that should not be
// there
File dir = new File(appBase, cn.getBaseName());
@@ -1085,7 +1093,11 @@ public class HostConfig
} finally {
// If we're unpacking WARs, the docBase will be mutated after
// starting the context
-if (unpackWARs && context != null && context.getDocBase() != null)
{
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && context instanceof StandardContext) {
+unpackWAR = ((StandardContext) context).getUnpackWAR();
+}
+if (unpackWAR && context != null && context.getDocBase() != null) {
File docBase = new File(appBase(), cn.getBaseName());
deployedApp.redeployResources.put(docBase.getAbsolutePath(),
Long.valueOf(docBase.lastModified()));
@@ -1412,7 +1424,11 @@ public class HostConfig
app.redeployResources.put(resources[i],
Long.valueOf(resource.lastModified()));
app.timestamp = System.currentTimeMillis();
-if (unpackWARs) {
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && context instanceof StandardContext) {
+unpackWAR = ((StandardContext)
context).getUnpackWAR();
+}
+if (unpackWAR) {
addWatchedResources(app, context.getDocBase(),
context);
} else {
addWatchedResources(app, null, context);
@@ -1759,7 +1775,11 @@ public class HostConfig
host.addChild(context);
// Add the eventual unpacked WAR and all the resources which will be
// watched inside it
-if (isWar && unpackWARs) {
+boolean unpackWAR = unpackWARs;
+if (unpackWAR && context instanceof StandardContext) {
+unpackWAR = ((StandardContext) context).getUnpackWAR();
+}
+if (isWar && unpackWAR) {
File docBase = new File(appBase(), context.getBaseName());
deployedApp.redeployResources.put(docBase.getAbsolutePath(),
Long.valueOf(docBase.lastModified()));
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1663524&r1=1663523&r2=1663524&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 3 04:24:18 2015
@@ -126,6 +126,10 @@
57637: Do not create unnecessary
[Bug 57655] New: org.apache.tomcat.util.net.TestSsl.testKeyPass fails due to expired certificate
https://bz.apache.org/bugzilla/show_bug.cgi?id=57655 Bug ID: 57655 Summary: org.apache.tomcat.util.net.TestSsl.testKeyPass fails due to expired certificate Product: Tomcat 8 Version: 8.0.20 Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Util Assignee: dev@tomcat.apache.org Reporter: ian@gmail.com org.apache.tomcat.util.net.TestSsl.testKeyPass fails and the following exception is reported: Caused by: java.security.cert.CertificateExpiredException: NotAfter: Sat Feb 28 13:28:42 CST 2015 at sun.security.x509.CertificateValidity.valid(CertificateValidity.java:273) at sun.security.x509.X509CertImpl.checkValidity(X509CertImpl.java:575) at sun.security.provider.certpath.BasicChecker.verifyTimestamp(BasicChecker.java:184) at sun.security.provider.certpath.BasicChecker.check(BasicChecker.java:136) at sun.security.provider.certpath.PKIXMasterCertPathValidator.validate(PKIXMasterCertPathValidator.java:133) ... 56 more The following output message shows the certificate has been expired by executing keytool command under test/org/apache/tomcat/util/net $ keytool -printcert -file localhost-cert.pem Owner: CN=localhost, C=US Issuer: CN=ca-test.tomcat.apache.org, C=US Serial number: 1003 Valid from: Thu Feb 28 13:28:42 CST 2013 until: Sat Feb 28 13:28:42 CST 2015 -- 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
Taglibs/JSP future work, was: Time for Taglibs to be sent to the archive?
On Mar 2, 2015, at 5:21 AM, Konstantin Kolinko wrote: > > 2015-03-01 1:04 GMT+03:00 Jeremy Boynes : ... >> - Put Standard 1.2.x in maintenance mode for bug fixes only >> - Start a tree/branch for new work without the limitations of the >> now-ancient 1.2 spec >> - Plan to release new work early & often > > I do not see a reason for branching. The library implements > specification. In what direction is "trunk" supposed to go? > > Possible directions: > a) Improve it for newer versions of Java, while still maintaining the same > API? We had talked previously about dropping Java5 support and decided not to do that in 1.2.x release. I was thinking of a 2.x trunk that would allow us to baseline on a newer version, specifically Java8 given the public version of Java7 reaches EOL next month (April 2015). It was thinking about the lambda support that led me to the straw man I posted earlier today. Which leads to ... > b) Extend the library outside of specification? > c) Update it to newer versions of specification? I think there is no > new specification version now, but maybe there is some > development/plans? JSP is included in the list of technologies “expected to be updated” in Java EE 8 but as the JSR is still closed we won’t see anything until the PFD phase. Given recent history I would not expect to see any major changes. Since JSTL 1.0 came out we’ve see many changes in its space: * EL became a standalone thing * EL can call Java functions directly eliminating the need for function definitions in TLDs * Script-free JSP pages became best-practice * Pooling became less important leading to the SimpleTag model * Annotation, introspection and injection became commonplace * MVC meant JSPs became primarily a View component rather than playing the Controller role With the introduction of pruning abilities in EE6 some things that could go might include: * EL 1.0 and the legacy JSP APIs that support it * JSTL’s XML and SQL tags Rather than wait for the spec we could start to simplify the the model for people working at the JSP level (i.e. above Servlets but lower than JSF, perhaps in conjunction with the new MVC spec). > d) Work on built-in implementation of JSTL tags in Jasper? (Jasper Tag > plugins) Jasper has plugin for JSTL core but there are some edge cases it handles incorrectly. I should open bugs for them and we could fix those :) I’d actually like to take a second look at the plugin mechanism anyway - for example, why does it key off the tag’s implementation class rather than its QName. > I mean: If there is no new development planned, we would better stay > on the current trunk without separate maintenance branch. It is a bit > more risky, but it has less overhead. > > I would like to fix some of many generics warnings shown by Eclipse > IDE (either implement generics or to add @SupressWarning). No definite > time slot for that though as I am not sure whether it is worth to > spend time on that. Things I was thinking of in the current implementation include: * Making Java 8 the baseline JRE and updating to it (separate from any functional work) * Making Java EE 7 the baseline container and dropping -jstlel in favour of -compat - This would get rid of a many of those code-health warnings in one swoop :) - -compat would merge back into -impl * Separating the 4 libraries into separate modules (core, fmt, xml, sql) so: - Users would only need the libraries they actually used - We could release each module separately as needed - Xalan would only be needed when using the XML library - We could do an alternate fmt using ICU4J which typically updates quicker than the JDK I probably wasn’t clear originally - I meant this type of work would be on trunk and we’d create a stable branch 1.2.x to support bug-fixes. — Jeremy signature.asc Description: Message signed with OpenPGP using GPGMail
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.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-tc8.0.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Timed Out'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build timed out -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 1 hour 8 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only 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 -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150303.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150303/bin /openssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/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/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu ild/lib/tomcat-spdy.jar:/srv/gump/public/works
svn commit: r1663534 - /tomcat/trunk/webapps/docs/config/context.xml
Author: markt Date: Tue Mar 3 07:42:20 2015 New Revision: 1663534 URL: http://svn.apache.org/r1663534 Log: Remove note that is no longer correct Modified: tomcat/trunk/webapps/docs/config/context.xml Modified: tomcat/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1663534&r1=1663533&r2=1663534&view=diff == --- tomcat/trunk/webapps/docs/config/context.xml (original) +++ tomcat/trunk/webapps/docs/config/context.xml Tue Mar 3 07:42:20 2015 @@ -717,9 +717,7 @@ file will not be unpacked. If true, the value of the owning Host's unpackWARs attribute will determine if the WAR is unpacked. If not specified, the -default value is true. Note that WAR files located outside -of a Host's appBase are -never unpacked. +default value is true. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663535 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/context.xml
Author: markt Date: Tue Mar 3 07:45:54 2015 New Revision: 1663535 URL: http://svn.apache.org/r1663535 Log: Remove note that is no longer correct Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/config/context.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 3 07:45:54 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,165
svn commit: r1663536 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/context.xml
Author: markt Date: Tue Mar 3 07:48:54 2015 New Revision: 1663536 URL: http://svn.apache.org/r1663536 Log: Remove note that is no longer correct Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 3 07:48:54 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1662986,1663265,1663278,1663325 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1 352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620
[Bug 57655] org.apache.tomcat.util.net.TestSsl.testKeyPass fails due to expired certificate
https://bz.apache.org/bugzilla/show_bug.cgi?id=57655 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Already fixed in trunk. See r1662985, r1662986 & r1662987. -- 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
