Re: Could anybody give me some reference about how Tomcat handle the default servlet
2012/6/13 Zhi Xie daxie...@gmail.com: If I deploy a war with a web.xml like this. ?xml version=1.0 encoding=UTF-8? web-app id=WebApp_ID version=2.4 xmlns=http://java.sun.com/xml/ns/j2ee; xmlns:xsi= http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd; display-nameTest WAR/display-name !-- Example mapping using the default servlet -- servlet-mapping servlet-namedefault/servlet-name url-pattern/images/*/url-pattern /servlet-mapping /web-app 1. Your question is offtopic on dev@. You should ask it on users@ list. I want to know Tomcat how to handle it. 1. How to find DefaultServlet to handle this map. 2. I do not understand this question. What do you mean by find? Please provide more context. What you are trying to do, as a whole? What is your problem? 2. If I define my own default servlet, how tomcat assure the DefaultServlet don't override my own servlet. I have debugged it in Tomcat 6.0.35. But I couldn't find the answer. Could anybody give me some reference. Thank you very much. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.1.24
On 06/11/2012 02:54 PM, Mladen Turk wrote: [X] Stable, go ahead and release My hudson/jenkins tests are all OK. Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53406] Stack overflow in connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=53406
Konstantin Kolinko knst.koli...@gmail.com changed:
What|Removed |Added
OS||All
--- Comment #1 from Konstantin Kolinko knst.koli...@gmail.com ---
The following are remarkable points in this stacktrace:
org.apache.tomcat.util.net.NioEndpoint.processSocket(NioEndpoint.java:730)
org.apache.tomcat.util.net.NioEndpoint$Poller.add(NioEndpoint.java:1008)
NioEndpoint$Poller.add(NioChannel socket, int interestOps):
[[[
if (close) {
processSocket(socket, SocketStatus.STOP, false);
}
]]]
org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.longPoll(Http11NioProtocol.java:277)
[[[
} else {
//...
socket.getSocket().getPoller().add(socket.getSocket());
]]]
so this happens with an application that uses Comet (those event() calls), when
longPoll() is processed, but endpoint is being closed at the same time.
It looks like SocketStatus.STOP value is not being honored. The poller#close
flag is inaccessible from outside.
--
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: WARNING: Incorrect connection count when running testsuite for APR/native 1.1.24
On 13.06.2012 05:21, Konstantin Kolinko wrote: Hi! I run the testsuite for Tomcat trunk with APR connector with release candidate for Tomcat Native 1.1.24, on WinXP 32-bit. The testsuite passes successfully, but looking closer into log files I see many occurrences of the following warning: 12.06.2012 21:13:43 org.apache.tomcat.util.net.AbstractEndpoint countDownConnection WARNING: Incorrect connection count, multiple socket.close called on the same socket. There are ~50 tests when it fails, the first one being org.apache.catalina.authenticator.TestFormAuthenticator It sounds like there are cases when BZ 53173 (connection counting and maxConnections) is not fixed yet for APR connector. You are right, I only checked for Failures and Errors. My test logs show the following counts for this warning: tcn-tc-ant_test-apr.out-1.1.24.rhel5.x86_64:282 tcn-tc-ant_test-apr.out-1.1.24.rhel6.x86_64:316 tcn-tc-ant_test-apr.out-1.1.24.sles10.i586:296 tcn-tc-ant_test-apr.out-1.1.24.sles10.x86_64:286 tcn-tc-ant_test-apr.out-1.1.24.sles11.x86_64:294 tcn-tc-ant_test-apr.out-1.1.24.solaris10.sparc:161 tcn-tc-ant_test-apr.out-1.1.24.solaris8.sparc:208 So it happened quite frequently. Interesting: I also ran the test suite for the same TC trunk revision and bio and nio and one single time on one platform I did get the same message: tcn-tc-ant_test-bio.out-1.1.24.sles10.x86_64:1 It was in org.apache.catalina.startup.TestTomcat: [junit] Running org.apache.catalina.startup.TestTomcat [junit] Jun 12, 2012 11:51:50 AM org.apache.coyote.AbstractProtocol init [junit] INFO: Initializing ProtocolHandler [http-bio-127.0.0.1-auto-1] [junit] Jun 12, 2012 11:51:50 AM org.apache.catalina.core.StandardService startInternal [junit] INFO: Starting service Tomcat [junit] Jun 12, 2012 11:51:50 AM org.apache.catalina.core.StandardEngine startInternal [junit] INFO: Starting Servlet Engine: Apache Tomcat/8.0.0-dev [junit] Jun 12, 2012 11:51:51 AM org.apache.coyote.AbstractProtocol start [junit] INFO: Starting ProtocolHandler [http-bio-127.0.0.1-auto-1-47162] [junit] Jun 12, 2012 11:51:51 AM org.apache.coyote.AbstractProtocol pause [junit] INFO: Pausing ProtocolHandler [http-bio-127.0.0.1-auto-1-47162] [junit] Jun 12, 2012 11:51:51 AM org.apache.catalina.core.StandardService stopInternal [junit] INFO: Stopping service Tomcat [junit] Jun 12, 2012 11:51:51 AM org.apache.coyote.AbstractProtocol stop [junit] INFO: Stopping ProtocolHandler [http-bio-127.0.0.1-auto-1-47162] [junit] Jun 12, 2012 11:51:51 AM org.apache.coyote.AbstractProtocol destroy [junit] INFO: Destroying ProtocolHandler [http-bio-127.0.0.1-auto-1-47162] [junit] Jun 12, 2012 11:51:51 AM org.apache.tomcat.util.net.AbstractEndpoint countDownConnection [junit] WARNING: Incorrect connection count, multiple socket.close called on the same socket. But of course the numbers for the APR are so much higher, that it looks like a different problem. Here's the list of test casses for which the problem happened together with a count of the WARNINGs (taken from the solaris 10 run): 5 [junit] Running org.apache.catalina.authenticator.TestFormAuthenticator 7 [junit] Running org.apache.catalina.comet.TestCometProcessor 2 [junit] Running org.apache.catalina.connector.TestConnector 2 [junit] Running org.apache.catalina.connector.TestKeepAliveCount 1 [junit] Running org.apache.catalina.connector.TestMaxConnections 3 [junit] Running org.apache.catalina.connector.TestRequest 5 [junit] Running org.apache.catalina.core.TestAsyncContextImpl 4 [junit] Running org.apache.catalina.core.TestStandardContext 1 [junit] Running org.apache.catalina.core.TestStandardWrapper 8 [junit] Running org.apache.catalina.core.TestSwallowAbortedUploads 7 [junit] Running org.apache.catalina.filters.TestRemoteIpFilter 1 [junit] Running org.apache.catalina.loader.TestVirtualContext 1 [junit] Running org.apache.catalina.mbeans.TestRegistration 2 [junit] Running org.apache.catalina.servlets.TestDefaultServlet 3 [junit] Running org.apache.catalina.startup.TestTomcat 1 [junit] Running org.apache.catalina.valves.TestErrorReportValve 6 [junit] Running org.apache.catalina.websocket.TestWebSocket 1 [junit] Running org.apache.coyote.ajp.TestAbstractAjpProcessor 6 [junit] Running org.apache.coyote.http11.TestAbstractHttp11Processor 56 [junit] Running org.apache.coyote.http11.TestInternalInputBuffer 3 [junit] Running org.apache.coyote.http11.filters.TestChunkedInputFilter 3 [junit] Running org.apache.el.TestELInJsp 3 [junit] Running org.apache.jasper.compiler.TestCompiler 4 [junit] Running org.apache.jasper.compiler.TestGenerator 1 [junit] Running org.apache.jasper.compiler.TestJspConfig 2 [junit] Running org.apache.jasper.compiler.TestJspDocumentParser 7 [junit] Running org.apache.jasper.compiler.TestParser 1
Re: [VOTE] Release Apache Tomcat Native 1.1.24
While building it on OSX, I noticed some changes, ie no more apxs in configure. May be I was using an old build system ? Updated article on my blog : http://blog.hgomez.net/2012/06/13/building-universal-apache-tomcat-native-library-on-osx-updated/ 2012/6/13 jean-frederic clere jfcl...@gmail.com On 06/11/2012 02:54 PM, Mladen Turk wrote: [X] Stable, go ahead and release My hudson/jenkins tests are all OK. Cheers Jean-Frederic --**--**- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.**orgdev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-60) Multiple-War-Deployment in configuration section.
[
https://issues.apache.org/jira/browse/MTOMCAT-60?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13294332#comment-13294332
]
Neale Upstone commented on MTOMCAT-60:
--
I'm surprised there's no comment on this, as I think it's more sane than
hijacking plugin dependencies or project dependencies and abusing scope
I'd also consider changing addtionalWebapps to just webapps, as for build
pipelines, we may not always want the artifact containing the tests to be WAR
packaging, and would instead be consuming built WARs for testing.
Multiple-War-Deployment in configuration section.
-
Key: MTOMCAT-60
URL: https://issues.apache.org/jira/browse/MTOMCAT-60
Project: Apache Tomcat Maven Plugin
Issue Type: Improvement
Reporter: Joerg Bellmann
Priority: Minor
Attachments: maven-tomcat-plugin.patch.txt
When a user want to deploy multiple webapps with the plugin it uses all
project-war-dependencies with scope 'tomcat'. Maven 3 shows the following
message at project-processing:
{code}
[INFO] Scanning for projects...
[WARNING]
[WARNING] Some problems were encountered while building the effective model
for de.jbellmann.failsafe:de.jbellmann.failsafe.web:war:0.0.1-SNAPSHOT
[WARNING] 'dependencies.dependency.scope' for
org.springframework.samples:mvc-showcase:war must be one of [provided,
compile, runtime, test, system] but is 'tomcat'. @
[WARNING]
[WARNING] It is highly recommended to fix these problems because they
threaten the stability of your build.
[WARNING]
[WARNING] For this reason, future Maven versions might no longer support
building such malformed projects.
{code}
Configuring the additional webapps in the configuration section like this for
example :
{code}
plugin
groupIdorg.codehaus.mojo/groupId
artifactIdtomcat-maven-plugin/artifactId
version1.1-SNAPSHOT/version
executions
execution
idstart-tomcat-integration-tests/id
goals
goalrun/goal
/goals
phasepre-integration-test/phase
configuration
forktrue/fork
addContextWarDependenciestrue/addContextWarDependencies
additionalWebapps
webapp
groupIdorg.springframework.samples/groupId
artifactIdmvc-showcase/artifactId
version1.0.0-BUILD-SNAPSHOT/version
contextPath/mvc-showcase2/contextPath
/webapp
/additionalWebapps
/configuration
/execution
/executions
/plugin
{code}
avoids the warnings and makes maven 3 happy.
As a plus you can configure an contextPath different from the artifactId.
This solution was inspired by the 'maven-dependency-plugin' and uses some
code-snippets from it.
Jörg Bellmann
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-160) Skipping non-war project should not happen if using addContextWarDependencies
Neale Upstone created MTOMCAT-160:
-
Summary: Skipping non-war project should not happen if using
addContextWarDependencies
Key: MTOMCAT-160
URL: https://issues.apache.org/jira/browse/MTOMCAT-160
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Affects Versions: 1.1
Reporter: Neale Upstone
For build pipelines,
addContextWarDependenciestrue/addContextWarDependencies is often used in
projects which contain just the acceptance tests.
If the project packaging is set as JAR, we get:
[INFO] [tomcat:run {execution: start-tomcat}]
[INFO] Skipping non-war project
I can see reasons why the skip logic is there, but this should not happen when
addContextWarDependencies (or any cleaner successor) is enabled.
Any chance of this getting tweaked for beta2/rc1 ?
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-160) Skipping non-war project should not happen if using addContextWarDependencies
[
https://issues.apache.org/jira/browse/MTOMCAT-160?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Neale Upstone updated MTOMCAT-160:
--
Affects Version/s: 2.0-beta-1
Skipping non-war project should not happen if using
addContextWarDependencies
-
Key: MTOMCAT-160
URL: https://issues.apache.org/jira/browse/MTOMCAT-160
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Affects Versions: 1.1, 2.0-beta-1
Reporter: Neale Upstone
For build pipelines,
addContextWarDependenciestrue/addContextWarDependencies is often used in
projects which contain just the acceptance tests.
If the project packaging is set as JAR, we get:
[INFO] [tomcat:run {execution: start-tomcat}]
[INFO] Skipping non-war project
I can see reasons why the skip logic is there, but this should not happen
when addContextWarDependencies (or any cleaner successor) is enabled.
Any chance of this getting tweaked for beta2/rc1 ?
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-60) Multiple-War-Deployment in configuration section.
[
https://issues.apache.org/jira/browse/MTOMCAT-60?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13294424#comment-13294424
]
Joerg Bellmann commented on MTOMCAT-60:
---
Wow,
It takes nearly 2 years that someone reacts to this.
But this feature was needed 2 years ago. So I decided to make my [own plugin |
http://t7mp.github.com/docu/html/ch01.html].
It lacks docmentation , [but it brings many features wee needed when I created
this issue and patch | https://github.com/t7mp]. Like multiple wars, additional
lib-dependencies, an experimental scanner to avoid restarts and
template-hacking when the tomcat-instance is running.
But the coming version of maven-tomcat-plugin looks promising with many same
features.
Cheers,
Joerg
Multiple-War-Deployment in configuration section.
-
Key: MTOMCAT-60
URL: https://issues.apache.org/jira/browse/MTOMCAT-60
Project: Apache Tomcat Maven Plugin
Issue Type: Improvement
Reporter: Joerg Bellmann
Priority: Minor
Attachments: maven-tomcat-plugin.patch.txt
When a user want to deploy multiple webapps with the plugin it uses all
project-war-dependencies with scope 'tomcat'. Maven 3 shows the following
message at project-processing:
{code}
[INFO] Scanning for projects...
[WARNING]
[WARNING] Some problems were encountered while building the effective model
for de.jbellmann.failsafe:de.jbellmann.failsafe.web:war:0.0.1-SNAPSHOT
[WARNING] 'dependencies.dependency.scope' for
org.springframework.samples:mvc-showcase:war must be one of [provided,
compile, runtime, test, system] but is 'tomcat'. @
[WARNING]
[WARNING] It is highly recommended to fix these problems because they
threaten the stability of your build.
[WARNING]
[WARNING] For this reason, future Maven versions might no longer support
building such malformed projects.
{code}
Configuring the additional webapps in the configuration section like this for
example :
{code}
plugin
groupIdorg.codehaus.mojo/groupId
artifactIdtomcat-maven-plugin/artifactId
version1.1-SNAPSHOT/version
executions
execution
idstart-tomcat-integration-tests/id
goals
goalrun/goal
/goals
phasepre-integration-test/phase
configuration
forktrue/fork
addContextWarDependenciestrue/addContextWarDependencies
additionalWebapps
webapp
groupIdorg.springframework.samples/groupId
artifactIdmvc-showcase/artifactId
version1.0.0-BUILD-SNAPSHOT/version
contextPath/mvc-showcase2/contextPath
/webapp
/additionalWebapps
/configuration
/execution
/executions
/plugin
{code}
avoids the warnings and makes maven 3 happy.
As a plus you can configure an contextPath different from the artifactId.
This solution was inspired by the 'maven-dependency-plugin' and uses some
code-snippets from it.
Jörg Bellmann
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Comment Edited] (MTOMCAT-60) Multiple-War-Deployment in configuration section.
[
https://issues.apache.org/jira/browse/MTOMCAT-60?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13294424#comment-13294424
]
Joerg Bellmann edited comment on MTOMCAT-60 at 6/13/12 12:56 PM:
-
Wow,
It takes nearly 2 years that someone reacts to this.
But this feature was needed 2 years ago. So I decided to make my own plugin
(http://t7mp.github.com/docu/html/ch01.html).
It lacks docmentation, but it brings many features wee needed when I created
this issue and patch. Like multiple wars, additional lib-dependencies, an
experimental scanner to avoid restarts and template-hacking when the
tomcat-instance is running. (sources are here https://github.com/t7mp)
But the coming version of maven-tomcat-plugin looks promising with many same
features.
Cheers,
Joerg
was (Author: mtomcat_jbellmann):
Wow,
It takes nearly 2 years that someone reacts to this.
But this feature was needed 2 years ago. So I decided to make my [own plugin |
http://t7mp.github.com/docu/html/ch01.html].
It lacks docmentation , [but it brings many features wee needed when I created
this issue and patch | https://github.com/t7mp]. Like multiple wars, additional
lib-dependencies, an experimental scanner to avoid restarts and
template-hacking when the tomcat-instance is running.
But the coming version of maven-tomcat-plugin looks promising with many same
features.
Cheers,
Joerg
Multiple-War-Deployment in configuration section.
-
Key: MTOMCAT-60
URL: https://issues.apache.org/jira/browse/MTOMCAT-60
Project: Apache Tomcat Maven Plugin
Issue Type: Improvement
Reporter: Joerg Bellmann
Priority: Minor
Attachments: maven-tomcat-plugin.patch.txt
When a user want to deploy multiple webapps with the plugin it uses all
project-war-dependencies with scope 'tomcat'. Maven 3 shows the following
message at project-processing:
{code}
[INFO] Scanning for projects...
[WARNING]
[WARNING] Some problems were encountered while building the effective model
for de.jbellmann.failsafe:de.jbellmann.failsafe.web:war:0.0.1-SNAPSHOT
[WARNING] 'dependencies.dependency.scope' for
org.springframework.samples:mvc-showcase:war must be one of [provided,
compile, runtime, test, system] but is 'tomcat'. @
[WARNING]
[WARNING] It is highly recommended to fix these problems because they
threaten the stability of your build.
[WARNING]
[WARNING] For this reason, future Maven versions might no longer support
building such malformed projects.
{code}
Configuring the additional webapps in the configuration section like this for
example :
{code}
plugin
groupIdorg.codehaus.mojo/groupId
artifactIdtomcat-maven-plugin/artifactId
version1.1-SNAPSHOT/version
executions
execution
idstart-tomcat-integration-tests/id
goals
goalrun/goal
/goals
phasepre-integration-test/phase
configuration
forktrue/fork
addContextWarDependenciestrue/addContextWarDependencies
additionalWebapps
webapp
groupIdorg.springframework.samples/groupId
artifactIdmvc-showcase/artifactId
version1.0.0-BUILD-SNAPSHOT/version
contextPath/mvc-showcase2/contextPath
/webapp
/additionalWebapps
/configuration
/execution
/executions
/plugin
{code}
avoids the warnings and makes maven 3 happy.
As a plus you can configure an contextPath different from the artifactId.
This solution was inspired by the 'maven-dependency-plugin' and uses some
code-snippets from it.
Jörg Bellmann
--
This
Re: [VOTE] Release Apache Tomcat Native 1.1.24
On 06/13/2012 10:29 AM, Henri Gomez wrote: While building it on OSX, I noticed some changes, ie no more apxs in configure. May be I was using an old build system ? Probably not, since we never had apxs with tomcat native. You were probably thinking on mod_jk, since apxs is for building httpd modules :) Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT] was: [VOTE] Release Apache Tomcat Native 1.1.24
With 5 binding +1 votes from Mark, Filip, Rainer, Jean-Frederic and Mladen, and no other votes I declare this vote as passed. I'll copy the artefacts to dist site and create ANN after mirror sync. On 06/11/2012 02:54 PM, Mladen Turk wrote: [1] http://people.apache.org/~mturk/native/1.1.24 [2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_1_24 Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349846 - in /tomcat/native/branches/1.1.x/xdocs: index.xml news/2012.xml
Author: mturk Date: Wed Jun 13 13:45:21 2012 New Revision: 1349846 URL: http://svn.apache.org/viewvc?rev=1349846view=rev Log: Add 1.1.24 release sections Modified: tomcat/native/branches/1.1.x/xdocs/index.xml tomcat/native/branches/1.1.x/xdocs/news/2012.xml Modified: tomcat/native/branches/1.1.x/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/index.xml?rev=1349846r1=1349845r2=1349846view=diff == --- tomcat/native/branches/1.1.x/xdocs/index.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/index.xml Wed Jun 13 13:45:21 2012 @@ -45,6 +45,15 @@ manual is described in more detail below br / ul +lia href=news/2012.html#20120613.113 June 2012 - bTC-Native-1.1.24 released/b/a +pThe Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.24 Stable. +/p +pDownload the a href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz;TC-native 1.1.24 release sources/a + | a href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.asc;PGP signature/a +/p +pDownload the a href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/binaries/;binaries/a for selected platforms. +/p +/li lia href=news/2012.html#20120302.102 March 2012 - bTC-Native-1.1.23 released/b/a pThe Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.23 Stable. /p Modified: tomcat/native/branches/1.1.x/xdocs/news/2012.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2012.xml?rev=1349846r1=1349845r2=1349846view=diff == --- tomcat/native/branches/1.1.x/xdocs/news/2012.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/news/2012.xml Wed Jun 13 13:45:21 2012 @@ -31,6 +31,23 @@ section name=2012 News amp; Status br / +a name=20120613.1 +h308 August - TC-Native-1.1.24 released/h3 +/a +pThe Apache Tomcat team is proud to announce the immediate availability +of Tomcat Native 1.1.24. This is a feature-add release adding support for +per-socket Poller timeouts. +/p +br / +p + Please see the a href=../miscellaneous/changelog.htmlChangeLog/a for a full list of changes. +/p +pIf you find any bugs while using this release, please fill in the +a href=http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%206;Bugzilla/a +Bug Report. When entering bug select bNative:JNI/b Component. +/p +hr size=1 noshade=noshade / +br / a name=20120302.1 h308 August - TC-Native-1.1.23 released/h3 /a - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r690 - in /release/tomcat/tomcat-connectors/native: ./ 1.1.23/ 1.1.24/ 1.1.24/binaries/ 1.1.24/source/
Author: mturk Date: Wed Jun 13 13:49:29 2012 New Revision: 690 Log: Upload 1.1.24 release artefacts Added: release/tomcat/tomcat-connectors/native/1.1.24/ release/tomcat/tomcat-connectors/native/1.1.24/binaries/ release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip (with props) release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.asc (with props) release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.md5 release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.sha1 release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip (with props) release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip.asc (with props) release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip.md5 release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip.sha1 release/tomcat/tomcat-connectors/native/1.1.24/source/ release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz (with props) release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.asc (with props) release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.md5 release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.sha1 release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-win32-src.zip (with props) release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-win32-src.zip.asc (with props) release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-win32-src.zip.md5 release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-win32-src.zip.sha1 Removed: release/tomcat/tomcat-connectors/native/1.1.23/ Modified: release/tomcat/tomcat-connectors/native/README.html Added: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip -- svn:mime-type = application/zip Added: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.asc == Binary file - no diff available. Propchange: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.asc -- svn:mime-type = application/pgp-signature Added: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.md5 == --- release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.md5 (added) +++ release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.md5 Wed Jun 13 13:49:29 2012 @@ -0,0 +1 @@ +b6011fdc26f1c65d58eb883a0b51ab55 *tomcat-native-1.1.24-ocsp-win32-bin.zip Added: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.sha1 == --- release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.sha1 (added) +++ release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.sha1 Wed Jun 13 13:49:29 2012 @@ -0,0 +1 @@ +8b563e4904c0d2ede6c91fbf4a3bc197bd13f748 *tomcat-native-1.1.24-ocsp-win32-bin.zip Added: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip == Binary file - no diff available. Propchange: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip -- svn:mime-type = application/zip Added: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip.asc == Binary file - no diff available. Propchange: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip.asc -- svn:mime-type = application/pgp-signature Added:
svn commit: r690 - in /release/tomcat/tomcat-connectors/native: ./ 1.1.23/ 1.1.24/ 1.1.24/binaries/ 1.1.24/source/
Author: mturk Date: Wed Jun 13 13:49:29 2012 New Revision: 690 Log: Upload 1.1.24 release artefacts Added: release/tomcat/tomcat-connectors/native/1.1.24/ release/tomcat/tomcat-connectors/native/1.1.24/binaries/ release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip (with props) release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.asc (with props) release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.md5 release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.sha1 release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip (with props) release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip.asc (with props) release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip.md5 release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip.sha1 release/tomcat/tomcat-connectors/native/1.1.24/source/ release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz (with props) release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.asc (with props) release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.md5 release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.sha1 release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-win32-src.zip (with props) release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-win32-src.zip.asc (with props) release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-win32-src.zip.md5 release/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-win32-src.zip.sha1 Removed: release/tomcat/tomcat-connectors/native/1.1.23/ Modified: release/tomcat/tomcat-connectors/native/README.html Added: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip -- svn:mime-type = application/zip Added: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.asc == Binary file - no diff available. Propchange: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.asc -- svn:mime-type = application/pgp-signature Added: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.md5 == --- release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.md5 (added) +++ release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.md5 Wed Jun 13 13:49:29 2012 @@ -0,0 +1 @@ +b6011fdc26f1c65d58eb883a0b51ab55 *tomcat-native-1.1.24-ocsp-win32-bin.zip Added: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.sha1 == --- release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.sha1 (added) +++ release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-ocsp-win32-bin.zip.sha1 Wed Jun 13 13:49:29 2012 @@ -0,0 +1 @@ +8b563e4904c0d2ede6c91fbf4a3bc197bd13f748 *tomcat-native-1.1.24-ocsp-win32-bin.zip Added: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip == Binary file - no diff available. Propchange: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip -- svn:mime-type = application/zip Added: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip.asc == Binary file - no diff available. Propchange: release/tomcat/tomcat-connectors/native/1.1.24/binaries/tomcat-native-1.1.24-win32-bin.zip.asc -- svn:mime-type = application/pgp-signature Added:
svn commit: r1349849 - in /tomcat/native/branches/1.1.x/native: include/tcn_version.h os/win32/libtcnative.rc
Author: mturk
Date: Wed Jun 13 13:52:17 2012
New Revision: 1349849
URL: http://svn.apache.org/viewvc?rev=1349849view=rev
Log:
Bump current version to 1.1.25-dev
Modified:
tomcat/native/branches/1.1.x/native/include/tcn_version.h
tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc
Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1349849r1=1349848r2=1349849view=diff
==
--- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Wed Jun 13
13:52:17 2012
@@ -69,13 +69,13 @@ extern C {
#define TCN_MINOR_VERSION 1
/** patch level */
-#define TCN_PATCH_VERSION 24
+#define TCN_PATCH_VERSION 25
/**
* This symbol is defined for internal, development copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 0
+#define TCN_IS_DEV_VERSION 1
/** The formatted string of APU's version */
Modified: tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc?rev=1349849r1=1349848r2=1349849view=diff
==
--- tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc Wed Jun 13
13:52:17 2012
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
See the License for the specific language governing \
permissions and limitations under the License.
-#define TCN_VERSION 1.1.24
+#define TCN_VERSION 1.1.25
1000 ICON apache.ico
1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,1,24,0
- PRODUCTVERSION 1,1,24,0
+ FILEVERSION 1,1,25,0
+ PRODUCTVERSION 1,1,25,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349850 - /tomcat/native/branches/1.1.x/build.properties.default
Author: mturk Date: Wed Jun 13 13:52:30 2012 New Revision: 1349850 URL: http://svn.apache.org/viewvc?rev=1349850view=rev Log: Bump current version to 1.1.25-dev Modified: tomcat/native/branches/1.1.x/build.properties.default Modified: tomcat/native/branches/1.1.x/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.properties.default?rev=1349850r1=1349849r2=1349850view=diff == --- tomcat/native/branches/1.1.x/build.properties.default (original) +++ tomcat/native/branches/1.1.x/build.properties.default Wed Jun 13 13:52:30 2012 @@ -18,9 +18,9 @@ # - Version Control Flags - version.major=1 version.minor=1 -version.build=24 +version.build=25 version.patch=0 -version.suffix= +version.suffix=-devs # - Default Base Path for Dependent Packages - # Please note this path must be absolute, not relative, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349879 - /tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Author: markt
Date: Wed Jun 13 14:40:58 2012
New Revision: 1349879
URL: http://svn.apache.org/viewvc?rev=1349879view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1349879r1=1349878r2=1349879view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Wed
Jun 13 14:40:58 2012
@@ -35,7 +35,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Random;
import java.util.Set;
import javax.servlet.ServletException;
@@ -99,8 +98,6 @@ public final class HTMLManagerServlet ex
URL_ENCODER.addSafeCharacter('/');
}
-private final Random randomSource = new Random();
-
private boolean showProxySessions = false;
// - Public Methods
@@ -233,36 +230,6 @@ public final class HTMLManagerServlet ex
list(request, response, message, smClient);
}
-/**
- * Generate a once time token (nonce) for authenticating subsequent
- * requests. This will also add the token to the session. The nonce
- * generation is a simplified version of ManagerBase.generateSessionId().
- *
- */
-protected String generateNonce() {
-byte random[] = new byte[16];
-
-// Render the result as a String of hexadecimal digits
-StringBuilder buffer = new StringBuilder();
-
-randomSource.nextBytes(random);
-
-for (int j = 0; j random.length; j++) {
-byte b1 = (byte) ((random[j] 0xf0) 4);
-byte b2 = (byte) (random[j] 0x0f);
-if (b1 10)
-buffer.append((char) ('0' + b1));
-else
-buffer.append((char) ('A' + (b1 - 10)));
-if (b2 10)
-buffer.append((char) ('0' + b2));
-else
-buffer.append((char) ('A' + (b2 - 10)));
-}
-
-return buffer.toString();
-}
-
protected String upload(HttpServletRequest request, StringManager smClient)
throws IOException, ServletException {
String message = ;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349885 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/HTMLManagerServlet.java
Author: markt
Date: Wed Jun 13 14:43:14 2012
New Revision: 1349885
URL: http://svn.apache.org/viewvc?rev=1349885view=rev
Log:
Remove unused code
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1349879
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1349885r1=1349884r2=1349885view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Wed Jun 13 14:43:14 2012
@@ -35,7 +35,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Random;
import java.util.Set;
import javax.servlet.ServletException;
@@ -99,8 +98,6 @@ public final class HTMLManagerServlet ex
URL_ENCODER.addSafeCharacter('/');
}
-private final Random randomSource = new Random();
-
private boolean showProxySessions = false;
// - Public Methods
@@ -233,36 +230,6 @@ public final class HTMLManagerServlet ex
list(request, response, message, smClient);
}
-/**
- * Generate a once time token (nonce) for authenticating subsequent
- * requests. This will also add the token to the session. The nonce
- * generation is a simplified version of ManagerBase.generateSessionId().
- *
- */
-protected String generateNonce() {
-byte random[] = new byte[16];
-
-// Render the result as a String of hexadecimal digits
-StringBuilder buffer = new StringBuilder();
-
-randomSource.nextBytes(random);
-
-for (int j = 0; j random.length; j++) {
-byte b1 = (byte) ((random[j] 0xf0) 4);
-byte b2 = (byte) (random[j] 0x0f);
-if (b1 10)
-buffer.append((char) ('0' + b1));
-else
-buffer.append((char) ('A' + (b1 - 10)));
-if (b2 10)
-buffer.append((char) ('0' + b2));
-else
-buffer.append((char) ('A' + (b2 - 10)));
-}
-
-return buffer.toString();
-}
-
protected String upload(HttpServletRequest request, StringManager smClient)
throws IOException, ServletException {
String message = ;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349887 - /tomcat/trunk/webapps/docs/appdev/deployment.xml
Author: markt Date: Wed Jun 13 14:47:14 2012 New Revision: 1349887 URL: http://svn.apache.org/viewvc?rev=1349887view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53403 Correct specification version reference to include new specification versions Modified: tomcat/trunk/webapps/docs/appdev/deployment.xml Modified: tomcat/trunk/webapps/docs/appdev/deployment.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/deployment.xml?rev=1349887r1=1349886r2=1349887view=diff == --- tomcat/trunk/webapps/docs/appdev/deployment.xml (original) +++ tomcat/trunk/webapps/docs/appdev/deployment.xml Wed Jun 13 14:47:14 2012 @@ -102,8 +102,8 @@ application's document root directory: application, such as third party class libraries or JDBC drivers./li /ul -pWhen you install an application into Tomcat (or any other -2.2/2.3-compatible server), the classes in the codeWEB-INF/classes//code +pWhen you install an application into Tomcat (or any other 2.2 or later +Servlet container), the classes in the codeWEB-INF/classes//code directory, as well as all classes in JAR files found in the codeWEB-INF/lib//code directory, are made visible to other classes within your particular web application. Thus, if - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349892 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/appdev/deployment.xml webapps/docs/changelog.xml
Author: markt Date: Wed Jun 13 14:50:02 2012 New Revision: 1349892 URL: http://svn.apache.org/viewvc?rev=1349892view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53403 Correct specification version reference to include new specification versions Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1349887 Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml?rev=1349892r1=1349891r2=1349892view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml Wed Jun 13 14:50:02 2012 @@ -102,8 +102,8 @@ application's document root directory: application, such as third party class libraries or JDBC drivers./li /ul -pWhen you install an application into Tomcat (or any other -2.2/2.3-compatible server), the classes in the codeWEB-INF/classes//code +pWhen you install an application into Tomcat (or any other 2.2 or later +Servlet container), the classes in the codeWEB-INF/classes//code directory, as well as all classes in JAR files found in the codeWEB-INF/lib//code directory, are made visible to other classes within your particular web application. Thus, if 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=1349892r1=1349891r2=1349892view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 13 14:50:02 2012 @@ -373,6 +373,11 @@ bug53398/bug: Correct spelling of quot;receivedquot; in the Manager applicationapos;s XML output. (markt) /fix + fix +bug53403/bug: Update a reference to the Servlet specification in the +first web applciation section of the documentation web application to +include newer versions of the specificarion. (markt) + /fix /changelog /subsection subsection name=jdbc-pool - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53403] Reference to 2.2/2.3 servlet container in Tomcat 7 docs
https://issues.apache.org/bugzilla/show_bug.cgi?id=53403 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- Fixed in trunk and 7.0.x and will be included in 7.0.28 onwards. It now says 2.2. or later at that point -- 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: r1349893 - /tomcat/trunk/build.properties.default
Author: markt
Date: Wed Jun 13 14:54:55 2012
New Revision: 1349893
URL: http://svn.apache.org/viewvc?rev=1349893view=rev
Log:
Update APR/native connector version
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1349893r1=1349892r2=1349893view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Jun 13 14:54:55 2012
@@ -138,7 +138,7 @@ npn.jar=${npn.home}/npn-${npn.version}.j
npn.loc=http://repo1.maven.org/maven2/org/eclipse/jetty/npn/npn-api/${npn.version}/npn-api-${npn.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.1.23
+tomcat-native.version=1.1.24
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53409] New: Request class actively restricts sending parameters in the body unless using POST
https://issues.apache.org/bugzilla/show_bug.cgi?id=53409 Priority: P2 Bug ID: 53409 Assignee: dev@tomcat.apache.org Summary: Request class actively restricts sending parameters in the body unless using POST Severity: normal Classification: Unclassified Reporter: sta...@gmail.com Hardware: PC Status: NEW Version: 6.0.35 Component: Connectors Product: Tomcat 6 Hi I did view Bug 48692 and Bug 49964 and http://markmail.org/message/opptokzqz7y6z7nk It's great you've fixed it in 7.x, but the thing is there are users like me that currently have to develop REST services using Tomcat 6.0.x (which is still a supported version) sadly as I see it, marking Bug 49964 duplicate of Bug 48692 made this fix unavailable for us, Tomcat 6 users, because Tomcat.0.35 was released in the beginning of the year and both bugs were last modified in 2010 and still does not have this simple yet so important fix. So for Tomcat 6.0.x this is still a bug(or an enhancement if you wish to be strict although the RFC does not restrict it and Request.java lines 2599-2600 does :) ) and a very annoying one, that forces manual parsing of the request body and\or other workarounds. -- 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: [RESULT] was: [VOTE] Release Apache Tomcat Native 1.1.24
+1 from me also (build and tested on OSX Lion). Question, did you need binaries for OSX ? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53406] Stack overflow in connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=53406
--- Comment #2 from Filip Hanik fha...@apache.org ---
Thanks for the analysis.
Here is what I think will fix it
Index: java/org/apache/coyote/http11/Http11NioProcessor.java
===
--- java/org/apache/coyote/http11/Http11NioProcessor.java (revision
1349898)
+++ java/org/apache/coyote/http11/Http11NioProcessor.java (working copy)
@@ -155,7 +155,7 @@
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
-if (error) {
+if (error || status==SocketStatus.STOP) {
return SocketState.CLOSED;
} else if (!comet) {
if (keepAlive) {
What this does, is that it prevents reuse of connections after a Comet
transaction has been notified of a STOP event.
--
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 53406] Stack overflow in connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=53406 --- Comment #3 from Mark Thomas ma...@apache.org --- I was thinking along the same lines but fixing it in the Adaptor rather than just for NIO. The issue with my fix is that it somewhat abused the error flag (by changing it's meaning to mean close the connection for any reason rather than something went wrong. Your fix is clearer as to intention but it needs to be made to APR too. I'll so that now unless you beat me to it. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349922 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11NioProcessor.java
Author: markt
Date: Wed Jun 13 15:46:30 2012
New Revision: 1349922
URL: http://svn.apache.org/viewvc?rev=1349922view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53406
Fix possible stack overflow on connection close when using Comet (fhanik)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1349922r1=1349921r2=1349922view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Wed Jun
13 15:46:30 2012
@@ -144,7 +144,7 @@ public class Http11AprProcessor extends
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
-if (error) {
+if (error || status==SocketStatus.STOP) {
return SocketState.CLOSED;
} else if (!comet) {
inputBuffer.nextRequest();
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1349922r1=1349921r2=1349922view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Wed Jun
13 15:46:30 2012
@@ -155,7 +155,7 @@ public class Http11NioProcessor extends
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
-if (error) {
+if (error || status==SocketStatus.STOP) {
return SocketState.CLOSED;
} else if (!comet) {
if (keepAlive) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349923 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11AprProcessor.java java/org/apache/coyote/http11/Http11NioProcessor.java webapps/docs/changelog.xml
Author: markt
Date: Wed Jun 13 15:48:26 2012
New Revision: 1349923
URL: http://svn.apache.org/viewvc?rev=1349923view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53406
Fix possible stack overflow on connection close when using Comet (fhanik)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1349922
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1349923r1=1349922r2=1349923view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Wed Jun 13 15:48:26 2012
@@ -144,7 +144,7 @@ public class Http11AprProcessor extends
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
-if (error) {
+if (error || status==SocketStatus.STOP) {
return SocketState.CLOSED;
} else if (!comet) {
inputBuffer.nextRequest();
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1349923r1=1349922r2=1349923view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Wed Jun 13 15:48:26 2012
@@ -155,7 +155,7 @@ public class Http11NioProcessor extends
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
-if (error) {
+if (error || status==SocketStatus.STOP) {
return SocketState.CLOSED;
} else if (!comet) {
if (keepAlive) {
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=1349923r1=1349922r2=1349923view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 13 15:48:26 2012
@@ -308,6 +308,10 @@
Correct an edge case where Comet END events were not send to connected
clients when the Tomcat connector was stopped. (markt)
/fix
+ fix
+bug53406/bug: Fix possible stack overflow on connection close when
+using Comet. (fhanik)
+ /fix
/changelog
/subsection
subsection name=Jasper
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53406] Stack overflow in connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=53406 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas ma...@apache.org --- Fixed for trunk and 7.0.x and will be included in 7.0.28 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 53346] Support for changing MaxActive via JMX
https://issues.apache.org/bugzilla/show_bug.cgi?id=53346 Filip Hanik fha...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Filip Hanik fha...@apache.org --- *** This bug has been marked as a duplicate of bug 50864 *** -- 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 50864] Reconfigure pool on the fly using JMX
https://issues.apache.org/bugzilla/show_bug.cgi?id=50864 Filip Hanik fha...@apache.org changed: What|Removed |Added CC||brooke_hedrick@millamilla.c ||om --- Comment #5 from Filip Hanik fha...@apache.org --- *** Bug 53346 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349932 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/AprLifecycleListener.java java/org/apache/tomcat/jni/Poll.java
Author: markt
Date: Wed Jun 13 15:59:02 2012
New Revision: 1349932
URL: http://svn.apache.org/viewvc?rev=1349932view=rev
Log:
Add per socket timeout to JNI API
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1342027
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1349932r1=1349931r2=1349932view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Wed Jun 13 15:59:02 2012
@@ -60,9 +60,9 @@ public class AprLifecycleListener
protected static final int TCN_REQUIRED_MAJOR = 1;
protected static final int TCN_REQUIRED_MINOR = 1;
-protected static final int TCN_REQUIRED_PATCH = 17;
+protected static final int TCN_REQUIRED_PATCH = 24;
protected static final int TCN_RECOMMENDED_MINOR = 1;
-protected static final int TCN_RECOMMENDED_PV = 22;
+protected static final int TCN_RECOMMENDED_PV = 24;
// -- Properties
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java?rev=1349932r1=1349931r2=1349932view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java Wed Jun 13
15:59:02 2012
@@ -73,11 +73,8 @@ public class Poll {
public static native int destroy(long pollset);
/**
- * Add a socket or to a pollset
- * If you set client_data in the descriptor, that value
- * will be returned in the client_data field whenever this
- * descriptor is signaled in apr_pollset_poll().
- * @param pollset The pollset to which to add the descriptor
+ * Add a socket to a pollset with the default timeout.
+ * @param pollset The pollset to which to add the socket
* @param sock The sockets to add
* @param reqevents requested events
*/
@@ -85,6 +82,16 @@ public class Poll {
int reqevents);
/**
+ * Add a socket to a pollset with a specific timeout.
+ * @param pollset The pollset to which to add the socket
+ * @param sock The sockets to add
+ * @param reqevents requested events
+ * @param timeout requested timeout in microseconds (-1 for infinite)
+ */
+public static native int addWithTimeout(long pollset, long sock,
+int reqevents, long timeout);
+
+/**
* Remove a descriptor from a pollset
* @param pollset The pollset from which to remove the descriptor
* @param sock The socket to remove
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349933 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt
Date: Wed Jun 13 16:00:57 2012
New Revision: 1349933
URL: http://svn.apache.org/viewvc?rev=1349933view=rev
Log:
Simplify the APR poller now per socket timeouts are supported
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1342029
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1349933r1=1349932r2=1349933view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed
Jun 13 16:00:57 2012
@@ -1094,17 +1094,15 @@ public class AprEndpoint extends Abstrac
// Need two pollsets since the socketTimeout and the keep-alive timeout
// can have different values.
private long connectionPollset = 0;
-private long keepAlivePollset = 0;
private long pool = 0;
private long[] desc;
private long[] addSocket;
-private boolean[] addSocketKeepAlive;
+private int[] addSocketTimeout;
private volatile int addCount = 0;
private boolean comet = true;
-private boolean separateKeepAlive = false;
protected volatile int keepAliveCount = 0;
public int getKeepAliveCount() { return keepAliveCount; }
@@ -1120,35 +1118,20 @@ public class AprEndpoint extends Abstrac
protected void init() {
pool = Pool.create(serverSockPool);
int size = getMaxConnections() / pollerThreadCount;
-int keepAliveTimeout = getKeepAliveTimeout();
int socketTimeout = socketProperties.getSoTimeout();
-if (keepAliveTimeout != socketTimeout !comet) {
-separateKeepAlive = true;
-}
connectionPollset = allocatePoller(size, pool, socketTimeout);
-if (separateKeepAlive) {
-keepAlivePollset = allocatePoller(size, pool,
keepAliveTimeout);
-}
if (connectionPollset == 0 size 1024) {
size = 1024;
connectionPollset = allocatePoller(size, pool, socketTimeout);
-if (separateKeepAlive) {
-keepAlivePollset =
-allocatePoller(size, pool, keepAliveTimeout);
-}
}
if (connectionPollset == 0) {
size = 62;
connectionPollset = allocatePoller(size, pool, socketTimeout);
-if (separateKeepAlive) {
-keepAlivePollset =
-allocatePoller(size, pool, keepAliveTimeout);
-}
}
desc = new long[size * 2];
keepAliveCount = 0;
addSocket = new long[size];
-addSocketKeepAlive = new boolean[size];
+addSocketTimeout= new int[size];
addCount = 0;
}
@@ -1165,11 +1148,8 @@ public class AprEndpoint extends Abstrac
destroySocket(addSocket[i]);
}
}
-// Close all sockets still in the pollers
+// Close all sockets still in the poller
closePollset(connectionPollset);
-if (separateKeepAlive) {
-closePollset(keepAlivePollset);
-}
Pool.destroy(pool);
keepAliveCount = 0;
addCount = 0;
@@ -1218,7 +1198,11 @@ public class AprEndpoint extends Abstrac
return;
}
addSocket[addCount] = socket;
-addSocketKeepAlive[addCount] = keepAlive;
+if (keepAlive) {
+addSocketTimeout[addCount] = getKeepAliveTimeout();
+} else {
+addSocketTimeout[addCount] = getSoTimeout();
+}
addCount++;
this.notify();
}
@@ -1270,14 +1254,10 @@ public class AprEndpoint extends Abstrac
int successCount = 0;
try {
for (int i = (addCount - 1); i = 0; i--) {
-int rv;
-if (separateKeepAlive
addSocketKeepAlive[i]) {
-rv = Poll.add(keepAlivePollset,
-addSocket[i], Poll.APR_POLLIN);
-} else {
-rv = Poll.add(connectionPollset,
-addSocket[i],
svn commit: r1349936 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/websocket/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/coyote/http11/upgrade/ java/org/apach
Author: markt
Date: Wed Jun 13 16:02:39 2012
New Revision: 1349936
URL: http://svn.apache.org/viewvc?rev=1349936view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53074
Make WebSocket connections use infinite read timeouts by default.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1342717
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1349936r1=1349935r2=1349936view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
Wed Jun 13 16:02:39 2012
@@ -282,4 +282,17 @@ public abstract class StreamInbound impl
* connection.
*/
protected abstract void onTextData(Reader r) throws IOException;
+
+/**
+ * This default implementation sets the read timeout to infinite and
expects
+ * the WebSocket application to close the connection when it is no longer
+ * required. Applications wishing to set an explicit timeout may override
+ * this method and return a value of their choice.
+ *
+ * @return The read timeout in milliseconds or -1 for infinite
+ */
+@Override
+public int getReadTimeout() {
+return -1;
+}
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1349936r1=1349935r2=1349936view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Wed Jun
13 16:02:39 2012
@@ -127,7 +127,8 @@ public class AjpAprProtocol extends Abst
recycledProcessors.offer(processor);
if (addToPoller) {
((AprEndpoint)proto.endpoint).getPoller().add(
-socket.getSocket().longValue(), true);
+socket.getSocket().longValue(),
+proto.endpoint.getKeepAliveTimeout());
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1349936r1=1349935r2=1349936view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Wed Jun 13 16:02:39 2012
@@ -222,7 +222,8 @@ public class Http11AprProtocol extends A
recycledProcessors.offer(processor);
if (addToPoller proto.endpoint.isRunning()) {
((AprEndpoint)proto.endpoint).getPoller().add(
-socket.getSocket().longValue(), true);
+socket.getSocket().longValue(),
+proto.endpoint.getKeepAliveTimeout());
}
}
@@ -243,11 +244,13 @@ public class Http11AprProtocol extends A
} else if (processor.isComet() proto.endpoint.isRunning()) {
// Comet
((AprEndpoint) proto.endpoint).getCometPoller().add(
-socket.getSocket().longValue(), false);
+socket.getSocket().longValue(),
+proto.endpoint.getSoTimeout());
} else {
// Upgraded
((AprEndpoint) proto.endpoint).getPoller().add(
-socket.getSocket().longValue(), false);
+socket.getSocket().longValue(),
+(processor.getUpgradeInbound().getReadTimeout()));
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
URL:
svn commit: r1349937 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt
Date: Wed Jun 13 16:03:47 2012
New Revision: 1349937
URL: http://svn.apache.org/viewvc?rev=1349937view=rev
Log:
APR 1.1.24 is now required. Remove unnecessary code.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1348968
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1349937r1=1349936r2=1349937view=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Wed Jun 13 16:03:47 2012
@@ -132,7 +132,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.1.23
+tomcat-native.version=1.1.24
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1349937r1=1349936r2=1349937view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed
Jun 13 16:03:47 2012
@@ -485,53 +485,26 @@ public class AprEndpoint extends Abstrac
}
// SSL protocol
-int value;
-// This branch can be removed, once the required version is at
least 1.1.21.
-int tcnFullVersion = Library.TCN_MAJOR_VERSION * 1000
-+ Library.TCN_MINOR_VERSION * 100
-+ Library.TCN_PATCH_VERSION;
-if (tcnFullVersion = 1120) {
+int value = SSL.SSL_PROTOCOL_NONE;
+if (SSLProtocol == null || SSLProtocol.length() == 0) {
value = SSL.SSL_PROTOCOL_ALL;
-if (SSLv2.equalsIgnoreCase(SSLProtocol)) {
-value = SSL.SSL_PROTOCOL_SSLV2;
-} else if (SSLv3.equalsIgnoreCase(SSLProtocol)) {
-value = SSL.SSL_PROTOCOL_SSLV3;
-} else if (TLSv1.equalsIgnoreCase(SSLProtocol)) {
-value = SSL.SSL_PROTOCOL_TLSV1;
-} else if (SSLv2+SSLv3.equalsIgnoreCase(SSLProtocol)) {
-value = SSL.SSL_PROTOCOL_SSLV2 | SSL.SSL_PROTOCOL_SSLV3;
-} else if (all.equalsIgnoreCase(SSLProtocol) ||
-SSLProtocol == null || SSLProtocol.length() == 0) {
-// NOOP, use the default defined above
-} else {
-// Protocol not recognized, fail to start as it is safer
than
-// continuing with the default which might enable more
than the
-// is required
-throw new Exception(sm.getString(
-endpoint.apr.invalidSslProtocol, SSLProtocol));
-}
} else {
-value = SSL.SSL_PROTOCOL_NONE;
-if (SSLProtocol == null || SSLProtocol.length() == 0) {
-value = SSL.SSL_PROTOCOL_ALL;
-} else {
-for (String protocol : SSLProtocol.split(\\+)) {
-protocol = protocol.trim();
-if (SSLv2.equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_SSLV2;
-} else if (SSLv3.equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_SSLV3;
-} else if (TLSv1.equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_TLSV1;
-} else if (all.equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_ALL;
-} else {
-// Protocol not recognized, fail to start as it is
safer than
-// continuing with the default which might enable
more than the
-// is required
-throw new Exception(sm.getString(
-endpoint.apr.invalidSslProtocol,
SSLProtocol));
-}
+for (String protocol :
svn commit: r1349939 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/http.xml
Author: markt Date: Wed Jun 13 16:04:27 2012 New Revision: 1349939 URL: http://svn.apache.org/viewvc?rev=1349939view=rev Log: Update APR SSLProtocol defaults and configuration Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1348973 Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1349939r1=1349938r2=1349939view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Wed Jun 13 16:04:27 2012 @@ -1176,12 +1176,11 @@ attribute name=SSLProtocol required=false pProtocol which may be used for communicating with clients. The default - value is codeall/code, with other acceptable values being codeSSLv2/code, - codeSSLv3/code, codeTLSv1/code and codeSSLv2+SSLv3/code. - Starting with version 1.1.21 of the Tomcat native - library any combination of the three protocols concatenated with a - plus sign will be supported. Note that the protocol codeSSLv2/code - is inherently unsafe./p + value is codeall/code, which is equivalent to codeSSLv3+TLSv1/code + with other acceptable values being codeSSLv2/code, + codeSSLv3/code, codeTLSv1/code and any combination of the three + protocols concatenated with a plus sign. Note that the protocol + codeSSLv2/code is inherently unsafe./p /attribute attribute name=SSLVerifyClient required=false - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULT] was: [VOTE] Release Apache Tomcat Native 1.1.24
On 06/13/2012 05:09 PM, Henri Gomez wrote: +1 from me also (build and tested on OSX Lion). Question, did you need binaries for OSX ? Volunteer as maintainer for consecutive versions? Sure, create .zip files with the content similar to windows, and put them in your people's dir, and call for a vote to add those binaries to dist site. (in future we can sync at RM time and call for a single vote) Suppose you'll be doing universal builds, so the .zip should be tomcat-connectors-1.1.24-macosx-universal-bin.zip with LICENSE, NOTICE, README and .dylib of course ;) Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349941 - /tomcat/tc7.0.x/trunk/
Author: markt Date: Wed Jun 13 16:05:44 2012 New Revision: 1349941 URL: http://svn.apache.org/viewvc?rev=1349941view=rev Log: Update merge info Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1349893 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349943 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Jun 13 16:07:21 2012 New Revision: 1349943 URL: http://svn.apache.org/viewvc?rev=1349943view=rev Log: Update changelog Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml 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=1349943r1=1349942r2=1349943view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 13 16:07:21 2012 @@ -143,6 +143,10 @@ message has been specified via codesendError()/code. (markt) /fix fix +bug53074/bug: Switch to an infinite socket timeout by default for +WebSocket connections. (markt) + /fix + fix bug53081/bug: Do not always cache resources loaded by the web application class loader since they may be very large which in turn could trigger a memory leak. Calls to the web application class - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53074] [websocket] java.net.SocketTimeoutException: Read timed caused by server.xml' connectTimeout
https://issues.apache.org/bugzilla/show_bug.cgi?id=53074 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #9 from Mark Thomas ma...@apache.org --- Fixed in trunk and 7.0.x and will be included in 7.0.28 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: WARNING: Incorrect connection count when running testsuite for APR/native 1.1.24
On 13/06/2012 09:24, Rainer Jung wrote: On 13.06.2012 05:21, Konstantin Kolinko wrote: Hi! I run the testsuite for Tomcat trunk with APR connector with release candidate for Tomcat Native 1.1.24, on WinXP 32-bit. The testsuite passes successfully, but looking closer into log files I see many occurrences of the following warning: 12.06.2012 21:13:43 org.apache.tomcat.util.net.AbstractEndpoint countDownConnection WARNING: Incorrect connection count, multiple socket.close called on the same socket. There are ~50 tests when it fails, the first one being org.apache.catalina.authenticator.TestFormAuthenticator It sounds like there are cases when BZ 53173 (connection counting and maxConnections) is not fixed yet for APR connector. You are right, I only checked for Failures and Errors. My test logs show the following counts for this warning: This is - currently :) - the only issue standing between me and a 7.0.28 tag. I plan to look at this tonight. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULT] was: [VOTE] Release Apache Tomcat Native 1.1.24
+1 from me also (build and tested on OSX Lion). Question, did you need binaries for OSX ? Volunteer as maintainer for consecutive versions? For OSX, no problem, I maintain up to date OpenJDK 7/8/Jigsaw and Lambda version for OSX in a daily base, providing OSX binaries should be hard. Sure, create .zip files with the content similar to windows, and put them in your people's dir, and call for a vote to add those binaries to dist site. (in future we can sync at RM time and call for a single vote) Suppose you'll be doing universal builds, so the .zip should be tomcat-connectors-1.1.24-macosx-universal-bin.zip with LICENSE, NOTICE, README and .dylib of course ;) I could provide .pkg or better .dmg is needed, as you may know I'm a strong advocate to native packages :) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULT] was: [VOTE] Release Apache Tomcat Native 1.1.24
On 06/13/2012 06:09 PM, Henri Gomez wrote: +1 from me also (build and tested on OSX Lion). Suppose you'll be doing universal builds, so the .zip should be tomcat-connectors-1.1.24-macosx-universal-bin.zip with LICENSE, NOTICE, README and .dylib of course ;) I could provide .pkg or better .dmg is needed, as you may know I'm a strong advocate to native packages :) Sure, .dmg's fine as well. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53411] New: NullPointerException in org.apache.tomcat.util.buf.CharChunk
https://issues.apache.org/bugzilla/show_bug.cgi?id=53411 Priority: P2 Bug ID: 53411 Assignee: dev@tomcat.apache.org Summary: NullPointerException in org.apache.tomcat.util.buf.CharChunk Severity: normal Classification: Unclassified OS: Linux Reporter: ja...@pakamera.com.pl Hardware: Other Status: NEW Version: 7.0.27 Component: Catalina Product: Tomcat 7 I can see in my log file a regular exception throwed by AbstractHttp11Processor, with this stack trace: org.apache.coyote.http11.AbstractHttp11Processor process Error processing request java.lang.NullPointerException at org.apache.tomcat.util.buf.CharChunk.append(CharChunk.java:355) at org.apache.tomcat.util.http.mapper.Mapper.map(Mapper.java:667) at org.apache.catalina.connector.CoyoteAdapter.postParseRequest(CoyoteAdapter.java:646) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:402) at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:999) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:565) at org.apache.tomcat.util.net.AprEndpoint$SocketWithOptionsProcessor.run(AprEndpoint.java:1770) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:722) I cannot find the request which makes this exception, it's rather rare, but still, I think it's worth to look at. -- 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
[jira] [Commented] (MTOMCAT-60) Multiple-War-Deployment in configuration section.
[
https://issues.apache.org/jira/browse/MTOMCAT-60?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13294577#comment-13294577
]
Neale Upstone commented on MTOMCAT-60:
--
Thanks. I've not seen anything about being able to specify context paths,
which is also a requirement I now have, so it looks like we'll be using your
plugin :)
Multiple-War-Deployment in configuration section.
-
Key: MTOMCAT-60
URL: https://issues.apache.org/jira/browse/MTOMCAT-60
Project: Apache Tomcat Maven Plugin
Issue Type: Improvement
Reporter: Joerg Bellmann
Priority: Minor
Attachments: maven-tomcat-plugin.patch.txt
When a user want to deploy multiple webapps with the plugin it uses all
project-war-dependencies with scope 'tomcat'. Maven 3 shows the following
message at project-processing:
{code}
[INFO] Scanning for projects...
[WARNING]
[WARNING] Some problems were encountered while building the effective model
for de.jbellmann.failsafe:de.jbellmann.failsafe.web:war:0.0.1-SNAPSHOT
[WARNING] 'dependencies.dependency.scope' for
org.springframework.samples:mvc-showcase:war must be one of [provided,
compile, runtime, test, system] but is 'tomcat'. @
[WARNING]
[WARNING] It is highly recommended to fix these problems because they
threaten the stability of your build.
[WARNING]
[WARNING] For this reason, future Maven versions might no longer support
building such malformed projects.
{code}
Configuring the additional webapps in the configuration section like this for
example :
{code}
plugin
groupIdorg.codehaus.mojo/groupId
artifactIdtomcat-maven-plugin/artifactId
version1.1-SNAPSHOT/version
executions
execution
idstart-tomcat-integration-tests/id
goals
goalrun/goal
/goals
phasepre-integration-test/phase
configuration
forktrue/fork
addContextWarDependenciestrue/addContextWarDependencies
additionalWebapps
webapp
groupIdorg.springframework.samples/groupId
artifactIdmvc-showcase/artifactId
version1.0.0-BUILD-SNAPSHOT/version
contextPath/mvc-showcase2/contextPath
/webapp
/additionalWebapps
/configuration
/execution
/executions
/plugin
{code}
avoids the warnings and makes maven 3 happy.
As a plus you can configure an contextPath different from the artifactId.
This solution was inspired by the 'maven-dependency-plugin' and uses some
code-snippets from it.
Jörg Bellmann
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: WARNING: Incorrect connection count when running testsuite for APR/native 1.1.24
This is one example of counting down twice. There are a lot of places
calling destroySocket, the best would have been to pass a SocketWrapper
instead of long and keep a AtomicBoolean to track if destroy has been called
on it.
if (running !paused) {
// Hand this socket off to an appropriate processor
if (!processSocketWithOptions(socket)) {
countDownConnection();
// Close socket and pool right away
destroySocket(socket);
}
} else {
countDownConnection();
// Close socket and pool right away
destroySocket(socket);
}
Then the actual implementation of destroySocket(long) does the same thing,
it counts it down again.
private void destroySocket(long socket) {
// If not running the socket will be destroyed by
// parent pool or acceptor socket.
// In any case disable double free which would cause JVM core.
destroySocket(socket, running);
}
private void destroySocket(long socket, boolean doIt) {
// Be VERY careful if you call this method directly. If it is called
// twice for the same socket the JVM will core. Currently this is
only
// called from Poller.closePollset() to ensure kept alive
connections
// are closed when calling stop() followed by start().
if (doIt socket != 0) {
Socket.destroy(socket);
countDownConnection();
}
}
-Original Message-
From: Konstantin Kolinko [mailto:knst.koli...@gmail.com]
Sent: Tuesday, June 12, 2012 9:21 PM
To: Tomcat Developers List
Subject: WARNING: Incorrect connection count when running testsuite
for APR/native 1.1.24
Hi!
I run the testsuite for Tomcat trunk with APR connector with release
candidate for Tomcat Native 1.1.24, on WinXP 32-bit.
The testsuite passes successfully, but looking closer into log files I
see many occurrences of the following warning:
12.06.2012 21:13:43 org.apache.tomcat.util.net.AbstractEndpoint
countDownConnection
WARNING: Incorrect connection count, multiple socket.close called on
the same socket.
There are ~50 tests when it fails, the first one being
org.apache.catalina.authenticator.TestFormAuthenticator
It sounds like there are cases when BZ 53173 (connection counting and
maxConnections) is not fixed yet for APR connector.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349984 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt
Date: Wed Jun 13 18:29:07 2012
New Revision: 1349984
URL: http://svn.apache.org/viewvc?rev=1349984view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53173
Remove some duplicate calls to countDownConnection()
While the connector is running, destroySocket() will call countDownConnection()
Once the connector is stopped, the latch is removed so it does not matter that
destroySocket() does not call countDownConnection() in that case
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1349984r1=1349983r2=1349984view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Jun 13
18:29:07 2012
@@ -981,12 +981,10 @@ public class AprEndpoint extends Abstrac
if (running !paused) {
// Hand this socket off to an appropriate processor
if (!processSocketWithOptions(socket)) {
-countDownConnection();
// Close socket and pool right away
destroySocket(socket);
}
} else {
-countDownConnection();
// Close socket and pool right away
destroySocket(socket);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Tagging 7.0.28
I'm running the TCKs and unit tests on 7.0.x/trunk now. Assuming everything passes and no-one raises a show-stopping bug between now and when they finish, I'll tag current trunk as 7.0.28 - probably some time tomorrow morning UTC. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53411] NullPointerException in org.apache.tomcat.util.buf.CharChunk
https://issues.apache.org/bugzilla/show_bug.cgi?id=53411 kubak ja...@pakamera.com.pl changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID |--- --- Comment #2 from kubak ja...@pakamera.com.pl --- Well, I think you've changed the status too early. My Apache Tomcat 7 server is running, all web apps are working and defaultHost parameter in server.xml is set to localhost: Engine name=Catalina defaultHost=localhost So, this exception doesn't stop tomcat or any context, I don't even noticed if this exception is visible for any user. From the user point of view everything works fine. I've just noticed this strange stack trace in the log file and this is the only one exception which I can find there - that's why it caught my attention. Even if the problem is in the configuration - Tomcat should not start or should give a clear message during the startup, in my opinion. -- 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 53411] NullPointerException in org.apache.tomcat.util.buf.CharChunk
https://issues.apache.org/bugzilla/show_bug.cgi?id=53411 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Mark Thomas ma...@apache.org --- The NPE is triggered by the default host name being null. Such a configuration is invalid. Please follow up on the users list for assistance. -- 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: WARNING: Incorrect connection count when running testsuite for APR/native 1.1.24
On 13/06/2012 17:08, Mark Thomas wrote: On 13/06/2012 09:24, Rainer Jung wrote: On 13.06.2012 05:21, Konstantin Kolinko wrote: Hi! I run the testsuite for Tomcat trunk with APR connector with release candidate for Tomcat Native 1.1.24, on WinXP 32-bit. The testsuite passes successfully, but looking closer into log files I see many occurrences of the following warning: 12.06.2012 21:13:43 org.apache.tomcat.util.net.AbstractEndpoint countDownConnection WARNING: Incorrect connection count, multiple socket.close called on the same socket. There are ~50 tests when it fails, the first one being org.apache.catalina.authenticator.TestFormAuthenticator It sounds like there are cases when BZ 53173 (connection counting and maxConnections) is not fixed yet for APR connector. You are right, I only checked for Failures and Errors. My test logs show the following counts for this warning: This is - currently :) - the only issue standing between me and a 7.0.28 tag. I plan to look at this tonight. OK. I think I have a fix. Running the unit test now to check... Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-60) Multiple-War-Deployment in configuration section.
[
https://issues.apache.org/jira/browse/MTOMCAT-60?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13294598#comment-13294598
]
Joerg Bellmann commented on MTOMCAT-60:
---
Ok,
you can find some example-configurations at https://github.com/t7mp/examples.
If you have any improvements or ideas feel free to put it on the issue-tracker.
If you think there is a bug in the plugin use the issue-tracker, we have no
strict roadmap and milestones and releases are possible on the fly if needed.
Cheers
Joerg
Multiple-War-Deployment in configuration section.
-
Key: MTOMCAT-60
URL: https://issues.apache.org/jira/browse/MTOMCAT-60
Project: Apache Tomcat Maven Plugin
Issue Type: Improvement
Reporter: Joerg Bellmann
Priority: Minor
Attachments: maven-tomcat-plugin.patch.txt
When a user want to deploy multiple webapps with the plugin it uses all
project-war-dependencies with scope 'tomcat'. Maven 3 shows the following
message at project-processing:
{code}
[INFO] Scanning for projects...
[WARNING]
[WARNING] Some problems were encountered while building the effective model
for de.jbellmann.failsafe:de.jbellmann.failsafe.web:war:0.0.1-SNAPSHOT
[WARNING] 'dependencies.dependency.scope' for
org.springframework.samples:mvc-showcase:war must be one of [provided,
compile, runtime, test, system] but is 'tomcat'. @
[WARNING]
[WARNING] It is highly recommended to fix these problems because they
threaten the stability of your build.
[WARNING]
[WARNING] For this reason, future Maven versions might no longer support
building such malformed projects.
{code}
Configuring the additional webapps in the configuration section like this for
example :
{code}
plugin
groupIdorg.codehaus.mojo/groupId
artifactIdtomcat-maven-plugin/artifactId
version1.1-SNAPSHOT/version
executions
execution
idstart-tomcat-integration-tests/id
goals
goalrun/goal
/goals
phasepre-integration-test/phase
configuration
forktrue/fork
addContextWarDependenciestrue/addContextWarDependencies
additionalWebapps
webapp
groupIdorg.springframework.samples/groupId
artifactIdmvc-showcase/artifactId
version1.0.0-BUILD-SNAPSHOT/version
contextPath/mvc-showcase2/contextPath
/webapp
/additionalWebapps
/configuration
/execution
/executions
/plugin
{code}
avoids the warnings and makes maven 3 happy.
As a plus you can configure an contextPath different from the artifactId.
This solution was inspired by the 'maven-dependency-plugin' and uses some
code-snippets from it.
Jörg Bellmann
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53411] NullPointerException in org.apache.tomcat.util.buf.CharChunk
https://issues.apache.org/bugzilla/show_bug.cgi?id=53411 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |INVALID --- Comment #3 from Mark Thomas ma...@apache.org --- There is insufficient information provided to reproduce the issue. The only information provided - the stack trace - points to a configuration problem. Please do not re-open this issue without providing either: - sufficient information for it to be produced - analysis that identifies a code path that code trigger this issue The users list is the place to seek help with obtaining either of the above. A warning is already logged if the default host cannot be identified. -- 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: [RESULT] was: [VOTE] Release Apache Tomcat Native 1.1.24
Which make me think that PKG or DMG for Tomcat would be great. Just need a cool control panel app like the one available for Windows. Any Cocoa volunteer around ? :-) Le 13 juin 2012 à 18:14, Mladen Turk mt...@apache.org a écrit : On 06/13/2012 06:09 PM, Henri Gomez wrote: +1 from me also (build and tested on OSX Lion). Suppose you'll be doing universal builds, so the .zip should be tomcat-connectors-1.1.24-macosx-universal-bin.zip with LICENSE, NOTICE, README and .dylib of course ;) I could provide .pkg or better .dmg is needed, as you may know I'm a strong advocate to native packages :) Sure, .dmg's fine as well. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-60) Multiple-War-Deployment in configuration section.
[
https://issues.apache.org/jira/browse/MTOMCAT-60?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13294635#comment-13294635
]
Olivier Lamy (*$^¨%`£) commented on MTOMCAT-60:
---
Come on folks. Here it's an OpenSource project developed by personal
contributors.
So all patches are welcome if you want to improve something!
Cheers!
Multiple-War-Deployment in configuration section.
-
Key: MTOMCAT-60
URL: https://issues.apache.org/jira/browse/MTOMCAT-60
Project: Apache Tomcat Maven Plugin
Issue Type: Improvement
Reporter: Joerg Bellmann
Priority: Minor
Attachments: maven-tomcat-plugin.patch.txt
When a user want to deploy multiple webapps with the plugin it uses all
project-war-dependencies with scope 'tomcat'. Maven 3 shows the following
message at project-processing:
{code}
[INFO] Scanning for projects...
[WARNING]
[WARNING] Some problems were encountered while building the effective model
for de.jbellmann.failsafe:de.jbellmann.failsafe.web:war:0.0.1-SNAPSHOT
[WARNING] 'dependencies.dependency.scope' for
org.springframework.samples:mvc-showcase:war must be one of [provided,
compile, runtime, test, system] but is 'tomcat'. @
[WARNING]
[WARNING] It is highly recommended to fix these problems because they
threaten the stability of your build.
[WARNING]
[WARNING] For this reason, future Maven versions might no longer support
building such malformed projects.
{code}
Configuring the additional webapps in the configuration section like this for
example :
{code}
plugin
groupIdorg.codehaus.mojo/groupId
artifactIdtomcat-maven-plugin/artifactId
version1.1-SNAPSHOT/version
executions
execution
idstart-tomcat-integration-tests/id
goals
goalrun/goal
/goals
phasepre-integration-test/phase
configuration
forktrue/fork
addContextWarDependenciestrue/addContextWarDependencies
additionalWebapps
webapp
groupIdorg.springframework.samples/groupId
artifactIdmvc-showcase/artifactId
version1.0.0-BUILD-SNAPSHOT/version
contextPath/mvc-showcase2/contextPath
/webapp
/additionalWebapps
/configuration
/execution
/executions
/plugin
{code}
avoids the warnings and makes maven 3 happy.
As a plus you can configure an contextPath different from the artifactId.
This solution was inspired by the 'maven-dependency-plugin' and uses some
code-snippets from it.
Jörg Bellmann
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349997 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java tomcat7-maven-plugin/src/main/java/org/apache/tomca
Author: olamy
Date: Wed Jun 13 20:13:49 2012
New Revision: 1349997
URL: http://svn.apache.org/viewvc?rev=1349997view=rev
Log:
[MTOMCAT-160] Skipping non-war project should not happen if using
addContextWarDependencies
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java?rev=1349997r1=1349996r2=1349997view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
Wed Jun 13 20:13:49 2012
@@ -378,7 +378,7 @@ public abstract class AbstractRunMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
-if ( skip )
+if ( skip !addContextWarDependencies )
{
getLog().info( skip execution );
return;
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1349997r1=1349996r2=1349997view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Wed Jun 13 20:13:49 2012
@@ -412,7 +412,7 @@ public abstract class AbstractRunMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
-if ( skip )
+if ( skip !addContextWarDependencies )
{
getLog().info( skip execution );
return;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-160) Skipping non-war project should not happen if using addContextWarDependencies
[
https://issues.apache.org/jira/browse/MTOMCAT-160?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Olivier Lamy (*$^¨%`£) closed MTOMCAT-160.
--
Resolution: Fixed
Fix Version/s: 2.0
Assignee: Olivier Lamy (*$^¨%`£)
fixed
Please test last SNAPSHOT and reopen if any issues.
Skipping non-war project should not happen if using
addContextWarDependencies
-
Key: MTOMCAT-160
URL: https://issues.apache.org/jira/browse/MTOMCAT-160
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Affects Versions: 1.1, 2.0-beta-1
Reporter: Neale Upstone
Assignee: Olivier Lamy (*$^¨%`£)
Fix For: 2.0
For build pipelines,
addContextWarDependenciestrue/addContextWarDependencies is often used in
projects which contain just the acceptance tests.
If the project packaging is set as JAR, we get:
[INFO] [tomcat:run {execution: start-tomcat}]
[INFO] Skipping non-war project
I can see reasons why the skip logic is there, but this should not happen
when addContextWarDependencies (or any cleaner successor) is enabled.
Any chance of this getting tweaked for beta2/rc1 ?
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1349999 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Wed Jun 13 20:19:40 2012 New Revision: 134 URL: http://svn.apache.org/viewvc?rev=134view=rev Log: ignore *.patch files in rat plugin Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=134r1=1349998r2=134view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Wed Jun 13 20:19:40 2012 @@ -629,6 +629,7 @@ exclude.git/**/exclude exclude.idea/**/exclude exclude.extract/**/exclude + exclude*.patch/exclude /excludes /configuration /plugin - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-160) Skipping non-war project should not happen if using addContextWarDependencies
[
https://issues.apache.org/jira/browse/MTOMCAT-160?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13294640#comment-13294640
]
Hudson commented on MTOMCAT-160:
Integrated in TomcatMavenPlugin-mvn3.x #159 (See
[https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/159/])
[MTOMCAT-160] Skipping non-war project should not happen if using
addContextWarDependencies (Revision 1349997)
Result = FAILURE
olamy : http://svn.apache.org/viewvc/?view=revrev=1349997
Files :
*
/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
*
/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Skipping non-war project should not happen if using
addContextWarDependencies
-
Key: MTOMCAT-160
URL: https://issues.apache.org/jira/browse/MTOMCAT-160
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Affects Versions: 1.1, 2.0-beta-1
Reporter: Neale Upstone
Assignee: Olivier Lamy (*$^¨%`£)
Fix For: 2.0
For build pipelines,
addContextWarDependenciestrue/addContextWarDependencies is often used in
projects which contain just the acceptance tests.
If the project packaging is set as JAR, we get:
[INFO] [tomcat:run {execution: start-tomcat}]
[INFO] Skipping non-war project
I can see reasons why the skip logic is there, but this should not happen
when addContextWarDependencies (or any cleaner successor) is enabled.
Any chance of this getting tweaked for beta2/rc1 ?
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging 7.0.28
On 13/06/2012 19:39, Mark Thomas wrote: I'm running the TCKs and unit tests on 7.0.x/trunk now. Assuming everything passes and no-one raises a show-stopping bug between now and when they finish, I'll tag current trunk as 7.0.28 - probably some time tomorrow morning UTC. Drat. I'm seeing TCK failures. I think they are SSL configuration related but need to dig further. The tag is therefore delayed until I get things figured out (probably tomorrow). If you have any patches you want to squeeze into 7.0.28, now would be the time to do it :) Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53411] NullPointerException in org.apache.tomcat.util.buf.CharChunk
https://issues.apache.org/bugzilla/show_bug.cgi?id=53411
--- Comment #4 from Konstantin Kolinko knst.koli...@gmail.com ---
Just for reference, confirming what Mark already wrote,
in tc7.0.x/tags/TOMCAT_7_0_27
CharChunk.java line 355
[[[
354 public void append(String s) throws IOException {
355 append(s, 0, s.length());
356 }
]]]
So s is null.
Mapper.java line 667
[[[
666 if (host.isNull()) {
667 host.getCharChunk().append(defaultHostName);
668 }
]]]
So defaultHostName is null.
The if(host.isNull()) branch is executed when it is an HTTP/1.0 request that
does not have a Host header. Such requests are rare nowadays.
(In reply to comment #2)
Engine name=Catalina defaultHost=localhost
There must exist Host name=localhost for that. If it does not, the
defaultHost value will be ignored.
MapperListener.java
[[[
if(found) {
mapper.setDefaultHostName(defaultHost);
} else {
log.warn(sm.getString(mapperListener.unknownDefaultHost,
defaultHost, connector));
}
]]]
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: svn commit: r1349984 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
} else {
-countDownConnection();
// Close socket and pool right away
destroySocket(socket);
}
[Filip Hanik]
'running' variable could be false here, at which point, socket nor countdown
happens
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: svn commit: r1349984 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
My suggestion for a 7.0.28 is to have -1 for the default value of
maxConnections for APR. This disables maxConnections until we have a better
grip on it.
Changing it to track closures is quite a surgery, something I would do for
trunk, but leave out of 7.0.x. This leaves existing code flow intact, but
changes parameter types everywhere.
Actually rewriting the code to ensure it never gets called more than once
without tracking it, seems a bit risky.
I ran unit tests with the same fix,
-Original Message-
From: ma...@apache.org [mailto:ma...@apache.org]
Sent: Wednesday, June 13, 2012 12:29 PM
To: dev@tomcat.apache.org
Subject: svn commit: r1349984 -
/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt
Date: Wed Jun 13 18:29:07 2012
New Revision: 1349984
URL: http://svn.apache.org/viewvc?rev=1349984view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53173
Remove some duplicate calls to countDownConnection()
While the connector is running, destroySocket() will call
countDownConnection()
Once the connector is stopped, the latch is removed so it does not
matter that destroySocket() does not call countDownConnection() in that
case
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/ne
t/AprEndpoint.java?rev=1349984r1=1349983r2=1349984view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed
Jun 13 18:29:07 2012
@@ -981,12 +981,10 @@ public class AprEndpoint extends Abstrac
if (running !paused) {
// Hand this socket off to an appropriate
processor
if (!processSocketWithOptions(socket)) {
-countDownConnection();
// Close socket and pool right away
destroySocket(socket);
}
} else {
-countDownConnection();
// Close socket and pool right away
destroySocket(socket);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1349984 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
On 13/06/2012 22:14, Filip Hanik (mailing lists) wrote:
} else {
-countDownConnection();
// Close socket and pool right away
destroySocket(socket);
}
[Filip Hanik]
'running' variable could be false here, at which point, socket nor countdown
happens
Already addressed. Read the commit comment.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350022 - /tomcat/tc7.0.x/trunk/modules/
Author: fhanik Date: Wed Jun 13 21:24:00 2012 New Revision: 1350022 URL: http://svn.apache.org/viewvc?rev=1350022view=rev Log: Make sure that the revisions are up to date prior to tagging Modified: tomcat/tc7.0.x/trunk/modules/ (props changed) Propchange: tomcat/tc7.0.x/trunk/modules/ -- --- svn:externals (original) +++ svn:externals Wed Jun 13 21:24:00 2012 @@ -1 +1 @@ -^/tomcat/trunk/modules/jdbc-pool@1348056 jdbc-pool +^/tomcat/trunk/modules/jdbc-pool@1350020 jdbc-pool - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350027 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: fhanik Date: Wed Jun 13 21:34:14 2012 New Revision: 1350027 URL: http://svn.apache.org/viewvc?rev=1350027view=rev Log: votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1350027r1=1350026r2=1350027view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 13 21:34:14 2012 @@ -203,7 +203,7 @@ PATCHES PROPOSED TO BACKPORT: Patch: http://people.apache.org/~kkolinko/patches/2012-06-06_tc6_Generator.patch (backport of r1347100 in Tomcat 7, r1346885 in trunk) - +1: kkolinko, schultz + +1: kkolinko, schultz, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52996 @@ -215,7 +215,7 @@ PATCHES PROPOSED TO BACKPORT: It is backport of r723889 from trunk. https://issues.apache.org/bugzilla/attachment.cgi?id=28907 (patch) http://svn.apache.org/viewvc?view=revisionrevision=1348105 (documentation update) - +1: kkolinko + +1: kkolinko, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53047 @@ -227,6 +227,7 @@ PATCHES PROPOSED TO BACKPORT: at least set required=false on roleNameCol, userRoleTable in config/realm.html) -1: + * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53071 Use the message from the Throwable for the error report if none was specified via sendError() - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53411] NullPointerException in org.apache.tomcat.util.buf.CharChunk
https://issues.apache.org/bugzilla/show_bug.cgi?id=53411
Konstantin Kolinko knst.koli...@gmail.com changed:
What|Removed |Added
Status|RESOLVED|REOPENED
Resolution|INVALID |---
Severity|normal |enhancement
--- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com ---
Reopening this as enhancement.
Looking at AbstractHttp11Processor#process() this error is correctly written to
access log, etc, so I do not see much concern.
Still I think there is a room for improvement, and I noted several minor issues
from my code review.
1) in MapperListener#findDefaultHost()
First, maybe
s/log.warn(sm.getString(mapperListener.unknownDefaultHost,/log.error/
Second, maybe mention something like Tomcat will not be able to process
HTTP/1.0 requests that do not specify a Host header in the message.
Third, I am a bit wondering why not to call mapper.setDefaultHost()
unconditionally. What is wrong with passing a name there?
Hosts can be added and removed through JMX calls on
StandardEngine#addChild()/removeChild() and it seems that MapperListener fails
to update defaultHost setting on the Mapper when it happens.
So why not to pass the defaultHost name to the Mapper as is and let it handle
missing matches (like it already does)?
2) in Mapper#map(MB,MB,S,MD)
Fourth,
Maybe just return without mapping here, as if the Host is not found. We already
do if(defaultHostName==null){ return; } in its #internalMap(CC,CC,S,MD) method.
It will need some update to its caller though, which is
CoyoteAdapter#postParseRequest()
3) In CoyoteAdapter#postParseRequest()
This request could be rejected with error 404, instead of 400 that exception
handling in AbstractHttp11Processor#process() does. The postParseRequest()
already has code for handling it as 404, but
Fifth,
access logging needs to be changed a bit. The current code:
[[[
// Make sure there is a host (might not be during shutdown)
if (host != null) {
host.logAccess(request, response, 0, true);
}
]]]
I think that it should fallback to CoyoteAdapter#log(..) when host is null.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1349984 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
2012/6/13 ma...@apache.org: Author: markt Date: Wed Jun 13 18:29:07 2012 New Revision: 1349984 URL: http://svn.apache.org/viewvc?rev=1349984view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53173 Remove some duplicate calls to countDownConnection() While the connector is running, destroySocket() will call countDownConnection() Once the connector is stopped, the latch is removed so it does not matter that destroySocket() does not call countDownConnection() in that case It seems that this commit has not been merged to 7.0 yet. Looking at AprEndpoint#processSocketWithOptions(..) it looks that it should return false when running flag is false. It does not matter with the current code though. Once the connector is stopped, the latch is removed so it does not matter that destroySocket() does not call countDownConnection() in that case Maybe mention the above rationale in a comment in AprEndpoint#destroySocket(..)? In my understanding the reason why we do not countdown here is that it is known that no new connections will be allowed, so there is no need to maintain the counter that limits new connections. It might be nice to amend test cases to check that connection counter goes back to 0 after Tomcat shuts down, but it probably never happens. Skipping countdown in destroySocket is one reason why such a test may return false results. Rainer mentioned that he observed Incorrect connection count warning with BIO connector, but only once (in tcn-tc-ant_test-bio.out-1.1.24.sles10.x86_64:1). The cause is still unknown. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
