Re: svn commit: r1349984 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
On 13/06/2012 23:22, Konstantin Kolinko wrote: > 2012/6/13 : >> Author: markt >> Date: Wed Jun 13 18:29:07 2012 >> New Revision: 1349984 >> >> URL: http://svn.apache.org/viewvc?rev=1349984&view=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. I'll do that shortly. > 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(..)? +1 > 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. Exactly. The code goes further and removes the latch as soon as stop is called. > 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. Could be tricky given that the latch is removed. > 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. Yep - still on the todo list but not as urgent and not blocking a 7.0.28 release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350124 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt Date: Thu Jun 14 08:19:19 2012 New Revision: 1350124 URL: http://svn.apache.org/viewvc?rev=1350124&view=rev Log: Add explanatory comment 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=1350124&r1=1350123&r2=1350124&view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu Jun 14 08:19:19 2012 @@ -906,6 +906,11 @@ public class AprEndpoint extends Abstrac // 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. + +// 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 destroySocket(socket, running); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350125 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jun 14 08:22:22 2012
New Revision: 1350125
URL: http://svn.apache.org/viewvc?rev=1350125&view=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/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1349984,1350124
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=1350125&r1=1350124&r2=1350125&view=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 Thu
Jun 14 08:22:22 2012
@@ -902,6 +902,11 @@ public class AprEndpoint extends Abstrac
// 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.
+
+// 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
destroySocket(socket, running);
}
@@ -977,12 +982,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);
}
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=1350125&r1=1350124&r2=1350125&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jun 14 08:22:22 2012
@@ -295,8 +295,7 @@
header. Based on a patch suggested by Philippe Marschall. (markt)
-53173 (1333116) :
-Properly count down maxConnections (fhanik)
+53173: Properly count down maxConnections (fhanik)
Update default value of pollerThreadCount for the NIO connector.
-
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-tabpanel&focusedCommentId=13294897#comment-13294897
]
Neale Upstone commented on MTOMCAT-60:
--
Such as the patch that has been on this issue since 10/Aug/10 02:07 ?? :-|
I don't think Joerg was out of order to say what he did when he submitted a
patch and it got ignored for 2 years.
So. Now we're talking, what's the view on the patch?
:)
> 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}
>
> org.codehaus.mojo
> tomcat-maven-plugin
> 1.1-SNAPSHOT
>
>
>
> start-tomcat-integration-tests
>
> run
>
>
> pre-integration-test
>
> true
>
> true
>
>
>
>
> org.springframework.samples
>
> mvc-showcase
>
> 1.0.0-BUILD-SNAPSHOT
>
> /mvc-showcase2
>
>
>
>
>
>
>
>
> {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: r1350130 - /tomcat/trunk/TOMCAT-NEXT.txt
Author: markt Date: Thu Jun 14 08:50:27 2012 New Revision: 1350130 URL: http://svn.apache.org/viewvc?rev=1350130&view=rev Log: Add some notes as I start to look at the 8.0.x refactorings Modified: tomcat/trunk/TOMCAT-NEXT.txt Modified: tomcat/trunk/TOMCAT-NEXT.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1350130&r1=1350129&r2=1350130&view=diff == --- tomcat/trunk/TOMCAT-NEXT.txt (original) +++ tomcat/trunk/TOMCAT-NEXT.txt Thu Jun 14 08:50:27 2012 @@ -39,6 +39,10 @@ but possibly 7.1.x). 7. Rip out all the JNDI code in resource handling and replace it with straight URLs (File or WAR). +Supporting re-factoring to consider arising from the above +- Move Mapper from Connector to Service (saves duplication) +- Remove Mapper from Context - use Mapper from Service +- Move mapper classes to o.a.catalina 8. Review the connector shutdown code for timing and threading issues particularly any that may result in a client socket being left open after a - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/672 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1350125 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350139 - /tomcat/trunk/TOMCAT-NEXT.txt
Author: markt Date: Thu Jun 14 09:03:40 2012 New Revision: 1350139 URL: http://svn.apache.org/viewvc?rev=1350139&view=rev Log: Another re-factoring to consider Modified: tomcat/trunk/TOMCAT-NEXT.txt Modified: tomcat/trunk/TOMCAT-NEXT.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1350139&r1=1350138&r2=1350139&view=diff == --- tomcat/trunk/TOMCAT-NEXT.txt (original) +++ tomcat/trunk/TOMCAT-NEXT.txt Thu Jun 14 09:03:40 2012 @@ -52,4 +52,6 @@ but possibly 7.1.x). 10. Code to the interfaces in the o.a.catalina package and avoid coding directly to implementations in other packages. This is likely to require a lot of -work. Maybe use Structure 101 (or similar) to help. \ No newline at end of file +work. Maybe use Structure 101 (or similar) to help. + +11. Merge Service and Engine \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350149 - /tomcat/trunk/TOMCAT-NEXT.txt
Author: markt Date: Thu Jun 14 09:23:31 2012 New Revision: 1350149 URL: http://svn.apache.org/viewvc?rev=1350149&view=rev Log: Tweak ideas Modified: tomcat/trunk/TOMCAT-NEXT.txt Modified: tomcat/trunk/TOMCAT-NEXT.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1350149&r1=1350148&r2=1350149&view=diff == --- tomcat/trunk/TOMCAT-NEXT.txt (original) +++ tomcat/trunk/TOMCAT-NEXT.txt Thu Jun 14 09:23:31 2012 @@ -40,7 +40,7 @@ but possibly 7.1.x). 7. Rip out all the JNDI code in resource handling and replace it with straight URLs (File or WAR). Supporting re-factoring to consider arising from the above -- Move Mapper from Connector to Service (saves duplication) +- Move Mapper from Connector to Service/Engine (saves duplication) - Remove Mapper from Context - use Mapper from Service - Move mapper classes to o.a.catalina - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350175 - in /tomcat/site/trunk: docs/download-connectors.html docs/download-native.html xdocs/download-connectors.xml xdocs/download-native.xml
Author: rjung Date: Thu Jun 14 10:10:51 2012 New Revision: 1350175 URL: http://svn.apache.org/viewvc?rev=1350175&view=rev Log: Reinstate path to connectors KEYS file in key checking instructions. Currently we don't have a unified KEYS file but about 5 different ones. Modified: tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/xdocs/download-connectors.xml tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1350175&r1=1350174&r2=1350175&view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Thu Jun 14 10:10:51 2012 @@ -376,7 +376,7 @@ You must verify the integrity of the downloaded files. We provide OpenPGP signatures for every release file. This signature should be matched against the -http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS file +http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS file which contains the OpenPGP keys of Tomcat's Release Managers. We also provide an MD5 checksum for every release file. After you download the file, you should calculate a checksum for your download, Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1350175&r1=1350174&r2=1350175&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Thu Jun 14 10:10:51 2012 @@ -361,7 +361,7 @@ You must verify the integrity of the downloaded files. We provide OpenPGP signatures for every release file. This signature should be matched against the -http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS file +http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS file which contains the OpenPGP keys of Tomcat's Release Managers. We also provide an MD5 checksum for every release file. After you download the file, you should calculate a checksum for your download, Modified: tomcat/site/trunk/xdocs/download-connectors.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?rev=1350175&r1=1350174&r2=1350175&view=diff == --- tomcat/site/trunk/xdocs/download-connectors.xml (original) +++ tomcat/site/trunk/xdocs/download-connectors.xml Thu Jun 14 10:10:51 2012 @@ -96,7 +96,7 @@ You must verify the integrity of the downloaded files. We provide OpenPGP signatures for every release file. This signature should be matched against the -http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS file +http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS file which contains the OpenPGP keys of Tomcat's Release Managers. We also provide an MD5 checksum for every release file. After you download the file, you should calculate a checksum for your download, Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1350175&r1=1350174&r2=1350175&view=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Thu Jun 14 10:10:51 2012 @@ -88,7 +88,7 @@ You must verify the integrity of the downloaded files. We provide OpenPGP signatures for every release file. This signature should be matched against the -http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS file +http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS file which contains the OpenPGP keys of Tomcat's Release Managers. We also provide an MD5 checksum for every release file. After you download the file, you should calculate a checksum for your download, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350185 - in /tomcat/site/trunk: docs/download-native.html docs/index.html xdocs/download-native.xml xdocs/index.xml
Author: mturk Date: Thu Jun 14 10:51:29 2012 New Revision: 1350185 URL: http://svn.apache.org/viewvc?rev=1350185&view=rev Log: Add 1.1.24 release info Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/download-native.xml tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1350185&r1=1350184&r2=1350185&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Thu Jun 14 10:51:29 2012 @@ -280,20 +280,20 @@ - -Native 1.1.23 Source Release tar.gz + +Native 1.1.24 Source Release tar.gz (e.g. Unix, Linux, Mac OS) -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.md5";>MD5] @@ -303,20 +303,20 @@ - -Native 1.1.23 Source Release zip + +Native 1.1.24 Source Release zip (e.g. Windows) -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-win32-src.zip.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-win32-src.zip.md5";>MD5] @@ -333,7 +333,7 @@ You can find binaries release too You may download them from - HERE + HERE Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1350185&r1=1350184&r2=1350185&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Thu Jun 14 10:51:29 2012 @@ -233,6 +233,37 @@ project logo are trademarks of the Apach + +Tomcat Native 1.1.22 Released2012-06-13 + + + + + + + +The Apache Tomcat Project is proud to announce the release of version 1.1.24 of Tomcat Native. + + + + +Download | +ChangeLog for 1.1.23 + + + + + + + + + + + + + + + Tomcat Connectors 1.2.37 Released2012-05-31 Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1350185&r1=1350184&r2=1350185&view=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Thu Jun 14 10:51:29 2012 @@ -49,28 +49,28 @@ Source (please choose the correct format for your platform) - -Native 1.1.23 Source Release tar.gz + +Native 1.1.24 Source Release tar.gz (e.g. Unix, Linux, Mac OS) -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.md5";>MD5] - -Native 1.1.23 Source Release zip + +Native 1.1.24 Source Release zip (e.g. Windows) -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1
svn commit: r1350189 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: mturk Date: Thu Jun 14 11:02:23 2012 New Revision: 1350189 URL: http://svn.apache.org/viewvc?rev=1350189&view=rev Log: Axe old 1.1.23 release info Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1350189&r1=1350188&r2=1350189&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Thu Jun 14 11:02:23 2012 @@ -346,38 +346,6 @@ Full details of these changes, and all t - -Tomcat Native 1.1.23 Released2012-03-02 - - - - - - - -The Apache Tomcat Project is proud to announce the release of version 1.1.23 of Tomcat Native. -This version is principally a bugfix release. - - - - -Download | -ChangeLog for 1.1.23 - - - - - - - - - - - - - - - Tomcat Maven Plugin 2.0-beta-1 Released2012-02-01 Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1350189&r1=1350188&r2=1350189&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Thu Jun 14 11:02:23 2012 @@ -83,17 +83,6 @@ Full details of these changes, and all t - - -The Apache Tomcat Project is proud to announce the release of version 1.1.23 of Tomcat Native. -This version is principally a bugfix release. - - -Download | -ChangeLog for 1.1.23 - - - The Apache Tomcat team is pleased to announce the release of Tomcat - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r691 - in /release/tomcat: tomcat-6/KEYS tomcat-7/KEYS tomcat-connectors/KEYS
Author: rjung Date: Thu Jun 14 12:19:51 2012 New Revision: 691 Log: Update top level KEYS files with keys added to the "released" KEYS files. I did not remove old KEYS gone in the releases, because they might still be useful to verify old releases. There seems to be no mechanism to keep these top level files in sync with the ones in the sub directories belonging to individual releases. Modified: release/tomcat/tomcat-6/KEYS release/tomcat/tomcat-7/KEYS release/tomcat/tomcat-connectors/KEYS Modified: release/tomcat/tomcat-6/KEYS == --- release/tomcat/tomcat-6/KEYS (original) +++ release/tomcat/tomcat-6/KEYS Thu Jun 14 12:19:51 2012 @@ -253,8 +253,56 @@ =r1gT -END PGP PUBLIC KEY BLOCK- +pub 1024D/41E49465 2006-11-08 + Key fingerprint = 80FF 76D8 8A96 9FE4 6108 558A 80B9 53A0 41E4 9465 +uid Remy Maucherat +sig 341E49465 2006-11-08 Remy Maucherat +sub 4096g/D07A28EB 2006-11-08 +sig 41E49465 2006-11-08 Remy Maucherat + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.2.2 (FreeBSD) + +mQGiBEVRM9MRBACUu2eecHcv9rzUfpvsAIkeAEXubebzBQOHCmfziV1DoARrhe4p +6ZT7bxy0mdOcwd5AhcUskRpa++vjmp7eVzfrecnGrI1lE/yQx7kH+HM3LXYBsZfu +wHDinvj0LsfPsC3kebbajBuyTlXkGO04wng7uFmGhMVHMaQv7n6EYv4mZwCgwd+v +cHtSA/jqQerji7//9pPydzUD/iLe7XQNaftiUJIodNyrvWwGkhc9lfhIQwxXFKsX +qbEUXXXm3L/FXJ9raaqaQQ8xS1fWRp1ojfifrbgTqt+a32gOL3IYtsO0/btiY4wF +KE+7mhsgNytyQtvn3MpoNQXYRo6ikmVG/Qi/JcjOUQBgo7l6rF6+iaic1lF/aHaG +6BT5A/43gcjkc7RNJEcuFa2RCgbre25FQ0IQxyZkrIg3L4EFVFAGeiKl6NdM4VZq +SBkA/Vgw3MGRDk23EMXaV1gG20iXuWaqfmnme77xDIME9T/Qud0kLJN7UIi2kapJ +w630ZJK/WxV3KY3XQ8chQxJcSoIyR1Kw0bmVHvc7c4TUkYBYk7QgUmVteSBNYXVj +aGVyYXQgPHJlbW1AYXBhY2hlLm9yZz6IYAQTEQIAIAUCRVEz0wIbAwYLCQgHAwIE +FQIIAwQWAgMBAh4BAheAAAoJEIC5U6BB5JRlCYsAoIfezo8wV6jPsrsm5RjyBdEC +2DKuAKCHb3e28i2OFUmvoRWxQrhLGpWIurkEDQRFUTR5EBAA60t9ry4FGirmBlje +uPIfsN5KAHqV/5Tunyhvya4Y94NhBIdj22c0SeA/rlUb0t26rBSZlNaCDK24+PpM +dIaQEun8YoWMlu0nMbGQn/RQZPb++Mbcht0Ei0x+AHQyTWPK9WGtr9y3vGeqkAiq +FhuSLSv2BLrpaqg9uY2VjVzJZS/Z+6DJHZp2nOnJJp4Tsgk9G289H/aAldgNY5mQ +M/LUhRSqKuIqGmJVWgoNhoerVYOYoH3ar0lRaJv+THIuqb8DgqU09zLnRJBC7Ydm +rcLi455xcYBlvQHD4DzLHqqjZeJP+lgTnO7Jt3zWX+MjxIZF7kwDJ5+3f7gCzVEU +wav+SDwxhuU4dMclbCZIuku5pkNaEox2b9seCFnYo3l6XKzMZEIj1+HHeKMfttq+ +oo9WQNpd/B+JI1zabfkDThlWOT2vNvgcFE720GGUtGuxLCkGiVjxn/PJZKQ2PY68 +MHUqHyWagyzXp+4VITL27V7K8w6zzQD2MMOAUGp0GOYGwLqqG0CE/ArOIgdr7dmc +89J2TusBRVLS5W8KMlWfjmdxgInai50k+d1sC3j96bGbcO7q7f5xuRBYily6RShX +JvyQBlXrYHE6XPMLAyj+0PokikV2Il9QHlMV41qcFJcoI+JeT4q9uyBGj23nz69k +AJEwIxLd6RqZfAGDYHqRALpIZzcAAwUP+webwWjbPEMs3RvW3HS2zZoQjcz3kczJ +StssueyV8pUR7vRzw+pMqIO3QdoHTrjM15fepX5WZfle+BDwgGCTeDNle90uV5Tw +uXQN7oGCTEmrowkCzAAf3KVZdJqgFfYsCCRPpF8aEEueBhvry9Tm/I2MCxXVGDrv +x8jGbU9tHMM7uMXQu1VjyJ4FAAwjAMpck7ZYNDwW6ZHSjnem820ZIeKXK5wGytYn +KIpAmnjBJpnSpwuBqAF2rqpu8yU1CLJkFM7TnPkwCDdUhiuemTkn1nAkuK1Yx7ST +VwTXMyb5pMKJP6XED4iD7w+no+oVU5wkS3AOL9LZq8LixWdFuYlbrubhA8VeI2su +WPqapCErjA3NUZQJpR1sTSKFszs7zv2ZKf41r+Koam1hstKuVoARgncAFfCCvTI7 +qOdthZG4KbNPExaQpSM/8eiQh76VO9XzElW3xbMLigKDZiWzMhB8h8mmummvZ88c +qX6GX5+X9raEwBuI92ncjPgAdgXiBtGkecBBk6aW2xq4Q8mxf3wMlC3G0NFA8S+v +MMqWbkP9rH2zVaKhP2Z5iRtMWtv4aErmQbpQE4njn1Hq8/+2DH2jbsaAbjDGoRCT +kj3S/Nggbfeokc7ADy1fiAp53KAmFJ/V1deljsvSAgsHowvWEokgE3L19Ze9PTYS +75jSWQugU1pBiEkEGBECAAkFAkVRNHkCGwwACgkQgLlToEHklGU7IgCeNQ0uTbpc +7WnKtnFOYi9RY4dVN74AoIRJjsMmkpO++KflIhY3UtzKGmTy +=lDGt +-END PGP PUBLIC KEY BLOCK- + pub 1024D/288584E7 2008-07-02 -uid Rémy Maucherat +uid Rémy Maucherat sub 4096g/4B6FAEFB 2008-07-02 -BEGIN PGP PUBLIC KEY BLOCK- Modified: release/tomcat/tomcat-7/KEYS == --- release/tomcat/tomcat-7/KEYS (original) +++ release/tomcat/tomcat-7/KEYS Thu Jun 14 12:19:51 2012 @@ -464,3 +464,62 @@ Io8ZP0E= =xT1M -END PGP PUBLIC KEY BLOCK- +pub 4096R/731FABEE 2011-05-27 + Key fingerprint = 9BA4 4C26 2138 5CB9 66EB A586 F72C 284D 731F ABEE +uid Tim Whittington (CODE SIGNING KEY) +sig 3731FABEE 2011-05-27 Tim Whittington (CODE SIGNING KEY) +sub 4096R/461B342D 2011-05-27 +sig 731FABEE 2011-05-27 Tim Whittington (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.11 (Darwin) + +mQINBE3fcdABEADmpbGMmnQiMc4biU+CIhV6EJ7lBaRzXzh4tJ4eITfw6IbImDRn +0JHZNjeE5zXLeH0PQ0K8/bYzFhMGwQOgvZETV7LPVLid6F9LbvDnItcWyoiZ+HPG +9SNdxIAsIVxchW6j/4NcIWaEwJks/+3vveBbRc1q0UgL5b72Yxpwwk3o6LMb08vJ +wn0LuljqM/+MHc+/KuxO54jJZ2OwNbKr2cxsYwVCpj+vEF6wNh2s6v+5VLs7NimN +UufiKVGcz6fceza3eYOS+0aLe4JXUPfmbad55x7H7wGMbfv+XLsBUKJ9Bz5nF3QD +jLwGBId8/K51yXGqZUqwjzTkhIalJeZEMZuAxGkLXsYM47OH/BGPNvqfcX6X+17i +9urz5go5kWQJJLGiBDVxiwpyrcZfrqc2I0DicLUsAbdyd6q6gkEcQKLCFmm9GTW8 +c0Bb/kqlfGnDcBBl3kwK8MvvTeEAq7mteZEEOu/aV+417qDx+dNzFIx/jVjkihnC +O10vIXKmog8Dy36gNuJdnqsNuV8oGK4vPRFy80XajmYBl94xfR/ZsWWo7y66UGQr +NsCrCC+DV/A
svn commit: r691 - in /release/tomcat: tomcat-6/KEYS tomcat-7/KEYS tomcat-connectors/KEYS
Author: rjung Date: Thu Jun 14 12:19:51 2012 New Revision: 691 Log: Update top level KEYS files with keys added to the "released" KEYS files. I did not remove old KEYS gone in the releases, because they might still be useful to verify old releases. There seems to be no mechanism to keep these top level files in sync with the ones in the sub directories belonging to individual releases. Modified: release/tomcat/tomcat-6/KEYS release/tomcat/tomcat-7/KEYS release/tomcat/tomcat-connectors/KEYS Modified: release/tomcat/tomcat-6/KEYS == --- release/tomcat/tomcat-6/KEYS (original) +++ release/tomcat/tomcat-6/KEYS Thu Jun 14 12:19:51 2012 @@ -253,8 +253,56 @@ =r1gT -END PGP PUBLIC KEY BLOCK- +pub 1024D/41E49465 2006-11-08 + Key fingerprint = 80FF 76D8 8A96 9FE4 6108 558A 80B9 53A0 41E4 9465 +uid Remy Maucherat +sig 341E49465 2006-11-08 Remy Maucherat +sub 4096g/D07A28EB 2006-11-08 +sig 41E49465 2006-11-08 Remy Maucherat + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.2.2 (FreeBSD) + +mQGiBEVRM9MRBACUu2eecHcv9rzUfpvsAIkeAEXubebzBQOHCmfziV1DoARrhe4p +6ZT7bxy0mdOcwd5AhcUskRpa++vjmp7eVzfrecnGrI1lE/yQx7kH+HM3LXYBsZfu +wHDinvj0LsfPsC3kebbajBuyTlXkGO04wng7uFmGhMVHMaQv7n6EYv4mZwCgwd+v +cHtSA/jqQerji7//9pPydzUD/iLe7XQNaftiUJIodNyrvWwGkhc9lfhIQwxXFKsX +qbEUXXXm3L/FXJ9raaqaQQ8xS1fWRp1ojfifrbgTqt+a32gOL3IYtsO0/btiY4wF +KE+7mhsgNytyQtvn3MpoNQXYRo6ikmVG/Qi/JcjOUQBgo7l6rF6+iaic1lF/aHaG +6BT5A/43gcjkc7RNJEcuFa2RCgbre25FQ0IQxyZkrIg3L4EFVFAGeiKl6NdM4VZq +SBkA/Vgw3MGRDk23EMXaV1gG20iXuWaqfmnme77xDIME9T/Qud0kLJN7UIi2kapJ +w630ZJK/WxV3KY3XQ8chQxJcSoIyR1Kw0bmVHvc7c4TUkYBYk7QgUmVteSBNYXVj +aGVyYXQgPHJlbW1AYXBhY2hlLm9yZz6IYAQTEQIAIAUCRVEz0wIbAwYLCQgHAwIE +FQIIAwQWAgMBAh4BAheAAAoJEIC5U6BB5JRlCYsAoIfezo8wV6jPsrsm5RjyBdEC +2DKuAKCHb3e28i2OFUmvoRWxQrhLGpWIurkEDQRFUTR5EBAA60t9ry4FGirmBlje +uPIfsN5KAHqV/5Tunyhvya4Y94NhBIdj22c0SeA/rlUb0t26rBSZlNaCDK24+PpM +dIaQEun8YoWMlu0nMbGQn/RQZPb++Mbcht0Ei0x+AHQyTWPK9WGtr9y3vGeqkAiq +FhuSLSv2BLrpaqg9uY2VjVzJZS/Z+6DJHZp2nOnJJp4Tsgk9G289H/aAldgNY5mQ +M/LUhRSqKuIqGmJVWgoNhoerVYOYoH3ar0lRaJv+THIuqb8DgqU09zLnRJBC7Ydm +rcLi455xcYBlvQHD4DzLHqqjZeJP+lgTnO7Jt3zWX+MjxIZF7kwDJ5+3f7gCzVEU +wav+SDwxhuU4dMclbCZIuku5pkNaEox2b9seCFnYo3l6XKzMZEIj1+HHeKMfttq+ +oo9WQNpd/B+JI1zabfkDThlWOT2vNvgcFE720GGUtGuxLCkGiVjxn/PJZKQ2PY68 +MHUqHyWagyzXp+4VITL27V7K8w6zzQD2MMOAUGp0GOYGwLqqG0CE/ArOIgdr7dmc +89J2TusBRVLS5W8KMlWfjmdxgInai50k+d1sC3j96bGbcO7q7f5xuRBYily6RShX +JvyQBlXrYHE6XPMLAyj+0PokikV2Il9QHlMV41qcFJcoI+JeT4q9uyBGj23nz69k +AJEwIxLd6RqZfAGDYHqRALpIZzcAAwUP+webwWjbPEMs3RvW3HS2zZoQjcz3kczJ +StssueyV8pUR7vRzw+pMqIO3QdoHTrjM15fepX5WZfle+BDwgGCTeDNle90uV5Tw +uXQN7oGCTEmrowkCzAAf3KVZdJqgFfYsCCRPpF8aEEueBhvry9Tm/I2MCxXVGDrv +x8jGbU9tHMM7uMXQu1VjyJ4FAAwjAMpck7ZYNDwW6ZHSjnem820ZIeKXK5wGytYn +KIpAmnjBJpnSpwuBqAF2rqpu8yU1CLJkFM7TnPkwCDdUhiuemTkn1nAkuK1Yx7ST +VwTXMyb5pMKJP6XED4iD7w+no+oVU5wkS3AOL9LZq8LixWdFuYlbrubhA8VeI2su +WPqapCErjA3NUZQJpR1sTSKFszs7zv2ZKf41r+Koam1hstKuVoARgncAFfCCvTI7 +qOdthZG4KbNPExaQpSM/8eiQh76VO9XzElW3xbMLigKDZiWzMhB8h8mmummvZ88c +qX6GX5+X9raEwBuI92ncjPgAdgXiBtGkecBBk6aW2xq4Q8mxf3wMlC3G0NFA8S+v +MMqWbkP9rH2zVaKhP2Z5iRtMWtv4aErmQbpQE4njn1Hq8/+2DH2jbsaAbjDGoRCT +kj3S/Nggbfeokc7ADy1fiAp53KAmFJ/V1deljsvSAgsHowvWEokgE3L19Ze9PTYS +75jSWQugU1pBiEkEGBECAAkFAkVRNHkCGwwACgkQgLlToEHklGU7IgCeNQ0uTbpc +7WnKtnFOYi9RY4dVN74AoIRJjsMmkpO++KflIhY3UtzKGmTy +=lDGt +-END PGP PUBLIC KEY BLOCK- + pub 1024D/288584E7 2008-07-02 -uid Rémy Maucherat +uid Rémy Maucherat sub 4096g/4B6FAEFB 2008-07-02 -BEGIN PGP PUBLIC KEY BLOCK- Modified: release/tomcat/tomcat-7/KEYS == --- release/tomcat/tomcat-7/KEYS (original) +++ release/tomcat/tomcat-7/KEYS Thu Jun 14 12:19:51 2012 @@ -464,3 +464,62 @@ Io8ZP0E= =xT1M -END PGP PUBLIC KEY BLOCK- +pub 4096R/731FABEE 2011-05-27 + Key fingerprint = 9BA4 4C26 2138 5CB9 66EB A586 F72C 284D 731F ABEE +uid Tim Whittington (CODE SIGNING KEY) +sig 3731FABEE 2011-05-27 Tim Whittington (CODE SIGNING KEY) +sub 4096R/461B342D 2011-05-27 +sig 731FABEE 2011-05-27 Tim Whittington (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.11 (Darwin) + +mQINBE3fcdABEADmpbGMmnQiMc4biU+CIhV6EJ7lBaRzXzh4tJ4eITfw6IbImDRn +0JHZNjeE5zXLeH0PQ0K8/bYzFhMGwQOgvZETV7LPVLid6F9LbvDnItcWyoiZ+HPG +9SNdxIAsIVxchW6j/4NcIWaEwJks/+3vveBbRc1q0UgL5b72Yxpwwk3o6LMb08vJ +wn0LuljqM/+MHc+/KuxO54jJZ2OwNbKr2cxsYwVCpj+vEF6wNh2s6v+5VLs7NimN +UufiKVGcz6fceza3eYOS+0aLe4JXUPfmbad55x7H7wGMbfv+XLsBUKJ9Bz5nF3QD +jLwGBId8/K51yXGqZUqwjzTkhIalJeZEMZuAxGkLXsYM47OH/BGPNvqfcX6X+17i +9urz5go5kWQJJLGiBDVxiwpyrcZfrqc2I0DicLUsAbdyd6q6gkEcQKLCFmm9GTW8 +c0Bb/kqlfGnDcBBl3kwK8MvvTeEAq7mteZEEOu/aV+417qDx+dNzFIx/jVjkihnC +O10vIXKmog8Dy36gNuJdnqsNuV8oGK4vPRFy80XajmYBl94xfR/ZsWWo7y66UGQr +NsCrCC+DV/A
svn commit: r1350209 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: rjung
Date: Thu Jun 14 12:21:18 2012
New Revision: 1350209
URL: http://svn.apache.org/viewvc?rev=1350209&view=rev
Log:
Do not distribute KEYS file with releases.
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1350209&r1=1350208&r2=1350209&view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Thu Jun 14 12:21:18 2012
@@ -159,7 +159,7 @@ cd "$top"
rm -rf ${JKJNIDIST}/jni/xdocs
mv ${JKJNIDIST}/jni/build/docs ${JKJNIDIST}/jni/docs
rm -rf ${JKJNIDIST}/jni/build
-for i in KEYS LICENSE NOTICE README.txt
+for i in LICENSE NOTICE README.txt
do
svn cat ${JKJNISVN}/${i} > ${JKJNIDIST}/${i}
if [ $? -ne 0 ]; then
@@ -212,7 +212,7 @@ cd "$top"
rm -rf ${JKWINDIST}/jni/xdocs
mv ${JKWINDIST}/jni/build/docs ${JKWINDIST}/jni/docs
rm -rf ${JKWINDIST}/jni/build
-for i in KEYS LICENSE NOTICE README.txt
+for i in LICENSE NOTICE README.txt
do
svn cat ${JKJNISVN}/${i} > ${JKWINDIST}/${i}
$PERL ${JKWINDIST}/jni/native/build/lineends.pl --cr ${JKWINDIST}/${i}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350210 - /tomcat/native/trunk/jnirelease.sh
Author: rjung
Date: Thu Jun 14 12:21:27 2012
New Revision: 1350210
URL: http://svn.apache.org/viewvc?rev=1350210&view=rev
Log:
Do not distribute KEYS file with releases.
Modified:
tomcat/native/trunk/jnirelease.sh
Modified: tomcat/native/trunk/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/jnirelease.sh?rev=1350210&r1=1350209&r2=1350210&view=diff
==
--- tomcat/native/trunk/jnirelease.sh (original)
+++ tomcat/native/trunk/jnirelease.sh Thu Jun 14 12:21:27 2012
@@ -151,7 +151,6 @@ JKWINDIST=tomcat-native-${JKJNIVER}-win3
rm -rf ${JKWINDIST}
mkdir -p ${JKWINDIST}
svn export --native-eol CRLF ${JKJNISVN}/native ${JKWINDIST}/native
-svn cat ${JKJNISVN}/KEYS > ${JKWINDIST}/KEYS
svn cat ${JKJNISVN}/LICENSE > ${JKWINDIST}/LICENSE
svn cat ${JKJNISVN}/NOTICE > ${JKWINDIST}/NOTICE
svn cat ${JKJNISVN}/README.txt > ${JKWINDIST}/README.txt
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350212 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Thu Jun 14 12:31:14 2012 New Revision: 1350212 URL: http://svn.apache.org/viewvc?rev=1350212&view=rev Log: Add proposal. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1350212&r1=1350211&r2=1350212&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jun 14 12:31:14 2012 @@ -52,3 +52,10 @@ PATCHES PROPOSED TO BACKPORT: https://issues.apache.org/bugzilla/attachment.cgi?id=28895 +1: kkolinko, schultz -1: + +* Remove the KEYS file from the src distribution. + It will still be copied to the release directory but not + be contained in the downloaded tar or zip. + http://people.apache.org/~rjung/patches/remove-keys-from-release-tc55.patch + +1: rjung + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350217 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: rjung
Date: Thu Jun 14 12:50:54 2012
New Revision: 1350217
URL: http://svn.apache.org/viewvc?rev=1350217&view=rev
Log:
Include release script in src release.
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1350217&r1=1350216&r2=1350217&view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Thu Jun 14 12:50:54 2012
@@ -135,7 +135,7 @@ JKJNIDIST=tomcat-native-${JKJNIVER}-src
rm -rf ${JKJNIDIST}
mkdir -p ${JKJNIDIST}/jni
-for i in native java xdocs examples test build.xml build.properties.default
+for i in native java xdocs examples test build.xml build.properties.default
jnirelease.sh
do
svn export ${JKJNISVN}/${i} ${JKJNIDIST}/jni/${i}
if [ $? -ne 0 ]; then
@@ -181,7 +181,7 @@ tar -cf - ${JKJNIDIST} | gzip -c9 > ${JK
JKWINDIST=tomcat-native-${JKJNIVER}-win32-src
rm -rf ${JKWINDIST}
mkdir -p ${JKWINDIST}/jni
-for i in native java xdocs examples test build.xml build.properties.default
+for i in native java xdocs examples test build.xml build.properties.default
jnirelease.sh
do
svn export --native-eol CRLF ${JKJNISVN}/${i} ${JKWINDIST}/jni/${i}
if [ $? -ne 0 ]; then
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350218 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: rjung
Date: Thu Jun 14 12:52:48 2012
New Revision: 1350218
URL: http://svn.apache.org/viewvc?rev=1350218&view=rev
Log:
Include xdocs in src distribution.
This facilitates contributing docs patches.
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1350218&r1=1350217&r2=1350218&view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Thu Jun 14 12:52:48 2012
@@ -156,7 +156,6 @@ if [ $? -ne 0 ]; then
exit 1
fi
cd "$top"
-rm -rf ${JKJNIDIST}/jni/xdocs
mv ${JKJNIDIST}/jni/build/docs ${JKJNIDIST}/jni/docs
rm -rf ${JKJNIDIST}/jni/build
for i in LICENSE NOTICE README.txt
@@ -209,7 +208,6 @@ if [ $? -ne 0 ]; then
fi
cd "$top"
-rm -rf ${JKWINDIST}/jni/xdocs
mv ${JKWINDIST}/jni/build/docs ${JKWINDIST}/jni/docs
rm -rf ${JKWINDIST}/jni/build
for i in LICENSE NOTICE README.txt
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1350212 - /tomcat/tc5.5.x/trunk/STATUS.txt
2012/6/14 : > Author: rjung > Date: Thu Jun 14 12:31:14 2012 > New Revision: 1350212 > > URL: http://svn.apache.org/viewvc?rev=1350212&view=rev > Log: > Add proposal. > > Modified: > tomcat/tc5.5.x/trunk/STATUS.txt > > + > +* Remove the KEYS file from the src distribution. > + It will still be copied to the release directory but not > + be contained in the downloaded tar or zip. > + http://people.apache.org/~rjung/patches/remove-keys-from-release-tc55.patch > + +1: rjung > + -1: If KEYS file is missing from src distribution, I wonder whether it will be possible to recreate a release from it. The build.xml file of 5.5 contains copy operation that explicitly references the KEYS file. I think this operation will fail because of missing file. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350220 - /tomcat/native/trunk/jnirelease.sh
Author: rjung
Date: Thu Jun 14 12:54:32 2012
New Revision: 1350220
URL: http://svn.apache.org/viewvc?rev=1350220&view=rev
Log:
Include release script and xdocs in src distribution.
Modified:
tomcat/native/trunk/jnirelease.sh
Modified: tomcat/native/trunk/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/jnirelease.sh?rev=1350220&r1=1350219&r2=1350220&view=diff
==
--- tomcat/native/trunk/jnirelease.sh (original)
+++ tomcat/native/trunk/jnirelease.sh Thu Jun 14 12:54:32 2012
@@ -123,18 +123,11 @@ if [ $? -ne 0 ]; then
exit 1
fi
-# Clean up unused stuff
-for i in jnirelease.sh
-do
-rm -rf ${JKJNIDIST}/${i}
-done
-
top="`pwd`"
cd ${JKJNIDIST}/xdocs
ant
$EXPTOOL $EXPOPTS ../build/docs/miscellaneous/printer/changelog.html >
../CHANGELOG.txt 2>/dev/null
cd "$top"
-rm -rf ${JKJNIDIST}/xdocs
mv ${JKJNIDIST}/build/docs ${JKJNIDIST}/docs
rm -rf ${JKJNIDIST}/build
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350222 - in /tomcat/site/trunk: docs/index.html docs/oldnews.html xdocs/index.xml xdocs/oldnews.xml
Author: kkolinko Date: Thu Jun 14 13:07:27 2012 New Revision: 1350222 URL: http://svn.apache.org/viewvc?rev=1350222&view=rev Log: Correct typos in release announcement Add old announcement to oldnews Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1350222&r1=1350221&r2=1350222&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Thu Jun 14 13:07:27 2012 @@ -233,8 +233,8 @@ project logo are trademarks of the Apach - -Tomcat Native 1.1.22 Released2012-06-13 + +Tomcat Native 1.1.24 Released2012-06-13 @@ -248,7 +248,7 @@ The Apache Tomcat Project is proud to an Download | -ChangeLog for 1.1.23 +ChangeLog for 1.1.24 Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1350222&r1=1350221&r2=1350222&view=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Thu Jun 14 13:07:27 2012 @@ -256,6 +256,38 @@ to be able to compile this version of mo + +Tomcat Native 1.1.23 Released2012-03-02 + + + + + + + +The Apache Tomcat Project is proud to announce the release of version 1.1.23 of Tomcat Native. +This version is principally a bugfix release. + + + + +Download | +ChangeLog for 1.1.23 + + + + + + + + + + + + + + + Tomcat 7.0.26 Released2012-02-21 Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1350222&r1=1350221&r2=1350222&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Thu Jun 14 13:07:27 2012 @@ -37,13 +37,13 @@ project logo are trademarks of the Apach - + The Apache Tomcat Project is proud to announce the release of version 1.1.24 of Tomcat Native. Download | -ChangeLog for 1.1.23 +ChangeLog for 1.1.24 Modified: tomcat/site/trunk/xdocs/oldnews.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews.xml?rev=1350222&r1=1350221&r2=1350222&view=diff == --- tomcat/site/trunk/xdocs/oldnews.xml (original) +++ tomcat/site/trunk/xdocs/oldnews.xml Thu Jun 14 13:07:27 2012 @@ -35,6 +35,17 @@ to be able to compile this version of mo + + +The Apache Tomcat Project is proud to announce the release of version 1.1.23 of Tomcat Native. +This version is principally a bugfix release. + + +Download | +ChangeLog for 1.1.23 + + + The Apache Tomcat Project is proud to announce the release of version 7.0.26 of - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350223 - /tomcat/native/branches/1.1.x/README.txt
Author: rjung Date: Thu Jun 14 13:10:04 2012 New Revision: 1350223 URL: http://svn.apache.org/viewvc?rev=1350223&view=rev Log: Improve tcnative README a bit: - typo - fix documentation links - add/fix info on how to run examples Modified: tomcat/native/branches/1.1.x/README.txt Modified: tomcat/native/branches/1.1.x/README.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/README.txt?rev=1350223&r1=1350222&r2=1350223&view=diff == --- tomcat/native/branches/1.1.x/README.txt (original) +++ tomcat/native/branches/1.1.x/README.txt Thu Jun 14 13:10:04 2012 @@ -26,18 +26,23 @@ Documentation - The documentation available as of the date of this release is -included in HTML format in the docs directory. +included in HTML format in the jni/docs directory. The most up-to-date documentation can be found at +http://tomcat.apache.org/native-doc/ + +Documentation about the Tomcat APR connector which is based +on this library can be found at http://tomcat.apache.org/tomcat-7.0-doc/apr.html. -Buliding +Building To build the Java API +> cd jni > ant -To build the native part see native/BUILDING +To build the native part see jni/native/BUILDING Running the examples @@ -45,12 +50,17 @@ Running the examples Before running the examples you may have to set LD_LIBRARY_PATH, something like LD_LIBRARY_PATH=/opt/SMAWoIS/openssl/lib; export LD_LIBRARY_PATH -1 - echo: (port in examples/org/apache/tomcat/jni/Echo.properties). -ant echo-example -2 - ssl server: -(see parameters in ./examples/org/apache/tomcat/jni/SSL.properties) -The certificate and key should be in dist/classes/examples. -ant server-example + +1) echo example: + - Choose some free port in + dist/classes/examples/org/apache/tomcat/jni/Echo.properties + - run: ant run-echo + +2) ssl server example: + - Change parameters in dist/classes/examples/org/apache/tomcat/jni/SSL.properties + according to your needs. The certificate and key should be in + dist/classes/examples. + - run: ant run-ssl-server Cryptographic Software Notice - 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 #6 from kubak ---
(In reply to comment #5)
> 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.
In my opinion if Tomcat cannot process some requests because of wrong
configuration - Tomcat should not start and give an error with clear message at
start up. Current message doesn't say anything about after-effects, is easy to
ignore.
--
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: r1350222 - in /tomcat/site/trunk: docs/index.html docs/oldnews.html xdocs/index.xml xdocs/oldnews.xml
On 06/14/2012 03:07 PM, kkoli...@apache.org wrote: Author: kkolinko Date: Thu Jun 14 13:07:27 2012 New Revision: 1350222 URL: http://svn.apache.org/viewvc?rev=1350222&view=rev Log: Correct typos in release announcement Thanks. Add old announcement to oldnews Why have you bring back the old one?. I think we should have a single entry per component, especially cause now the 1.1.23 can be downloaded from archive only. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350231 - /tomcat/native/branches/1.1.x/TODO.txt
Author: rjung Date: Thu Jun 14 13:28:40 2012 New Revision: 1350231 URL: http://svn.apache.org/viewvc?rev=1350231&view=rev Log: Add a TODO file. Added: tomcat/native/branches/1.1.x/TODO.txt (with props) Added: tomcat/native/branches/1.1.x/TODO.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/TODO.txt?rev=1350231&view=auto == --- tomcat/native/branches/1.1.x/TODO.txt (added) +++ tomcat/native/branches/1.1.x/TODO.txt Thu Jun 14 13:28:40 2012 @@ -0,0 +1,165 @@ + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +Apache Tomcat Native Library + +TODO + + +SSL Renegotiation +- + +It is unclear to me, what the current state is. It looks like we support +the unsafe legacy reneg whenever the OpenSSL used during build time +supports it. There is no configuration option to switch it off during +runtime. Right? + +Is it correct, that client initiated reneg is not supported and thus the +known attacks will not work even with old OpenSSL? + +Should we add a remark about this topic to the docs? + + +Java Tests and Examples +--- + +- No mentioning of running "ant download" before tests. Without + it test compilation fails. + +- "ant test" fails in line 85 of SocketServerTestSuite.java, because + on my system the checking for precisely 2 milliseconds won't work. + The call returns after 11 millis not after 2 + +- "ant run-echo": will fail, because by default uses privileged + port 23. Maybe switch to 8023 as a default? + Users should not run tests as root and on most systems the default + port should just work. + +- "ant run-echo": what is the expected behaviour of this example. + I couldn't get it to do something understandable. + Document the example in the README.txt. + +- "ant run-ssl-server": Could't we include a test certificate in the + distribution? + +- "ant run-ssl-server": What should the test produce, if run successfully? + Document the example in the README.txt. + +- "ant run-local-server": Creates a unix socket "\\.\PIPE\test" in the + examples directory, then waits. How is the test expected to work? + And the file name doesn't seem to be appropriate for Unix. + Document the example in the README.txt. + + +Compilation Warnings + + +On Solaris: + +src/file.c: In function 'Java_org_apache_tomcat_jni_File_writev': +src/file.c:384: warning: pointer targets in assignment differ in signedness +src/file.c:390: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness +src/file.c: In function 'Java_org_apache_tomcat_jni_File_writevFull': +src/file.c:418: warning: pointer targets in assignment differ in signedness +src/file.c:428: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness + +src/network.c: In function 'Java_org_apache_tomcat_jni_Socket_sendv': +src/network.c:668: warning: pointer targets in assignment differ in signedness +src/network.c:674: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness +src/network.c: In function 'Java_org_apache_tomcat_jni_Socket_sendfile': +src/network.c:1220: warning: pointer targets in assignment differ in signedness +src/network.c:1225: warning: pointer targets in assignment differ in signedness +src/network.c:1243: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness +src/network.c:1247: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness + +src/poll.c:271: warning: 'remove_all' defined but not used + +src/ssl.c: In function 'ssl_rand_make': +src/ssl.c:469: warning: value computed is not used + +Some info on that: "The JNI functions take a jbyte*, which is a signed char* +on my Solaris system. Whereas the iovec iov_base is a caddr_t, which is a char*." + + +Java Classes Source Distribution + + +Are
Re: [VOTE] Release Apache Tomcat Native 1.1.24
On 12.06.2012 17:39, Mladen Turk wrote: On 06/12/2012 03:19 PM, Rainer Jung wrote: I implemented those for Solaris long ago and thought they existed for Linux from the beginning. But in fact for Linux there are only memory Thanks for such a thorough review! Could you add some of your thoughts into trunk's README I fixed some trivial stuff and added the not so trivial items to a new top level TODO.txt file. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350232 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: rjung
Date: Thu Jun 14 13:30:13 2012
New Revision: 1350232
URL: http://svn.apache.org/viewvc?rev=1350232&view=rev
Log:
Add TODO.txt to src distribution.
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1350232&r1=1350231&r2=1350232&view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Thu Jun 14 13:30:13 2012
@@ -158,7 +158,7 @@ fi
cd "$top"
mv ${JKJNIDIST}/jni/build/docs ${JKJNIDIST}/jni/docs
rm -rf ${JKJNIDIST}/jni/build
-for i in LICENSE NOTICE README.txt
+for i in LICENSE NOTICE README.txt TODO.txt
do
svn cat ${JKJNISVN}/${i} > ${JKJNIDIST}/${i}
if [ $? -ne 0 ]; then
@@ -210,7 +210,7 @@ cd "$top"
mv ${JKWINDIST}/jni/build/docs ${JKWINDIST}/jni/docs
rm -rf ${JKWINDIST}/jni/build
-for i in LICENSE NOTICE README.txt
+for i in LICENSE NOTICE README.txt TODO.txt
do
svn cat ${JKJNISVN}/${i} > ${JKWINDIST}/${i}
$PERL ${JKWINDIST}/jni/native/build/lineends.pl --cr ${JKWINDIST}/${i}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1350222 - in /tomcat/site/trunk: docs/index.html docs/oldnews.html xdocs/index.xml xdocs/oldnews.xml
2012/6/14 Mladen Turk : > > >> Add old announcement to oldnews >> > > Why have you bring back the old one?. > I think we should have a single entry per component, > especially cause now the 1.1.23 can be downloaded from archive only. It is "old news" page. Old announcements are there. Some of them contain important notices (many 7.0.x announcements do). Maybe I should axe download links when copying announcements there, like I did with earlier releases. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53416] New: Two datasources with the same name in different web applications results in javax.management.InstanceAlreadyExistsException
https://issues.apache.org/bugzilla/show_bug.cgi?id=53416 Priority: P2 Bug ID: 53416 Assignee: dev@tomcat.apache.org Summary: Two datasources with the same name in different web applications results in javax.management.InstanceAlreadyExistsException Severity: normal Classification: Unclassified OS: Windows Vista Reporter: anthonygerrard+apache@gmail.com Hardware: PC Status: NEW Version: unspecified Component: jdbc-pool Product: Tomcat Modules Deploy two different web applications onto Tomcat. Each web application has a resource that: * uses the Use Tomcat JDBC Connection Pool * has an identical name to the other one When starting the server you get a non fatal error in the logs InstanceAlreadyExistsException. Both applications appear to still work OK ERROR org.apache.tomcat.jdbc.pool.DataSource - Unable to register JDBC pool with JMX javax.management.InstanceAlreadyExistsException: tomcat.jdbc:name="jdbc/soscvuk",context=/,type=ConnectionPool,host=localhost,class=org.apache.tomcat.jdbc.pool. DataSource at com.sun.jmx.mbeanserver.Repository.addMBean(Repository.java:453) ~[na:1.6.0_32] at com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.internal_addObject(DefaultMBeanServerInterceptor.java:1484) [na:1.6.0_32] at com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.registerDynamicMBean(DefaultMBeanServerInterceptor.java:963) [na:1.6.0_32] at com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.registerObject(DefaultMBeanServerInterceptor.java:917) [na:1.6.0_32] at com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.registerMBean(DefaultMBeanServerInterceptor.java:312) [na:1.6.0_32] at com.sun.jmx.mbeanserver.JmxMBeanServer.registerMBean(JmxMBeanServer.java:482) [na:1.6.0_32] at org.apache.tomcat.jdbc.pool.DataSource.registerJmx(DataSource.java:135) [tomcat-jdbc.jar:na] at org.apache.tomcat.jdbc.pool.DataSource.preRegister(DataSource.java:102) [tomcat-jdbc.jar:na] at org.apache.tomcat.util.modeler.BaseModelMBean.preRegister(BaseModelMBean.java:1132) [tomcat-coyote.jar:7.0.27] at com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.preRegisterInvoke(DefaultMBeanServerInterceptor.java:1010) [na:1.6.0_32] at com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.registerDynamicMBean(DefaultMBeanServerInterceptor.java:938) [na:1.6.0_32] at com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.registerObject(DefaultMBeanServerInterceptor.java:917) [na:1.6.0_32] at com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.registerMBean(DefaultMBeanServerInterceptor.java:312) [na:1.6.0_32] at com.sun.jmx.mbeanserver.JmxMBeanServer.registerMBean(JmxMBeanServer.java:482) [na:1.6.0_32] at org.apache.tomcat.util.modeler.Registry.registerComponent(Registry.java:742) [tomcat-coyote.jar:7.0.27] at org.apache.catalina.core.NamingContextListener.addResource(NamingContextListener.java:1062) [catalina.jar:7.0.27] at org.apache.catalina.core.NamingContextListener.createNamingContext(NamingContextListener.java:671) [catalina.jar:7.0.27] at org.apache.catalina.core.NamingContextListener.lifecycleEvent(NamingContextListener.java:270) [catalina.jar:7.0.27] at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) [catalina.jar:7.0.27] at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90) [catalina.jar:7.0.27] at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5161) [catalina.jar:7.0.27] at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150) [catalina.jar:7.0.27] at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:895) [catalina.jar:7.0.27] at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:871) [catalina.jar:7.0.27] at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:615) [catalina.jar:7.0.27] at org.apache.catalina.startup.HostConfig.deployDescriptor(HostConfig.java:649) [catalina.jar:7.0.27] at org.apache.catalina.startup.HostConfig$DeployDescriptor.run(HostConfig.java:1585) [catalina.jar:7.0.27] at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) [na:1.6.0_32] at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) [na:1.6.0_32] at java.util.concurrent.FutureTask.run(FutureTask.java:138) [na:1.6.0_32] at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) [na:1.6.0_32] at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) [na:1.6.0_32] at java.lang.Thread.run(Thread.java:662) [na:1.6.0_32] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe,
Re: svn commit: r1350231 - /tomcat/native/branches/1.1.x/TODO.txt
On 06/14/2012 03:28 PM, rj...@apache.org wrote: + +Some info on that: "The JNI functions take a jbyte*, which is a signed char* +on my Solaris system. Whereas the iovec iov_base is a caddr_t, which is a char*." + ... and this is what? the same. I'm always amazed how compilers are generally stupid :) Nevertheless, feel free to add needed casts. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350235 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Thu Jun 14 13:37:43 2012 New Revision: 1350235 URL: http://svn.apache.org/viewvc?rev=1350235&view=rev Log: Revoke proposal. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1350235&r1=1350234&r2=1350235&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jun 14 13:37:43 2012 @@ -52,10 +52,3 @@ PATCHES PROPOSED TO BACKPORT: https://issues.apache.org/bugzilla/attachment.cgi?id=28895 +1: kkolinko, schultz -1: - -* Remove the KEYS file from the src distribution. - It will still be copied to the release directory but not - be contained in the downloaded tar or zip. - http://people.apache.org/~rjung/patches/remove-keys-from-release-tc55.patch - +1: rjung - -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1350212 - /tomcat/tc5.5.x/trunk/STATUS.txt
On 14.06.2012 14:54, Konstantin Kolinko wrote: 2012/6/14 : Author: rjung Date: Thu Jun 14 12:31:14 2012 New Revision: 1350212 URL: http://svn.apache.org/viewvc?rev=1350212&view=rev Log: Add proposal. Modified: tomcat/tc5.5.x/trunk/STATUS.txt + +* Remove the KEYS file from the src distribution. + It will still be copied to the release directory but not + be contained in the downloaded tar or zip. + http://people.apache.org/~rjung/patches/remove-keys-from-release-tc55.patch + +1: rjung + -1: If KEYS file is missing from src distribution, I wonder whether it will be possible to recreate a release from it. The build.xml file of 5.5 contains copy operation that explicitly references the KEYS file. I think this operation will fail because of missing file. Ah, I *thought* it's not part of the TC6 and 7 releases, because the explicit copy was not part of their build.xml. But still the KEYS file is part of those releases, so no need to change TC 5.5. Proposal revoked. Thanks, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1350235 - /tomcat/tc5.5.x/trunk/STATUS.txt
On 06/14/2012 03:37 PM, rj...@apache.org wrote: Author: rjung Date: Thu Jun 14 13:37:43 2012 New Revision: 1350235 URL: http://svn.apache.org/viewvc?rev=1350235&view=rev Log: Revoke proposal. I actually think we should stop shipping KEYS with archives. Anyone can create fake .zip with fake KEYS, so what's the point? And we explicitly instruct users to use the KEYS file from our server. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350241 - in /tomcat/trunk/java/org/apache/catalina: Context.java connector/Response.java core/StandardContext.java startup/FailedContext.java
Author: markt
Date: Thu Jun 14 13:59:07 2012
New Revision: 1350241
URL: http://svn.apache.org/viewvc?rev=1350241&view=rev
Log:
Refactor to remove o.a.c -> o.a.c.util dependency
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1350241&r1=1350240&r2=1350241&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Thu Jun 14 13:59:07 2012
@@ -17,6 +17,7 @@
package org.apache.catalina;
import java.net.URL;
+import java.util.Locale;
import java.util.Set;
import javax.servlet.ServletContainerInitializer;
@@ -157,7 +158,9 @@ public interface Context extends Contain
/**
* Return the Locale to character set mapper for this Context.
+ * @deprecated Use {@link #getCharset(Locale)}
*/
+@Deprecated
public CharsetMapper getCharsetMapper();
@@ -165,11 +168,22 @@ public interface Context extends Contain
* Set the Locale to character set mapper for this Context.
*
* @param mapper The new mapper
+ *
+ * @deprecated
*/
+@Deprecated
public void setCharsetMapper(CharsetMapper mapper);
/**
+ * Obtain the character set name to use with the given Locale. Note that
+ * different Contexts may have different mappings of Locale to character
+ * set.
+ */
+public String getCharset(Locale locale);
+
+
+/**
* Return the URL of the XML descriptor for this context.
*/
public URL getConfigFile();
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1350241&r1=1350240&r2=1350241&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu Jun 14
13:59:07 2012
@@ -44,7 +44,6 @@ import org.apache.catalina.Globals;
import org.apache.catalina.Session;
import org.apache.catalina.Wrapper;
import org.apache.catalina.security.SecurityUtil;
-import org.apache.catalina.util.CharsetMapper;
import org.apache.catalina.util.DateTool;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.SessionConfig;
@@ -788,12 +787,10 @@ public class Response
return;
}
-CharsetMapper cm = getContext().getCharsetMapper();
-String charset = cm.getCharset( locale );
-if ( charset != null ){
+String charset = getContext().getCharset(locale);
+if (charset != null) {
coyoteResponse.setCharacterEncoding(charset);
}
-
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1350241&r1=1350240&r2=1350241&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jun 14
13:59:07 2012
@@ -33,6 +33,7 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.Stack;
@@ -1408,7 +1409,9 @@ public class StandardContext extends Con
/**
* Return the Locale to character set mapper for this Context.
+ * @deprecated Use {@link #getCharset(Locale)}
*/
+@Deprecated
@Override
public CharsetMapper getCharsetMapper() {
@@ -1433,6 +1436,7 @@ public class StandardContext extends Con
*
* @param mapper The new mapper
*/
+@Deprecated
@Override
public void setCharsetMapper(CharsetMapper mapper) {
@@ -1445,6 +1449,13 @@ public class StandardContext extends Con
}
+
+@Override
+public String getCharset(Locale locale) {
+return getCharsetMapper().getCharset(locale);
+}
+
+
/**
* Return the URL of the XML descriptor for this context.
*/
Modified: tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1350241&r1=1350240&r2=1350241&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Faile
Re: svn commit: r1350235 - /tomcat/tc5.5.x/trunk/STATUS.txt
On 14/06/2012 14:41, Mladen Turk wrote: > On 06/14/2012 03:37 PM, rj...@apache.org wrote: >> Author: rjung >> Date: Thu Jun 14 13:37:43 2012 >> New Revision: 1350235 >> >> URL: http://svn.apache.org/viewvc?rev=1350235&view=rev >> Log: >> Revoke proposal. >> > > I actually think we should stop shipping KEYS with archives. > Anyone can create fake .zip with fake KEYS, so what's the point? > And we explicitly instruct users to use the KEYS file from our server. +1 Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350243 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Author: markt
Date: Thu Jun 14 14:01:08 2012
New Revision: 1350243
URL: http://svn.apache.org/viewvc?rev=1350243&view=rev
Log:
Remove some deprecation markers as the methods will remain on StandardContext
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1350243&r1=1350242&r2=1350243&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jun 14
14:01:08 2012
@@ -1409,9 +1409,7 @@ public class StandardContext extends Con
/**
* Return the Locale to character set mapper for this Context.
- * @deprecated Use {@link #getCharset(Locale)}
*/
-@Deprecated
@Override
public CharsetMapper getCharsetMapper() {
@@ -1436,7 +1434,6 @@ public class StandardContext extends Con
*
* @param mapper The new mapper
*/
-@Deprecated
@Override
public void setCharsetMapper(CharsetMapper mapper) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350245 - in /tomcat/trunk/java/org/apache/catalina: Context.java core/StandardContext.java startup/FailedContext.java
Author: markt
Date: Thu Jun 14 14:03:19 2012
New Revision: 1350245
URL: http://svn.apache.org/viewvc?rev=1350245&view=rev
Log:
Remove deprecated code and o.a.c -> o.a.c.util dependency
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1350245&r1=1350244&r2=1350245&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Thu Jun 14 14:03:19 2012
@@ -34,7 +34,6 @@ import org.apache.catalina.deploy.Filter
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.SecurityConstraint;
-import org.apache.catalina.util.CharsetMapper;
import org.apache.tomcat.JarScanner;
import org.apache.tomcat.util.http.mapper.Mapper;
@@ -157,25 +156,6 @@ public interface Context extends Contain
/**
- * Return the Locale to character set mapper for this Context.
- * @deprecated Use {@link #getCharset(Locale)}
- */
-@Deprecated
-public CharsetMapper getCharsetMapper();
-
-
-/**
- * Set the Locale to character set mapper for this Context.
- *
- * @param mapper The new mapper
- *
- * @deprecated
- */
-@Deprecated
-public void setCharsetMapper(CharsetMapper mapper);
-
-
-/**
* Obtain the character set name to use with the given Locale. Note that
* different Contexts may have different mappings of Locale to character
* set.
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1350245&r1=1350244&r2=1350245&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jun 14
14:03:19 2012
@@ -1410,7 +1410,6 @@ public class StandardContext extends Con
/**
* Return the Locale to character set mapper for this Context.
*/
-@Override
public CharsetMapper getCharsetMapper() {
// Create a mapper the first time it is requested
@@ -1434,7 +1433,6 @@ public class StandardContext extends Con
*
* @param mapper The new mapper
*/
-@Override
public void setCharsetMapper(CharsetMapper mapper) {
CharsetMapper oldCharsetMapper = this.charsetMapper;
Modified: tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1350245&r1=1350244&r2=1350245&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Thu Jun 14
14:03:19 2012
@@ -54,7 +54,6 @@ import org.apache.catalina.deploy.Filter
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.SecurityConstraint;
-import org.apache.catalina.util.CharsetMapper;
import org.apache.catalina.util.ContextName;
import org.apache.catalina.util.LifecycleMBeanBase;
import org.apache.juli.logging.Log;
@@ -316,13 +315,6 @@ public class FailedContext extends Lifec
@Override
public boolean getAvailable() { return false; }
-@Deprecated
-@Override
-public CharsetMapper getCharsetMapper() { return null; }
-@Deprecated
-@Override
-public void setCharsetMapper(CharsetMapper mapper) { /* NO-OP */ }
-
@Override
public String getCharset(Locale locale) { return null; }
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350247 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/Context.java java/org/apache/catalina/connector/Response.java java/org/apache/catalina/core/StandardContext.java java/org/a
Author: markt
Date: Thu Jun 14 14:04:20 2012
New Revision: 1350247
URL: http://svn.apache.org/viewvc?rev=1350247&view=rev
Log:
Deprcate code to be removed in 8.0.x
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1350241,1350243
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java?rev=1350247&r1=1350246&r2=1350247&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java Thu Jun 14
14:04:20 2012
@@ -20,6 +20,7 @@ package org.apache.catalina;
import java.net.URL;
+import java.util.Locale;
import java.util.Set;
import javax.servlet.ServletContainerInitializer;
@@ -169,7 +170,9 @@ public interface Context extends Contain
/**
* Return the Locale to character set mapper for this Context.
+ * @deprecated Use {@link #getCharset(Locale)}
*/
+@Deprecated
public CharsetMapper getCharsetMapper();
@@ -177,11 +180,22 @@ public interface Context extends Contain
* Set the Locale to character set mapper for this Context.
*
* @param mapper The new mapper
+ *
+ * @deprecated
*/
+@Deprecated
public void setCharsetMapper(CharsetMapper mapper);
/**
+ * Obtain the character set name to use with the given Locale. Note that
+ * different Contexts may have different mappings of Locale to character
+ * set.
+ */
+public String getCharset(Locale locale);
+
+
+/**
* Return the URL of the XML descriptor for this context.
*/
public URL getConfigFile();
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java?rev=1350247&r1=1350246&r2=1350247&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java Thu
Jun 14 14:04:20 2012
@@ -45,7 +45,6 @@ import org.apache.catalina.Globals;
import org.apache.catalina.Session;
import org.apache.catalina.Wrapper;
import org.apache.catalina.security.SecurityUtil;
-import org.apache.catalina.util.CharsetMapper;
import org.apache.catalina.util.DateTool;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.SessionConfig;
@@ -885,12 +884,10 @@ public class Response
return;
}
-CharsetMapper cm = getContext().getCharsetMapper();
-String charset = cm.getCharset( locale );
-if ( charset != null ){
+String charset = getContext().getCharset(locale);
+if (charset != null) {
coyoteResponse.setCharacterEncoding(charset);
}
-
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1350247&r1=1350246&r2=1350247&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu
Jun 14 14:04:20 2012
@@ -33,6 +33,7 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.Stack;
@@ -1481,6 +1482,13 @@ public class StandardContext extends Con
}
+
+@Override
+public String getCharset(Locale locale) {
+return getCharsetMapper().getCharset(locale);
+}
+
+
/**
* Return the URL of the XML descriptor for this context.
*/
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1350247&r1=1350246&r2=1350247&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
Thu Jun 14 14:04:20 2012
@@ -19,6 +19,7 @@ pac
Problem running "svn up" on Tomcat site
Hi! I just had a problem with running "svn up" on tomcat.a.o. I found a solution, but I wonder whether others will experience the same issue. (..)/tomcat.apache.org$ svn up svn: E155004: Working copy '(...)/tomcat.apache.org' locked svn: E200031: attempt to write a readonly database svn: E200031: attempt to write a readonly database svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details) An attempt to run "svn cleanup" failed with the same svn: E200031: attempt to write a readonly database svn: E200031: attempt to write a readonly database Looking at database file, (..)/tomcat.apache.org$ ls -l .svn total 9218 -rw-rw-r--1 mturk tomcat3 Jun 14 10:56 entries -rw-rw-r--1 mturk tomcat3 Jun 14 10:56 format drwxrwsr-x 258 mturk tomcat 258 Jun 14 10:53 pristine drwxrwsr-x5 kkolinko tomcat5 Jun 14 11:03 tmp -rw-r--r--1 mturk tomcat 9332736 Jun 14 11:03 wc.db I see that wc.db is not writable by group. This is normal for svn on this system. I did a sample checkout in my home folder and while other files were "-rw-rw-r--", this one was "-rw-r--r--". I solved the issue by creating a copy of the file and replacing the original: An afterthought: maybe instead of "rm -f" I should have renamed it, postponing deletion until everything is over. cd .svn cp wc.db wc.db.kkolinko rm -f wc.db mv wc.db.kkolinko wc.db After that the owner of the file changed to me (kkolinko) and "svn up" did run successfully, not asking for a cleanup and not complaining about readonly database. Note: it is known that copying the wc.db file when it is being accessed is unsafe. Before changing anything I noted that the change date of "wc.db" as shown by "ls -l" was several hours ago. As the owner of wc.db is now me, I wonder whether others will face the same issue. So here is a recipe. Generally, I do not understand why I was facing the issue. As I mentioned, "wc.db" is normally read-only for the group. For reference, $ svn --version svn, version 1.7.3 (r1242825) compiled Feb 26 2012, 21:09:32 Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Problem running "svn up" on Tomcat site
On 14/06/2012 15:10, Konstantin Kolinko wrote: > Hi! > > I just had a problem with running "svn up" on tomcat.a.o. > I found a solution, but I wonder whether others will experience the same > issue. They will. Well, they would have done. I've made wc.db group writeable (which it clearly has to be if we are all going to be able to do svn up). I left the ownership as it was (kkolinko). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350256 - /tomcat/native/branches/1.1.x/native/src/poll.c
Author: rjung
Date: Thu Jun 14 14:18:40 2012
New Revision: 1350256
URL: http://svn.apache.org/viewvc?rev=1350256&view=rev
Log:
Remove static remove_all() function made
obsolete by r1342025.
Modified:
tomcat/native/branches/1.1.x/native/src/poll.c
Modified: tomcat/native/branches/1.1.x/native/src/poll.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/poll.c?rev=1350256&r1=1350255&r2=1350256&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/poll.c (original)
+++ tomcat/native/branches/1.1.x/native/src/poll.c Thu Jun 14 14:18:40 2012
@@ -267,18 +267,6 @@ static void update_last_active(tcn_polls
}
-static void remove_all(tcn_pollset_t *p)
-{
-apr_int32_t i;
-for (i = 0; i < p->nelts; i++) {
-apr_pollset_remove(p->pollset, &(p->socket_set[i]));
-#ifdef TCN_DO_STATISTICS
-p->sp_removed++;
-#endif
-}
-p->nelts = 0;
-}
-
TCN_IMPLEMENT_CALL(jint, Poll, remove)(TCN_STDARGS, jlong pollset,
jlong socket)
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350259 - /tomcat/native/branches/1.1.x/xdocs/news/2012.xml
Author: kkolinko Date: Thu Jun 14 14:25:24 2012 New Revision: 1350259 URL: http://svn.apache.org/viewvc?rev=1350259&view=rev Log: Correct release date typo Modified: tomcat/native/branches/1.1.x/xdocs/news/2012.xml 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=1350259&r1=1350258&r2=1350259&view=diff == --- tomcat/native/branches/1.1.x/xdocs/news/2012.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/news/2012.xml Thu Jun 14 14:25:24 2012 @@ -32,7 +32,7 @@ -08 August - TC-Native-1.1.24 released +13 June - TC-Native-1.1.24 released The 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 @@ -49,7 +49,7 @@ Bug Report. When entering bug select -08 August - TC-Native-1.1.23 released +02 March - TC-Native-1.1.23 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.23. This is a stable release adding some bug fixes and - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350264 - in /tomcat/native/branches/1.1.x/xdocs/news: 2008.xml 2009.xml 2010.xml 2011.xml 2012.xml
Author: kkolinko Date: Thu Jun 14 14:29:09 2012 New Revision: 1350264 URL: http://svn.apache.org/viewvc?rev=1350264&view=rev Log: Remove broken bugzilla references. Tomcat-Native is now a separate project in Bugzilla, not a component in Tomcat 6. Modified: tomcat/native/branches/1.1.x/xdocs/news/2008.xml tomcat/native/branches/1.1.x/xdocs/news/2009.xml tomcat/native/branches/1.1.x/xdocs/news/2010.xml tomcat/native/branches/1.1.x/xdocs/news/2011.xml tomcat/native/branches/1.1.x/xdocs/news/2012.xml Modified: tomcat/native/branches/1.1.x/xdocs/news/2008.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2008.xml?rev=1350264&r1=1350263&r2=1350264&view=diff == --- tomcat/native/branches/1.1.x/xdocs/news/2008.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/news/2008.xml Thu Jun 14 14:29:09 2012 @@ -61,10 +61,6 @@ and some bug fixes. Please see the ChangeLog for a full list of changes. -If you find any bugs while using this release, please fill in the -http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%206";>Bugzilla -Bug Report. When entering bug select Native:JNI Component. - Modified: tomcat/native/branches/1.1.x/xdocs/news/2009.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2009.xml?rev=1350264&r1=1350263&r2=1350264&view=diff == --- tomcat/native/branches/1.1.x/xdocs/news/2009.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/news/2009.xml Thu Jun 14 14:29:09 2012 @@ -39,10 +39,6 @@ of Tomcat Native 1.1.18. This is a stabl Please see the ChangeLog for a full list of changes. -If you find any bugs while using this release, please fill in the -http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%206";>Bugzilla -Bug Report. When entering bug select Native:JNI Component. - Modified: tomcat/native/branches/1.1.x/xdocs/news/2010.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2010.xml?rev=1350264&r1=1350263&r2=1350264&view=diff == --- tomcat/native/branches/1.1.x/xdocs/news/2010.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/news/2010.xml Thu Jun 14 14:29:09 2012 @@ -46,10 +46,6 @@ of Tomcat Native 1.1.19. This is a stabl Please see the ChangeLog for a full list of changes. -If you find any bugs while using this release, please fill in the -http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%206";>Bugzilla -Bug Report. When entering bug select Native:JNI Component. - Modified: tomcat/native/branches/1.1.x/xdocs/news/2011.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2011.xml?rev=1350264&r1=1350263&r2=1350264&view=diff == --- tomcat/native/branches/1.1.x/xdocs/news/2011.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/news/2011.xml Thu Jun 14 14:29:09 2012 @@ -41,10 +41,6 @@ of Tomcat Native 1.1.22. This is a stabl Please see the ChangeLog for a full list of changes. -If you find any bugs while using this release, please fill in the -http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%206";>Bugzilla -Bug Report. When entering bug select Native:JNI Component. - 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=1350264&r1=1350263&r2=1350264&view=diff == --- tomcat/native/branches/1.1.x/xdocs/news/2012.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/news/2012.xml Thu Jun 14 14:29:09 2012 @@ -42,10 +42,6 @@ per-socket Poller timeouts. Please see the ChangeLog for a full list of changes. -If you find any bugs while using this release, please fill in the -http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%206";>Bugzilla -Bug Report. When entering bug select Native:JNI Component. - @@ -59,10 +55,6 @@ experimental support for OCSP and PKCS12 Please see the ChangeLog for a full list of changes. -If you find any bugs while using this release, please fill in the -http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%206";>Bugzilla -Bug Report. When entering bug select Native:JNI Component. - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350266 - in /tomcat/site/trunk/docs/native-doc: ./ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/
Author: kkolinko Date: Thu Jun 14 14:31:19 2012 New Revision: 1350266 URL: http://svn.apache.org/viewvc?rev=1350266&view=rev Log: Update published Tomcat-Native documentation. Modified: tomcat/site/trunk/docs/native-doc/index.html tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html tomcat/site/trunk/docs/native-doc/news/2008.html tomcat/site/trunk/docs/native-doc/news/2009.html tomcat/site/trunk/docs/native-doc/news/2010.html tomcat/site/trunk/docs/native-doc/news/2011.html tomcat/site/trunk/docs/native-doc/news/2012.html tomcat/site/trunk/docs/native-doc/news/printer/2008.html tomcat/site/trunk/docs/native-doc/news/printer/2009.html tomcat/site/trunk/docs/native-doc/news/printer/2010.html tomcat/site/trunk/docs/native-doc/news/printer/2011.html tomcat/site/trunk/docs/native-doc/news/printer/2012.html tomcat/site/trunk/docs/native-doc/printer/index.html Modified: tomcat/site/trunk/docs/native-doc/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1350266&r1=1350265&r2=1350266&view=diff == --- tomcat/site/trunk/docs/native-doc/index.html (original) +++ tomcat/site/trunk/docs/native-doc/index.html Thu Jun 14 14:31:19 2012 @@ -13,6 +13,15 @@ manual is described in more detail below +13 June 2012 - TC-Native-1.1.24 released +The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.24 Stable. + +Download the 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 + | http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.asc";>PGP signature + +Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/binaries/";>binaries for selected platforms. + + 02 March 2012 - TC-Native-1.1.23 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.23 Stable. Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1350266&r1=1350265&r2=1350266&view=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Thu Jun 14 14:31:19 2012 @@ -1,4 +1,4 @@ -The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0">LinksDocs HomeMiscellaneous DocumentationChangelogNews200820092010The Apache Tomcat Native - Miscellaneous Documentationprint-friendlyversion +The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0">LinksDocs HomeMiscellaneous DocumentationChangelogNews20082009201020112012The Apache Tomcat Native - Miscellaneous Documentationprint-friendlyversion Preface This is the Changelog for Tomcat Native. This changelog @@ -6,6 +6,12 @@ It should contain fixes made only after December 19th 2007, when the new documentation project for Tomcat Native was started. +Changes between 1.1.23 and 1.1.24 + + + Add support for per-socket timeouts inside poller. (markt, mturk) + + Changes between 1.1.22 and 1.1.23 Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html?rev=1350266&r1=1350265&r2=1350266&view=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html Thu Jun 14 14:31:19 2012 @@ -5,6 +5,12 @@ It should contain fixes made only after December 19th 2007, when the new documentation project for Tomcat Native was started. +Changes between 1.1.23 and 1.1.24 + + + Add support for per-socket timeouts inside poller. (markt, mturk) + + Changes between 1.1.22 and 1.1.23 Modified: tomcat/site/trunk/docs/native-doc/news/2008.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2008.html?rev=1350266&r1=1350265&r2=1350266&view=diff == --- tomcat/site/trunk/docs/native-doc/news/2008.html (original) +++ tomcat/site/trunk/docs/native-doc/news/2008.html Thu Jun
svn commit: r1350270 - /tomcat/native/branches/1.1.x/native/src/ssl.c
Author: rjung Date: Thu Jun 14 14:38:33 2012 New Revision: 1350270 URL: http://svn.apache.org/viewvc?rev=1350270&view=rev Log: Return error if BIO_flush() didn't work. Fixes compiler warning about unused return value. Modified: tomcat/native/branches/1.1.x/native/src/ssl.c Modified: tomcat/native/branches/1.1.x/native/src/ssl.c URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1350270&r1=1350269&r2=1350270&view=diff == --- tomcat/native/branches/1.1.x/native/src/ssl.c (original) +++ tomcat/native/branches/1.1.x/native/src/ssl.c Thu Jun 14 14:38:33 2012 @@ -466,9 +466,9 @@ static int ssl_rand_make(const char *fil BIO_write(out, buf, len); num -= len; } -BIO_flush(out); +r = BIO_flush(out); BIO_free_all(out); -return 1; +return r > 0 ? 1 : 0; } TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/673 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1350247 Blamelist: markt Build succeeded! sincerely, -The Buildbot
Re: Problem running "svn up" on Tomcat site
2012/6/14 Mark Thomas : > On 14/06/2012 15:10, Konstantin Kolinko wrote: >> Hi! >> >> I just had a problem with running "svn up" on tomcat.a.o. >> I found a solution, but I wonder whether others will experience the same >> issue. > > They will. Well, they would have done. > > I've made wc.db group writeable (which it clearly has to be if we are > all going to be able to do svn up). I left the ownership as it was > (kkolinko). > Thank you. I see that when I do "svn up" the group-writeable flag does not change, so the problem does not reappear. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350277 - /tomcat/site/trunk/README.txt
Author: kkolinko Date: Thu Jun 14 14:52:05 2012 New Revision: 1350277 URL: http://svn.apache.org/viewvc?rev=1350277&view=rev Log: Replace minor number in tag name example to prevent unintended use Modified: tomcat/site/trunk/README.txt Modified: tomcat/site/trunk/README.txt URL: http://svn.apache.org/viewvc/tomcat/site/trunk/README.txt?rev=1350277&r1=1350276&r2=1350277&view=diff == --- tomcat/site/trunk/README.txt (original) +++ tomcat/site/trunk/README.txt Thu Jun 14 14:52:05 2012 @@ -109,8 +109,8 @@ A) To switch to tags for released versions: - svn switch "^/tomcat/jk/tags/JK_1_2_37/xdocs" jk-xdocs - svn switch "^/tomcat/native/tags/TOMCAT_NATIVE_1_1_23/xdocs" native-1.1-xdocs + svn switch "^/tomcat/jk/tags/JK_1_2_xx/xdocs" jk-xdocs + svn switch "^/tomcat/native/tags/TOMCAT_NATIVE_1_1_xx/xdocs" native-1.1-xdocs To switch back to empty directories: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350280 - in /tomcat/native/branches/1.1.x/native/src: file.c network.c
Author: rjung
Date: Thu Jun 14 14:54:48 2012
New Revision: 1350280
URL: http://svn.apache.org/viewvc?rev=1350280&view=rev
Log:
Cast pointers to fix compiler warnings about
pointer signedness differences on Solaris.
Modified:
tomcat/native/branches/1.1.x/native/src/file.c
tomcat/native/branches/1.1.x/native/src/network.c
Modified: tomcat/native/branches/1.1.x/native/src/file.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/file.c?rev=1350280&r1=1350279&r2=1350280&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/file.c (original)
+++ tomcat/native/branches/1.1.x/native/src/file.c Thu Jun 14 14:54:48 2012
@@ -381,13 +381,13 @@ TCN_IMPLEMENT_CALL(jint, File, writev)(T
for (i = 0; i < nvec; i++) {
ba[i] = (*e)->GetObjectArrayElement(e, bufs, i);
vec[i].iov_len = (*e)->GetArrayLength(e, ba[i]);
-vec[i].iov_base = (*e)->GetByteArrayElements(e, ba[i], NULL);
+vec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, ba[i], NULL));
}
ss = apr_file_writev(f, vec, nvec, &written);
for (i = 0; i < nvec; i++) {
-(*e)->ReleaseByteArrayElements(e, ba[i], vec[i].iov_base, JNI_ABORT);
+(*e)->ReleaseByteArrayElements(e, ba[i], (jbyte *)vec[i].iov_base,
JNI_ABORT);
}
if (ss == APR_SUCCESS)
return (jint)written;
@@ -415,7 +415,7 @@ TCN_IMPLEMENT_CALL(jint, File, writevFul
for (i = 0; i < nvec; i++) {
ba[i] = (*e)->GetObjectArrayElement(e, bufs, i);
vec[i].iov_len = (*e)->GetArrayLength(e, ba[i]);
-vec[i].iov_base = (*e)->GetByteArrayElements(e, ba[i], NULL);
+vec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, ba[i], NULL));
}
#if (APR_VERSION_MAJOR >= 1) && (APR_VERSION_MINOR >= 1)
ss = apr_file_writev_full(f, vec, nvec, &written);
@@ -424,7 +424,7 @@ TCN_IMPLEMENT_CALL(jint, File, writevFul
#endif
for (i = 0; i < nvec; i++) {
-(*e)->ReleaseByteArrayElements(e, ba[i], vec[i].iov_base,
+(*e)->ReleaseByteArrayElements(e, ba[i], (jbyte *)vec[i].iov_base,
JNI_ABORT);
}
if (ss == APR_SUCCESS)
Modified: tomcat/native/branches/1.1.x/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/network.c?rev=1350280&r1=1350279&r2=1350280&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/network.c (original)
+++ tomcat/native/branches/1.1.x/native/src/network.c Thu Jun 14 14:54:48 2012
@@ -665,13 +665,13 @@ TCN_IMPLEMENT_CALL(jint, Socket, sendv)(
for (i = 0; i < nvec; i++) {
ba[i] = (*e)->GetObjectArrayElement(e, bufs, i);
vec[i].iov_len = (*e)->GetArrayLength(e, ba[i]);
-vec[i].iov_base = (*e)->GetByteArrayElements(e, ba[i], NULL);
+vec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, ba[i], NULL));
}
ss = (*s->net->sendv)(s->opaque, vec, nvec, &written);
for (i = 0; i < nvec; i++) {
-(*e)->ReleaseByteArrayElements(e, ba[i], vec[i].iov_base, JNI_ABORT);
+(*e)->ReleaseByteArrayElements(e, ba[i], (jbyte*)vec[i].iov_base,
JNI_ABORT);
}
if (ss == APR_SUCCESS)
return (jint)written;
@@ -1217,12 +1217,12 @@ TCN_IMPLEMENT_CALL(jlong, Socket, sendfi
for (i = 0; i < nh; i++) {
hba[i] = (*e)->GetObjectArrayElement(e, headers, i);
hvec[i].iov_len = (*e)->GetArrayLength(e, hba[i]);
-hvec[i].iov_base = (*e)->GetByteArrayElements(e, hba[i], NULL);
+hvec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, hba[i],
NULL));
}
for (i = 0; i < nt; i++) {
tba[i] = (*e)->GetObjectArrayElement(e, trailers, i);
tvec[i].iov_len = (*e)->GetArrayLength(e, tba[i]);
-tvec[i].iov_base = (*e)->GetByteArrayElements(e, tba[i], NULL);
+tvec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, tba[i],
NULL));
}
hdrs.headers = &hvec[0];
hdrs.numheaders = nh;
@@ -1240,11 +1240,11 @@ TCN_IMPLEMENT_CALL(jlong, Socket, sendfi
#endif
for (i = 0; i < nh; i++) {
-(*e)->ReleaseByteArrayElements(e, hba[i], hvec[i].iov_base, JNI_ABORT);
+(*e)->ReleaseByteArrayElements(e, hba[i], (jbyte*)hvec[i].iov_base,
JNI_ABORT);
}
for (i = 0; i < nt; i++) {
-(*e)->ReleaseByteArrayElements(e, tba[i], tvec[i].iov_base, JNI_ABORT);
+(*e)->ReleaseByteArrayElements(e, tba[i], (jbyte*)tvec[i].iov_base,
JNI_ABORT);
}
/* Return Number of bytes actually sent,
* including headers, file, and trailers
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350281 - /tomcat/native/branches/1.1.x/TODO.txt
Author: rjung Date: Thu Jun 14 14:55:33 2012 New Revision: 1350281 URL: http://svn.apache.org/viewvc?rev=1350281&view=rev Log: Remove completed items form TODO. Modified: tomcat/native/branches/1.1.x/TODO.txt Modified: tomcat/native/branches/1.1.x/TODO.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/TODO.txt?rev=1350281&r1=1350280&r2=1350281&view=diff == --- tomcat/native/branches/1.1.x/TODO.txt (original) +++ tomcat/native/branches/1.1.x/TODO.txt Thu Jun 14 14:55:33 2012 @@ -66,36 +66,6 @@ Java Tests and Examples Document the example in the README.txt. -Compilation Warnings - - -On Solaris: - -src/file.c: In function 'Java_org_apache_tomcat_jni_File_writev': -src/file.c:384: warning: pointer targets in assignment differ in signedness -src/file.c:390: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness -src/file.c: In function 'Java_org_apache_tomcat_jni_File_writevFull': -src/file.c:418: warning: pointer targets in assignment differ in signedness -src/file.c:428: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness - -src/network.c: In function 'Java_org_apache_tomcat_jni_Socket_sendv': -src/network.c:668: warning: pointer targets in assignment differ in signedness -src/network.c:674: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness -src/network.c: In function 'Java_org_apache_tomcat_jni_Socket_sendfile': -src/network.c:1220: warning: pointer targets in assignment differ in signedness -src/network.c:1225: warning: pointer targets in assignment differ in signedness -src/network.c:1243: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness -src/network.c:1247: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness - -src/poll.c:271: warning: 'remove_all' defined but not used - -src/ssl.c: In function 'ssl_rand_make': -src/ssl.c:469: warning: value computed is not used - -Some info on that: "The JNI functions take a jbyte*, which is a signed char* -on my Solaris system. Whereas the iovec iov_base is a caddr_t, which is a char*." - - Java Classes Source Distribution - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat Native 1.1.24 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat Native 1.1.24 stable. Please refer to the change log for the list of changes: http://tomcat.apache.org/native-doc/miscellaneous/changelog.html Downloads: http://tomcat.apache.org/download-native.cgi Thank you, -- The Apache Tomcat Team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Problem running "svn up" on Tomcat site
On 06/14/2012 04:42 PM, Konstantin Kolinko wrote: 2012/6/14 Mark Thomas : On 14/06/2012 15:10, Konstantin Kolinko wrote: Hi! I just had a problem with running "svn up" on tomcat.a.o. I found a solution, but I wonder whether others will experience the same issue. They will. Well, they would have done. I've made wc.db group writeable (which it clearly has to be if we are all going to be able to do svn up). I left the ownership as it was (kkolinko). Thank you. I see that when I do "svn up" the group-writeable flag does not change, so the problem does not reappear. Right, it was caused probably by the need of 'svn upgrade' which I did since svn changed to 1.7.x Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350282 - /tomcat/native/branches/1.1.x/xdocs/index.xml
Author: kkolinko Date: Thu Jun 14 15:03:37 2012 New Revision: 1350282 URL: http://svn.apache.org/viewvc?rev=1350282&view=rev Log: Remove previous announcement (its copy remains in news/2012.html) Replace direct links to /dist/ with a link to the download page. Modified: tomcat/native/branches/1.1.x/xdocs/index.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=1350282&r1=1350281&r2=1350282&view=diff == --- tomcat/native/branches/1.1.x/xdocs/index.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/index.xml Thu Jun 14 15:03:37 2012 @@ -48,19 +48,12 @@ manual is described in more detail below 13 June 2012 - TC-Native-1.1.24 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.24 Stable. -Download the 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 - | http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.asc";>PGP signature + + The sources and the binaries for selected platforms are available from the + Download page. -Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/binaries/";>binaries for selected platforms. - - -02 March 2012 - TC-Native-1.1.23 released -The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.23 Stable. - -Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz";>TC-native 1.1.23 release sources - | http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.asc";>PGP signature - -Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/binaries/";>binaries for selected platforms. + + Please see the ChangeLog for a full list of changes. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350284 - in /tomcat/site/trunk/docs/native-doc: index.html printer/index.html
Author: kkolinko Date: Thu Jun 14 15:04:13 2012 New Revision: 1350284 URL: http://svn.apache.org/viewvc?rev=1350284&view=rev Log: Update published Tomcat-Native documentation. Modified: tomcat/site/trunk/docs/native-doc/index.html tomcat/site/trunk/docs/native-doc/printer/index.html Modified: tomcat/site/trunk/docs/native-doc/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1350284&r1=1350283&r2=1350284&view=diff == --- tomcat/site/trunk/docs/native-doc/index.html (original) +++ tomcat/site/trunk/docs/native-doc/index.html Thu Jun 14 15:04:13 2012 @@ -16,19 +16,12 @@ manual is described in more detail below 13 June 2012 - TC-Native-1.1.24 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.24 Stable. -Download the 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 - | http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.asc";>PGP signature + + The sources and the binaries for selected platforms are available from the + Download page. -Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/binaries/";>binaries for selected platforms. - - -02 March 2012 - TC-Native-1.1.23 released -The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.23 Stable. - -Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz";>TC-native 1.1.23 release sources - | http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.asc";>PGP signature - -Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/binaries/";>binaries for selected platforms. + + Please see the ChangeLog for a full list of changes. Modified: tomcat/site/trunk/docs/native-doc/printer/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/printer/index.html?rev=1350284&r1=1350283&r2=1350284&view=diff == --- tomcat/site/trunk/docs/native-doc/printer/index.html (original) +++ tomcat/site/trunk/docs/native-doc/printer/index.html Thu Jun 14 15:04:13 2012 @@ -15,19 +15,12 @@ manual is described in more detail below 13 June 2012 - TC-Native-1.1.24 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.24 Stable. -Download the 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 - | http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz.asc";>PGP signature + + The sources and the binaries for selected platforms are available from the + Download page. -Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/binaries/";>binaries for selected platforms. - - -02 March 2012 - TC-Native-1.1.23 released -The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.23 Stable. - -Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz";>TC-native 1.1.23 release sources - | http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.asc";>PGP signature - -Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/binaries/";>binaries for selected platforms. + + Please see the ChangeLog for a full list of changes. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350294 - /tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Author: kkolinko
Date: Thu Jun 14 15:24:34 2012
New Revision: 1350294
URL: http://svn.apache.org/viewvc?rev=1350294&view=rev
Log:
Improve InternalNioInputBuffer#parseHeaders()
Move the code and s/end/pos/
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1350294&r1=1350293&r2=1350294&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Thu
Jun 14 15:24:34 2012
@@ -473,10 +473,6 @@ public class InternalNioInputBuffer exte
do {
status = parseHeader();
-} while ( status == HeaderParseStatus.HAVE_MORE_HEADERS );
-if (status == HeaderParseStatus.DONE) {
-parsingHeader = false;
-end = pos;
// Checking that
// (1) Headers plus request line size does not exceed its limit
// (2) There are enough bytes to avoid expanding the buffer when
@@ -485,11 +481,15 @@ public class InternalNioInputBuffer exte
// limitation to enforce the meaning of headerBufferSize
// From the way how buf is allocated and how blank lines are being
// read, it should be enough to check (1) only.
-if (end - skipBlankLinesBytes > headerBufferSize
-|| buf.length - end < socketReadBufferSize) {
+if (pos - skipBlankLinesBytes > headerBufferSize
+|| buf.length - pos < socketReadBufferSize) {
throw new IllegalArgumentException(
sm.getString("iib.requestheadertoolarge.error"));
}
+} while ( status == HeaderParseStatus.HAVE_MORE_HEADERS );
+if (status == HeaderParseStatus.DONE) {
+parsingHeader = false;
+end = pos;
return true;
} else {
return false;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350295 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/coyote/spdy/ java/org/ap
Author: kkolinko
Date: Thu Jun 14 15:26:43 2012
New Revision: 1350295
URL: http://svn.apache.org/viewvc?rev=1350295&view=rev
Log:
Implement maxHeaderCount attribute on Connector.
It is equivalent of LimitRequestFields directive of Apache HTTPD
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1350295&r1=1350294&r2=1350295&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Jun 14
15:26:43 2012
@@ -394,6 +394,24 @@ public class Connector extends Lifecycle
/**
+ * Return the maximum number of headers that are allowed by the container.
A
+ * value of less than 0 means no limit.
+ */
+public int getMaxHeaderCount() {
+return ((Integer) getProperty("maxHeaderCount")).intValue();
+}
+
+/**
+ * Set the maximum number of headers in a request that are allowed by the
+ * container. A value of less than 0 means no limit.
+ *
+ * @param maxHeaderCount The new setting
+ */
+public void setMaxHeaderCount(int maxHeaderCount) {
+setProperty("maxHeaderCount", String.valueOf(maxHeaderCount));
+}
+
+/**
* Return the maximum number of parameters (GET plus POST) that will be
* automatically parsed by the container. A value of less than 0 means no
* limit.
Modified: tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1350295&r1=1350294&r2=1350295&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml Thu
Jun 14 15:26:43 2012
@@ -77,6 +77,10 @@
description="The port number on which this connector is listening to
requests. If the special value for port of zero is used then this method will
report the actual port bound."
type="int"/>
+
+
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1350295&r1=1350294&r2=1350295&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Jun 14
15:26:43 2012
@@ -237,6 +237,12 @@ public abstract class AbstractProtocol i
setConnectionTimeout(timeout);
}
+public int getMaxHeaderCount() {
+return endpoint.getMaxHeaderCount();
+}
+public void setMaxHeaderCount(int maxHeaderCount) {
+endpoint.setMaxHeaderCount(maxHeaderCount);
+}
// -- Public
methods
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1350295&r1=1350294&r2=1350295&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Thu Jun
14 15:26:43 2012
@@ -647,6 +647,9 @@ public abstract class AbstractAjpProcess
// Decode headers
MimeHeaders headers = request.getMimeHeaders();
+// Set this every time in case limit has been changed via JMX
+headers.setLimit(endpoint.getMaxHeaderCount());
+
int hCount = requestHeaderMessage.getInt();
for(int i = 0 ; i < hCount ; i++) {
String hName = null;
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1350295&r1=1350
svn commit: r1350299 - /tomcat/trunk/test/org/apache/tomcat/util/http/TestMimeHeaders.java
Author: kkolinko
Date: Thu Jun 14 15:45:56 2012
New Revision: 1350299
URL: http://svn.apache.org/viewvc?rev=1350299&view=rev
Log:
A testcase.
Added:
tomcat/trunk/test/org/apache/tomcat/util/http/TestMimeHeaders.java (with
props)
Added: tomcat/trunk/test/org/apache/tomcat/util/http/TestMimeHeaders.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestMimeHeaders.java?rev=1350299&view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestMimeHeaders.java (added)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestMimeHeaders.java Thu Jun
14 15:45:56 2012
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.util.http;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.SocketException;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServlet;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.startup.SimpleHttpClient;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.valves.TesterAccessLogValve;
+
+public class TestMimeHeaders extends TomcatBaseTest {
+
+private HeaderCountLogValve alv;
+
+private void setupHeadersTest(Tomcat tomcat) {
+Context ctx = tomcat.addContext("", getTemporaryDirectory()
+.getAbsolutePath());
+Tomcat.addServlet(ctx, "servlet", new HttpServlet() {
+private static final long serialVersionUID = 1L;
+
+@Override
+public void service(ServletRequest req, ServletResponse res)
+throws ServletException, IOException {
+res.setContentType("text/plain; charset=ISO-8859-1");
+res.getWriter().write("OK");
+}
+});
+ctx.addServletMapping("/", "servlet");
+
+alv = new HeaderCountLogValve();
+tomcat.getHost().getPipeline().addValve(alv);
+}
+
+private void runHeadersTest(final boolean successExpected,
+final Tomcat tomcat, final int count,
+final int expectedMaxHeaderCount) throws Exception {
+tomcat.start();
+
+String header = "A:B" + SimpleHttpClient.CRLF;
+StringBuilder request = new StringBuilder();
+request.append("GET / HTTP/1.0" + SimpleHttpClient.CRLF);
+for (int i = 0; i < count; i++) {
+request.append(header);
+}
+request.append(SimpleHttpClient.CRLF);
+
+Client client = new Client(tomcat);
+client.setRequest(new String[] { request.toString() });
+try {
+client.connect();
+client.processRequest();
+client.disconnect();
+} catch (SocketException ex) {
+// Connection was closed by Tomcat
+if (successExpected) {
+// unexpected
+log.error(ex.getMessage(), ex);
+} else {
+log.warn(ex.getMessage(), ex);
+}
+}
+if (successExpected) {
+alv.validateAccessLog(1, 200, 0, 3000);
+// Response 200
+assertTrue("Response line is: " + client.getResponseLine(),
+client.getResponseLine() != null &&
client.isResponse200());
+assertEquals("OK", client.getResponseBody());
+} else {
+alv.validateAccessLog(1, 400, 0, 0);
+// Connection aborted or response 400
+assertTrue("Response line is: " + client.getResponseLine(),
+client.getResponseLine() == null ||
client.isResponse400());
+}
+int maxHeaderCount = tomcat.getConnector().getMaxHeaderCount();
+assertEquals(expectedMaxHeaderCount, maxHeaderCount);
+if (
svn commit: r1350301 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/InternalNioInputBuffer.java webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Jun 14 15:48:28 2012
New Revision: 1350301
URL: http://svn.apache.org/viewvc?rev=1350301&view=rev
Log:
Merged revision 1350294 from tomcat/trunk:
Improve InternalNioInputBuffer#parseHeaders()
Move the code and s/end/pos/
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1350294
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1350301&r1=1350300&r2=1350301&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Thu Jun 14 15:48:28 2012
@@ -473,10 +473,6 @@ public class InternalNioInputBuffer exte
do {
status = parseHeader();
-} while ( status == HeaderParseStatus.HAVE_MORE_HEADERS );
-if (status == HeaderParseStatus.DONE) {
-parsingHeader = false;
-end = pos;
// Checking that
// (1) Headers plus request line size does not exceed its limit
// (2) There are enough bytes to avoid expanding the buffer when
@@ -485,11 +481,15 @@ public class InternalNioInputBuffer exte
// limitation to enforce the meaning of headerBufferSize
// From the way how buf is allocated and how blank lines are being
// read, it should be enough to check (1) only.
-if (end - skipBlankLinesBytes > headerBufferSize
-|| buf.length - end < socketReadBufferSize) {
+if (pos - skipBlankLinesBytes > headerBufferSize
+|| buf.length - pos < socketReadBufferSize) {
throw new IllegalArgumentException(
sm.getString("iib.requestheadertoolarge.error"));
}
+} while ( status == HeaderParseStatus.HAVE_MORE_HEADERS );
+if (status == HeaderParseStatus.DONE) {
+parsingHeader = false;
+end = pos;
return true;
} else {
return false;
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=1350301&r1=1350300&r2=1350301&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jun 14 15:48:28 2012
@@ -315,6 +315,9 @@
53406: Fix possible stack overflow on connection close when
using Comet. (fhanik)
+
+Improve InternalNioInputBuffer.parseHeaders(). (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350306 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/h
Author: kkolinko
Date: Thu Jun 14 15:59:15 2012
New Revision: 1350306
URL: http://svn.apache.org/viewvc?rev=1350306&view=rev
Log:
Implement maxHeaderCount attribute on Connector.
It is equivalent of LimitRequestFields directive of Apache HTTPD
Added:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/TestMimeHeaders.java
- copied unchanged from r1350299,
tomcat/trunk/test/org/apache/tomcat/util/http/TestMimeHeaders.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1350295,1350299
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=1350306&r1=1350305&r2=1350306&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java Thu
Jun 14 15:59:15 2012
@@ -412,6 +412,24 @@ public class Connector extends Lifecycle
/**
+ * Return the maximum number of headers that are allowed by the container.
A
+ * value of less than 0 means no limit.
+ */
+public int getMaxHeaderCount() {
+return ((Integer) getProperty("maxHeaderCount")).intValue();
+}
+
+/**
+ * Set the maximum number of headers in a request that are allowed by the
+ * container. A value of less than 0 means no limit.
+ *
+ * @param maxHeaderCount The new setting
+ */
+public void setMaxHeaderCount(int maxHeaderCount) {
+setProperty("maxHeaderCount", String.valueOf(maxHeaderCount));
+}
+
+/**
* Return the maximum number of parameters (GET plus POST) that will be
* automatically parsed by the container. A value of less than 0 means no
* limit.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1350306&r1=1350305&r2=1350306&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
Thu Jun 14 15:59:15 2012
@@ -77,6 +77,10 @@
description="The port number on which this connector is listening to
requests. If the special value for port of zero is used then this method will
report the actual port bound."
type="int"/>
+
+
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1350306&r1=1350305&r2=1350306&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Jun
14 15:59:15 2012
@@ -237,6 +237,12 @@ public abstract class AbstractProtocol i
setConnectionTimeout(timeout);
}
+public int getMaxHeaderCount() {
+return endpoint.getMaxHeaderCount();
+}
+public void setMaxHeaderCount(int maxHeaderCount) {
+endpoint.setMaxHeaderCount(maxHeaderCount);
+}
// -- Public
methods
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1350306&r1=1350305&r2=1350306&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
Thu Jun 14 15:59:15 2012
@@ -647,6 +647,9 @@ pu
svn commit: r1350314 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Jun 14 16:12:20 2012 New Revision: 1350314 URL: http://svn.apache.org/viewvc?rev=1350314&view=rev Log: proposal 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=1350314&r1=1350313&r2=1350314&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 14 16:12:20 2012 @@ -235,6 +235,11 @@ PATCHES PROPOSED TO BACKPORT: +1: markt -1: +* Improve InternalNioInputBuffer.parseHeaders() + http://svn.apache.org/viewvc?view=revision&revision=1350294 + (r1350301 in Tomcat 7) + +1: kkolinko + -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] Apache Tomcat Native 1.1.24 released
On 14 June 2012 15:58, Mladen Turk wrote: > The Apache Tomcat team announces the immediate availability of Apache > Tomcat Native 1.1.24 stable. Please include a brief synopsis (1 or 2 sentences) of the purpose of the TLP/Product in all announcements sent outside the TLP mailing lists. The developers and users will (presumably) know what the product is about, but others are unlikely to know. S. P.S. Just about every other TLP includes this information, including HTTD... > Please refer to the change log for the list of changes: > http://tomcat.apache.org/native-doc/miscellaneous/changelog.html > > Downloads: > http://tomcat.apache.org/download-native.cgi > > Thank you, > -- > The Apache Tomcat Team > > - > 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: r1350339 - in /tomcat/native/branches/1.1.x: native/os/unix/system.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Thu Jun 14 17:04:14 2012
New Revision: 1350339
URL: http://svn.apache.org/viewvc?rev=1350339&view=rev
Log:
Add CPU information to OS info for Linux.
This was already available under Windows and Solaris.
Modified:
tomcat/native/branches/1.1.x/native/os/unix/system.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/branches/1.1.x/native/os/unix/system.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/os/unix/system.c?rev=1350339&r1=1350338&r2=1350339&view=diff
==
--- tomcat/native/branches/1.1.x/native/os/unix/system.c (original)
+++ tomcat/native/branches/1.1.x/native/os/unix/system.c Thu Jun 14 17:04:14
2012
@@ -127,6 +127,15 @@ TCN_IMPLEMENT_CALL(jint, OS, info)(TCN_S
if (sysinfo(&info))
rv = apr_get_os_error();
else {
+static char buf[1024];
+unsigned long user = 0;
+unsigned long system = 0;
+long idle = 0;
+long long starttime = 0;
+int fd;
+int len;
+long sys_clk_tck = sysconf(_SC_CLK_TCK); /* number of system ticks
per second */
+
pvals[0] = (jlong)(info.totalram * info.mem_unit);
pvals[1] = (jlong)(info.freeram * info.mem_unit);
pvals[2] = (jlong)(info.totalswap * info.mem_unit);
@@ -134,6 +143,54 @@ TCN_IMPLEMENT_CALL(jint, OS, info)(TCN_S
pvals[4] = (jlong)(info.sharedram * info.mem_unit);
pvals[5] = (jlong)(info.bufferram * info.mem_unit);
pvals[6] = (jlong)(100 - (info.freeram * 100 / info.totalram));
+
+if (sys_clk_tck >= 0) {
+/* Get total CPU times from /proc/stat */
+/* Example for the first line: cpu 2095497 8176 3280198
908667841 1543576 28867 375399 0 0 */
+/* Accoring to the man pages, the numbers are given in units
of USER_HZ:
+ * user mode, user mode with low priority (nice), system mode,
and the idle task.
+ * Additional values can be ignored. */
+fd = open("/proc/stat", O_RDONLY);
+if (fd != -1) {
+len = read(fd, buf, sizeof buf - 1);
+if (len > 0) {
+buf[len] = '\0';
+if (sscanf(buf, "cpu %lu %*d %lu %ld", &user, &system,
&idle) == 3) {
+pvals[7] = (jlong)(idle * 1000 / sys_clk_tck *
1000); /* Idle Time in microseconds */
+pvals[8] = (jlong)(system * 1000 / sys_clk_tck *
1000); /* Kernel Time in microseconds */
+pvals[9] = (jlong)(user * 1000 / sys_clk_tck *
1000); /* User Time in microseconds */
+}
+}
+close(fd);
+}
+/* Get process CPU times from /proc/self/stat */
+/* Example for the first line:
+ * 6309 (csh) S 6308 6309 6309 34816 7124 4202496 15119 252261
1 30 21 58 1537 1447 20 0 1 0 916031966 ... */
+/* Parsing it according to man -s 5 proci:
+ * pid %d, comm %s, state %c, ppid %d pgrp %d, session %d,
tty_nr %d, tpgid %d, flags %u,
+ * minflt %lu, cminflt %lu, majflt %lu, cmajflt %lu,
+ * utime %lu (!), stime %lu (!), cutime %ld (!), cstime %ld
(!),
+ * priority %ld, nice %ld, num_threads %ld, itrealvalue %ld,
+ * starttime %llu (!) */
+fd = open("/proc/self/stat", O_RDONLY);
+if (fd != -1) {
+len = read(fd, buf, sizeof buf - 1);
+if (len > 0) {
+buf[len] = '\0';
+if (sscanf(buf, "%*d %*s %*c %*d %*d %*d %*d %*d %*u"
+" %*u %*u %*u %*u"
+" %lu %lu %*d %*d"
+" %*d %*d %*d %*d"
+"%llu", &user, &system, &starttime) ==
3) {
+pvals[10] = (jlong)(apr_time_now() -
apr_time_make(info.uptime - starttime / sys_clk_tck, 0)); /* Process creation
time (apr_time_t) */
+pvals[11] = (jlong)(system * 1000 / sys_clk_tck *
1000); /* Process System Time in microseconds */
+pvals[12] = (jlong)(user * 1000 / sys_clk_tck *
1000); /* Process User Time in microseconds */
+}
+}
+close(fd);
+}
+}
+
rv = APR_SUCCESS;
}
}
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1350339&r1=1350338&r2=1350339&view=diff
svn commit: r1350340 - /tomcat/native/branches/1.1.x/TODO.txt
Author: rjung Date: Thu Jun 14 17:05:15 2012 New Revision: 1350340 URL: http://svn.apache.org/viewvc?rev=1350340&view=rev Log: CPU OS info for Linux done. More testing under different distros appreciated. Implementation based on proc file system. Modified: tomcat/native/branches/1.1.x/TODO.txt Modified: tomcat/native/branches/1.1.x/TODO.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/TODO.txt?rev=1350340&r1=1350339&r2=1350340&view=diff == --- tomcat/native/branches/1.1.x/TODO.txt (original) +++ tomcat/native/branches/1.1.x/TODO.txt Thu Jun 14 17:05:15 2012 @@ -85,23 +85,6 @@ Furthermore some of the old files do not I don't know their purpose and whether we can delete them. -Incomplete implementation on Linux --- - -There is no impl for Linux to retrieve - - * inf[7] - Idle Time in microseconds - * inf[8] - Kernel Time in microseconds - * inf[9] - User Time in microseconds - * inf[10] - Process creation time (apr_time_t) - * inf[11] - Process Kernel Time in microseconds - * inf[12] - Process User Time in microseconds - -I implemented those for Solaris long ago and thought they existed for -Linux from the beginning. But in fact for Linux there are only memory -figures implemented. - - Releasing - - 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 21:31, Mark Thomas wrote: > 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 :) It was a configuration issue with my environment. All fixed now. Unit tests and TCKs running... I'll tag if all goes well. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Why does Manager.createSession(String) take a sessionId
Hi, I'm wondering why Manager.createSession(String) takes a sessionId that gets set on the new session. When a client invokes session.invalidate() and afterwards request.getSession() he will get a new session with the same/previous session id (yes, this is only done when the sessionId was submitted via cookie, and only when "empty session path" flag is set in tc6 or the session is bound to "/" in tc7). I'm wondering why the sessionId is reused at all - what's the use case for this? Wouldn't it be more safe for users that are not aware of this fact to always generate a new sessionId? Thanx && cheers, Martin signature.asc Description: OpenPGP digital signature
[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-tabpanel&focusedCommentId=13295325#comment-13295325
]
Olivier Lamy (*$^¨%`£) commented on MTOMCAT-60:
---
Yes sometime personnal contributors missed some patches but nothing prevent to
ping them :-)
Due to the migration to ASF the patch is not attached anymore see original
http://jira.codehaus.org/browse/MTOMCAT-60
But I cannot apply it anymore.
BTW if you have any new one I will review and apply it.
Thanks
> 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}
>
> org.codehaus.mojo
> tomcat-maven-plugin
> 1.1-SNAPSHOT
>
>
>
> start-tomcat-integration-tests
>
> run
>
>
> pre-integration-test
>
> true
>
> true
>
>
>
>
> org.springframework.samples
>
> mvc-showcase
>
> 1.0.0-BUILD-SNAPSHOT
>
> /mvc-showcase2
>
>
>
>
>
>
>
>
> {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
[OT] Subversion and recording bugzilla bug ids
All, Since I know we've got some infra folks on this list but I'm not on the infra mailing list, I hope nobody minds if I ask here: When I do an svn commit to the ASF repository, one of the options (in Eclipse) is to provide a Bugzilla bug id. Can anyone tell me what svn plug-in (or whatever) is used to do that? Thanks, -chris signature.asc Description: OpenPGP digital signature
Re: [OT] Subversion and recording bugzilla bug ids
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 14/06/2012 23:12, Christopher Schultz wrote: > All, > > Since I know we've got some infra folks on this list but I'm not on > the infra mailing list, I hope nobody minds if I ask here: > > When I do an svn commit to the ASF repository, one of the options > (in Eclipse) is to provide a Bugzilla bug id. Can anyone tell me > what svn plug-in (or whatever) is used to do that? It is triggered by the presence of the bugtraq:* properties in the project root (tomcat/trunk, tomcat/tc7.0.x/trunk etc) It is a built-in extra to a number of svn clients [1] Mark [1] http://markphip.blogspot.co.uk/2007/01/integrating-subversion-with-your-issue.html -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJP2mVKAAoJEBDAHFovYFnnbbEQAMBIwHIu86UYKxTtoYbuZyXa lLgk4ZLZyQIOqZT3tsEVSehKDH90r6Spfptqc9z3x5BYjnjkrXSyT7LwLe4570hc 3qBAUDSLLSUyOY223vORMDTE441taYgpLSjlWB3O9zQK3McnnShLFxcWNE0imiqg bEbu0zOjpLxy9MGs/2nERCbQcrCu7drFLZD+BjXXCQllT6xeTbbB3HTwvjlHJCYf 0kEfTOfP7h/ztc6d1N2bZYITTutyTatwJEiVWlMRUybcCPJh6aYn+UIZQlRHMjf9 akMTdytNAMB2IUoSApum1RD3hNff9ZMm53Np5/To8NoxaAqjGJCC80g7f5bYBwPC tMQ/6UzVj22NHDiz1WRWd1EZCkIijEbx+EtkAy5IfWSq0FAhsHS7aTqnHJrLaSSQ VKkw44t1ciJ4ZcFToeWwLkydSOAme+A9rlaFuL4aYwsg4cJCI9eGbL+CHsiNVEZ7 o38jwHllsy/cGNen7EK+vfkSnxjY6pFEQ2jBbaVAmOAg17FF+eoI933HxeRY//BB bUpUbYoh21DgwDKoLZtqFUG0U2x4LTcK8w2TATdRqTbEsOBgaCJAqI4dPxVen60t 74xcQxytZ5y5COlzy/NOgERdztDgOe7z4DOoucqgtrJMqV8G8aZulNRCxoAyLvfg UCmWcNlrvF9HgxKLJuzZ =SdJd -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350431 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Fri Jun 15 00:28:40 2012 New Revision: 1350431 URL: http://svn.apache.org/viewvc?rev=1350431&view=rev Log: Mention Tomcat-Native version update (r1349937) in the 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=1350431&r1=1350430&r2=1350431&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jun 15 00:28:40 2012 @@ -431,6 +431,10 @@ Update to Eclipse JDT Compiler 3.7.2 at maven tomcat-jasper.pom. (pero) + +Update the native component of the Tomcat APR/native connector to +1.1.24. (markt) + Add missing dependencies in pom files. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Implement support for setTimeout() for Comet + APR?
Hi! There is one known limitation in Comet API: The event.setTimeout() method works for NIO connector only and for APR it throws UnsupportedOperationException Now that with 7.0.28 per-socket timeouts are supported in APR connector, maybe this limitation can be removed? Documentation: http://tomcat.apache.org/tomcat-7.0-doc/aio.html#Comet_timeouts http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/comet/CometEvent.html Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Why does Manager.createSession(String) take a sessionId
Hi Martin, On 14.06.2012 21:45, Martin Grotzke wrote: Hi, I'm wondering why Manager.createSession(String) takes a sessionId that gets set on the new session. When a client invokes session.invalidate() and afterwards request.getSession() he will get a new session with the same/previous session id (yes, this is only done when the sessionId was submitted via cookie, and only when "empty session path" flag is set in tc6 or the session is bound to "/" in tc7). I'm wondering why the sessionId is reused at all - what's the use case for this? Wouldn't it be more safe for users that are not aware of this fact to always generate a new sessionId? Empty session path was originally meant to support a portal situation. Using it there would be only one session cookie valid for all contexts, because all sessions of a user would have the same ID. But empty session path is supposed to provide more problems than solve it, so it is good practise to not enable it. Don't know the exact reasoning for TC 7. Usually the feature shouldn't be used for resuing a session id after invalidation but more for having all contexts using the same session id. I think this is no longer necessary, because the cookies is configurable per context now (e.g. its name). Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350468 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_28: ./ build.properties.default
Author: markt Date: Fri Jun 15 06:11:47 2012 New Revision: 1350468 URL: http://svn.apache.org/viewvc?rev=1350468&view=rev Log: Tag 7.0.28 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_28/ (props changed) - copied from r1350467, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_28/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_28/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_28/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_28/ -- --- bugtraq:message (added) +++ bugtraq:message Fri Jun 15 06:11:47 2012 @@ -0,0 +1 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_28/ -- bugtraq:number = true Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_28/ -- bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_28/ -- bugtraq:warnifnoissue = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_28/ -- --- svn:ignore (added) +++ svn:ignore Fri Jun 15 06:11:47 2012 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_28/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Jun 15 06:11:47 2012 @@ -0,0 +1 @@ +/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112 ,1240114,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342 320,1342476,1342498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299 Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_28/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/tags/TOMCAT_7_0_28/build.properties.default?rev=1350468&r1=1350467&r2=1350468&view=diff =
Re: Implement support for setTimeout() for Comet + APR?
On 15/06/2012 01:41, Konstantin Kolinko wrote: > Hi! > > There is one known limitation in Comet API: > > The event.setTimeout() method works for NIO connector only > and for APR it throws UnsupportedOperationException > > Now that with 7.0.28 per-socket timeouts are supported in APR > connector, maybe this limitation can be removed? I can't think of any reason why it wouldn't work now (but I haven't looked at the code yet). +1 Mark > Documentation: > http://tomcat.apache.org/tomcat-7.0-doc/aio.html#Comet_timeouts > http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/comet/CometEvent.html > > 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
