Re: Working tc native build
On 07/01/2014 05:04 PM, Mark Thomas wrote: With some additional information from Mladen regrading the build tools to use, I now have a working build environment for the Tomcat Native connector binaries. This is documented at: http://wiki.apache.org/tomcat/BuildTcNativeWin What I don't have, yet, is the ability to reproduce the entire tcnative release (mainly because I haven't tried yet). Clearly we need a 1.1.31 release ASAP. The key question at this point is for Mladen: Are you in a position to roll a 1.1.31 release and if so in what timescale? Yes I am. I can do that by tomorrow. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.1.31
On 02/07/2014 23:07, Mark Thomas wrote: Version 1.1.31 is bug fix with an update to OpenSSL 1.0.1h to address CVE-2014-0224. The proposed release artefacts can be found at [1], and the build was done using tag [2]. The VOTE will remain open for at least 72 hours. The Apache Tomcat Native 1.1.31 is [X] Stable, go ahead and release [ ] Broken because of ... Built from source on OSX and ran unit tests for APR/native - all passed Used Windows 64-bit AMD binary and ran unit tests for APR/native - all passed Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.1.31
On 03/07/2014 12:11, Konstantin Kolinko wrote: 2014-07-03 2:07 GMT+04:00 Mark Thomas ma...@apache.org: Version 1.1.31 is bug fix with an update to OpenSSL 1.0.1h to address CVE-2014-0224. The Apache Tomcat Native 1.1.31 is [x] Stable, go ahead and release [ ] Broken because of ... Packaging differences (versus 1.1.30): 1. In both [ocsp]-win32-bin.zip files: In 1.1.31 the files are in a directory named tomcat-native-1.1.31-[ocsp]-win32-bin In 1.1.30 the files are in the root of the archive. This difference shall be taken into account when updating build configurations in Tomcat 8, 7, 6. I built those manually. We should document (on the wiki) / script that part of the build to avoid that sort of issue in the future. 2. In src.tar.gz Added 5 files starting with . in jni\native\build\: ._apr_common.m4 ._config.guess ._config.sub ._find_apr.m4 ._install.sh (The src.zip is OK, does not contain those files). Those are some MacOS specific files, containing such text as Mac OS X, ATTR, com.apple.quarantine, q/0001;53b15f45;Firefox; and some binary data. It is odd that other directories do not contain such files. I used the build script for those. We probably need an additional exclude - I'll take a look. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of BuildTcNativeWin by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The BuildTcNativeWin page has been changed by markt: https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diffrev1=17rev2=18 Comment: Remove the work in progress marker = Building the Tomcat Native Connector binaries for Windows = - - '''This page is currently a work in progress. Until this notice is removed, references to ''known working'' should be read as ''believed to be working''.''' This page describes the process for building the Windows Native Connector for Windows. This is the native part of the APR/Native connector. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of BuildTcNativeWin by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The BuildTcNativeWin page has been changed by markt: https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diffrev1=18rev2=19 Comment: No need to install Cygwin * Tools * Compile as per cmsc-root/tools/README.txt * Install Perl as per cmsc-root/tools/README.txt -* Install cygwin as per cmsc-root/tools/README.txt - * Need to patch cygwin install script to use either 32-bit or 64-bit version of setup.exe (see cygwin.com for details) * TortoiseSVN (http://tortoisesvn.net/) 1.8.7 64-bit * 7-Zip 9.20 64-bit * JDK 1.7.0_60 64-bit - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat Native 1.1.31
The following votes were cast: Binding: Stable: kkolinko, remm, jfclere, markt No other votes were cast. User testing of Windows binaries reported via Bugzilla was also successful. This vote therefore passes. In addition to thanking the testers, I'd like to thank everyone who helped pull together all the various pieces of information necessary to get a working binary build on Windows. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Working tc native build
On 07/07/2014 07:52, Mladen Turk wrote: On 07/01/2014 05:04 PM, Mark Thomas wrote: With some additional information from Mladen regrading the build tools to use, I now have a working build environment for the Tomcat Native connector binaries. This is documented at: http://wiki.apache.org/tomcat/BuildTcNativeWin What I don't have, yet, is the ability to reproduce the entire tcnative release (mainly because I haven't tried yet). Clearly we need a 1.1.31 release ASAP. The key question at this point is for Mladen: Are you in a position to roll a 1.1.31 release and if so in what timescale? Yes I am. I can do that by tomorrow. I'm guessing you are catching up on e-mail. I rolled a 1.1.31 release in the middle of last week and just announced the result of the release vote. It is probably worth you casting you eye over the release instructions [1] and the release itself to see what I missed / got wrong. Konstantin spotted a few things and there are probably more. If there is anything drastically wrong, we can always roll 1.1.32. Cheers, Mark [1] https://wiki.apache.org/tomcat/BuildTcNativeWin - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r5775 - /dev/tomcat/tomcat-connectors/native/1.1.31/ /release/tomcat/tomcat-connectors/native/1.1.31/
Author: markt Date: Mon Jul 7 08:35:17 2014 New Revision: 5775 Log: Release 1.1.31 Added: release/tomcat/tomcat-connectors/native/1.1.31/ - copied from r5774, dev/tomcat/tomcat-connectors/native/1.1.31/ Removed: dev/tomcat/tomcat-connectors/native/1.1.31/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56596] OpenSSL 1.0.1g is vulnerable to a man-in-the-middle attack
https://issues.apache.org/bugzilla/show_bug.cgi?id=56596 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #17 from Mark Thomas ma...@apache.org --- 1.1.31 has been released (it may take up to 24 hours to reach all the mirrors) and the Windows binaries were built with OpenSSL 1.0.1h. The formal release announcement is expected tomorrow once the new version has replicated to the mirrors. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608374 - /tomcat/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
Author: kkolinko Date: Mon Jul 7 08:57:00 2014 New Revision: 1608374 URL: http://svn.apache.org/r1608374 Log: svn:eol-style = native Modified: tomcat/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java (props changed) Propchange: tomcat/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608375 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
Author: kkolinko Date: Mon Jul 7 08:57:58 2014 New Revision: 1608375 URL: http://svn.apache.org/r1608375 Log: svn:eol-style = native Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java (props changed) Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of BuildTcNativeWin by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The BuildTcNativeWin page has been changed by markt: https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diffrev1=19rev2=20 Comment: Add a couple of steps to build the Windows zip releases to ensure the correct internal structure copy WINXP_I64_OCSP_DLL_RELEASE\tcnative-1.dll tomcat-native-%VER%-ocsp-win32-bin\bin\i64 copy WINXP_X64_DLL_RELEASE\tcnative-1.dll tomcat-native-%VER%-win32-bin\bin\x64 copy WINXP_X64_OCSP_DLL_RELEASE\tcnative-1.dll tomcat-native-%VER%-ocsp-win32-bin\bin\x64 + + set PATH=%PATH%;%JAVA_HOME%\bin + cd tomcat-native-%VER%-win32-bin + jar -cMf ..\tomcat-native-%VER%-win32-bin.zip * + cd ..\tomcat-native-%VER%-ocsp-win32-bin + jar -cMf ..\tomcat-native-%VER%-ocsp-win32-bin.zip }}} - The unpacked binary distributions may then be found in C:\tomcat-native-1.1.x\native`tomcat-native-%VER%-[ocsp-]win32-bin + The Windows binary distributions may then be found in C:\tomcat-native-1.1.x\native\ - These need to be zipped up, signed etc. + These need to be signed and hashed before uploading for the release vote. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a build exception on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/163 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] 1608375 Blamelist: kkolinko BUILD FAILED: exception compile_1 upload_2 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608382 - /tomcat/tc6.0.x/trunk/
Author: kkolinko Date: Mon Jul 7 09:15:03 2014 New Revision: 1608382 URL: http://svn.apache.org/r1608382 Log: CTR Use .* pattern in svn:ignore property, like it is already done in tc7.0.x and trunk. I want to ignore .git directory. Modified: tomcat/tc6.0.x/trunk/ (props changed) Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:ignore (original) +++ svn:ignore Mon Jul 7 09:15:03 2014 @@ -1,6 +1,4 @@ -.classpath -.project -.settings +.* output build.properties work - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-6-trunk
The Buildbot has detected a build exception on builder tomcat-6-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-6-trunk/builds/30 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc6.0.x/trunk] 1608382 Blamelist: kkolinko BUILD FAILED: exception svn sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Working tc native build
On 07/07/2014 10:30 AM, Mark Thomas wrote: On 07/07/2014 07:52, Mladen Turk wrote: On 07/01/2014 05:04 PM, Mark Thomas wrote: With some additional information from Mladen regrading the build tools to use, I now have a working build environment for the Tomcat Native connector binaries. This is documented at: http://wiki.apache.org/tomcat/BuildTcNativeWin What I don't have, yet, is the ability to reproduce the entire tcnative release (mainly because I haven't tried yet). Clearly we need a 1.1.31 release ASAP. The key question at this point is for Mladen: Are you in a position to roll a 1.1.31 release and if so in what timescale? Yes I am. I can do that by tomorrow. I'm guessing you are catching up on e-mail. I rolled a 1.1.31 release in the middle of last week and just announced the result of the release vote. Yeah, sorry. I got lost in all those mail. It is probably worth you casting you eye over the release instructions [1] and the release itself to see what I missed / got wrong. Konstantin spotted a few things and there are probably more. If there is anything drastically wrong, we can always roll 1.1.32. Sure. Cheers -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608416 - /tomcat/native/trunk/jnirelease.sh
Author: markt Date: Mon Jul 7 11:41:34 2014 New Revision: 1608416 URL: http://svn.apache.org/r1608416 Log: Stop OSX storing extended attributes in additional files in tar files Modified: tomcat/native/trunk/jnirelease.sh Modified: tomcat/native/trunk/jnirelease.sh URL: http://svn.apache.org/viewvc/tomcat/native/trunk/jnirelease.sh?rev=1608416r1=1608415r2=1608416view=diff == --- tomcat/native/trunk/jnirelease.sh (original) +++ tomcat/native/trunk/jnirelease.sh Mon Jul 7 11:41:34 2014 @@ -22,6 +22,10 @@ JKJNIEXT= JKJNIVER= SVNBASE=https://svn.apache.org/repos/asf/tomcat/native +# Set the environment variable that stops OSX including storing extended +# attributes in tar archives etc with a file starting with ._ +export COPYFILE_DISABLE=1 + for o do case $o in - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608417 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: markt Date: Mon Jul 7 11:41:42 2014 New Revision: 1608417 URL: http://svn.apache.org/r1608417 Log: Stop OSX storing extended attributes in additional files in tar files 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=1608417r1=1608416r2=1608417view=diff == --- tomcat/native/branches/1.1.x/jnirelease.sh (original) +++ tomcat/native/branches/1.1.x/jnirelease.sh Mon Jul 7 11:41:42 2014 @@ -29,6 +29,10 @@ JKJNIVER= SVNBASE=https://svn.apache.org/repos/asf/tomcat/native TCTRUNK_SVNBASE=https://svn.apache.org/repos/asf/tomcat/trunk +# Set the environment variable that stops OSX storing extended +# attributes in tar archives etc. with a file starting with ._ +export COPYFILE_DISABLE=1 + for o do case $o in - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608428 - in /tomcat/trunk: build.properties.default build.xml webapps/docs/changelog.xml
Author: markt
Date: Mon Jul 7 12:30:26 2014
New Revision: 1608428
URL: http://svn.apache.org/r1608428
Log:
Update to Tomcat Native Library version 1.1.31 to pick up the Windows binaries
that are based on OpenSSL 1.0.1h.
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1608428r1=1608427r2=1608428view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jul 7 12:30:26 2014
@@ -143,9 +143,11 @@ npn.jar=${npn.home}/npn-${npn.version}.j
npn.loc=http://repo1.maven.org/maven2/org/eclipse/jetty/npn/npn-api/${npn.version}/npn-api-${npn.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.1.30
+tomcat-native.version=1.1.31
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
+# Required due to packaging error in 1.1.31 - remove once fixed
+tomcat-native.win.path=tomcat-native-${tomcat-native.version}-win32-bin
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1608428r1=1608427r2=1608428view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jul 7 12:30:26 2014
@@ -1821,7 +1821,7 @@
tofile=${tomcat.dist}/bin/i64/tomcat${version.major}.exe /
!-- tc native --
copy todir=${tomcat.dist}/bin
- fileset dir=${tomcat-native.home}/bin
+ fileset dir=${tomcat-native.home}/${tomcat-native.win.path}/bin
include name=*.dll/
include name=**/*.dll/
/fileset
@@ -2737,7 +2737,7 @@ Apache Tomcat ${version} native binaries
antcall target=downloadzip-2
param name=sourcefile.1 value=${tomcat-native.win.1}/
param name=sourcefile.2 value=${tomcat-native.win.2}/
- param name=destfile value=${tomcat-native.home}/LICENSE/
+ param name=destfile
value=${tomcat-native.home}/${tomcat-native.win.path}/LICENSE/
param name=destdir value=${tomcat-native.home}/
/antcall
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1608428r1=1608427r2=1608428view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 7 12:30:26 2014
@@ -187,6 +187,10 @@
update
Update optional Checkstyle library to 5.7. (kkolinko)
/update
+ update
+Update to Tomcat Native Library version 1.1.31 to pick up the Windows
+binaries that are based on OpenSSL 1.0.1h. (markt)
+ /update
/changelog
/subsection
/section
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608443 - in /tomcat/trunk: java/org/apache/catalina/session/PersistentManagerBase.java test/org/apache/catalina/session/TestPersistentManager.java webapps/docs/changelog.xml
Author: markt
Date: Mon Jul 7 12:59:05 2014
New Revision: 1608443
URL: http://svn.apache.org/r1608443
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56698
When persisting idle sessions, only persist newly idle sessions. Patch provided
by Felix Schumacher.
Added:
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1608443r1=1608442r2=1608443view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Mon Jul 7 12:59:05 2014
@@ -135,6 +135,12 @@ public abstract class PersistentManagerB
*/
private static final String name = PersistentManagerBase;
+/**
+ * Key of the note of a session in which the timestamp of last backup is
stored.
+ */
+private static final String PERSISTED_LAST_ACCESSED_TIME =
+
org.apache.catalina.session.PersistentManagerBase.persistedLastAccessedTime;
+
/**
* Store object which will manage the Session store.
@@ -988,6 +994,12 @@ public abstract class PersistentManagerB
synchronized (session) {
if (!session.isValid())
continue;
+long lastAccessedTime = session.getLastAccessedTime();
+Long persistedLastAccessedTime =
+(Long)
session.getNote(PERSISTED_LAST_ACCESSED_TIME);
+if (persistedLastAccessedTime != null
+lastAccessedTime ==
persistedLastAccessedTime.longValue())
+continue;
int timeIdle = (int) (session.getIdleTime() / 1000L);
if (timeIdle maxIdleBackup) {
if (log.isDebugEnabled())
@@ -1001,6 +1013,8 @@ public abstract class PersistentManagerB
} catch (IOException e) {
// This is logged in writeSession()
}
+session.setNote(PERSISTED_LAST_ACCESSED_TIME,
+Long.valueOf(lastAccessedTime));
}
}
}
Added: tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java?rev=1608443view=auto
==
--- tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java
(added)
+++ tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java
Mon Jul 7 12:59:05 2014
@@ -0,0 +1,187 @@
+/*
+ * 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.catalina.session;
+
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.Manager;
+import org.apache.catalina.Session;
+import org.apache.catalina.Store;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestPersistentManager extends TomcatBaseTest {
+
+private final String ACTIVITY_CHECK =
org.apache.catalina.session.StandardSession.ACTIVITY_CHECK;
+
+private String oldActivityCheck;
+
+@Before
+public void setActivityCheck() {
+oldActivityCheck =
svn commit: r1608448 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/session/PersistentManagerBase.java test/org/apache/catalina/session/TestPersistentManager.java webapps/docs/changelog.xml
Author: markt
Date: Mon Jul 7 13:06:53 2014
New Revision: 1608448
URL: http://svn.apache.org/r1608448
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56698
When persisting idle sessions, only persist newly idle sessions. Patch provided
by Felix Schumacher.
Added:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java
- copied, changed from r1608443,
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1608443
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1608448r1=1608447r2=1608448view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Mon Jul 7 13:06:53 2014
@@ -143,6 +143,12 @@ public abstract class PersistentManagerB
*/
private static String name = PersistentManagerBase;
+/**
+ * Key of the note of a session in which the timestamp of last backup is
stored.
+ */
+private static final String PERSISTED_LAST_ACCESSED_TIME =
+
org.apache.catalina.session.PersistentManagerBase.persistedLastAccessedTime;
+
/**
* Store object which will manage the Session store.
@@ -1021,6 +1027,12 @@ public abstract class PersistentManagerB
synchronized (session) {
if (!session.isValid())
continue;
+long lastAccessedTime = session.getLastAccessedTime();
+Long persistedLastAccessedTime =
+(Long)
session.getNote(PERSISTED_LAST_ACCESSED_TIME);
+if (persistedLastAccessedTime != null
+lastAccessedTime ==
persistedLastAccessedTime.longValue())
+continue;
int timeIdle;
if (StandardSession.LAST_ACCESS_AT_START) {
timeIdle = (int) ((timeNow -
session.getLastAccessedTime()) / 1000L);
@@ -1039,6 +1051,8 @@ public abstract class PersistentManagerB
} catch (IOException e) {
// This is logged in writeSession()
}
+session.setNote(PERSISTED_LAST_ACCESSED_TIME,
+Long.valueOf(lastAccessedTime));
}
}
}
Copied:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java
(from r1608443,
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java?p2=tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.javap1=tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.javar1=1608443r2=1608448rev=1608448view=diff
==
--- tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java
Mon Jul 7 13:06:53 2014
@@ -129,7 +129,7 @@ public class TestPersistentManager exten
private static class DummyStore implements Store {
private Manager manager;
-private ListString savedIds = new ArrayList();
+private ListString savedIds = new ArrayListString();
ListString getSavedIds() {
return savedIds;
@@ -183,5 +183,9 @@ public class TestPersistentManager exten
savedIds.add(session.getId());
}
+@Override
+public String getInfo() {
+return null;
+}
}
}
\ No newline at end of file
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=1608448r1=1608447r2=1608448view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 7 13:06:53 2014
@@ -141,6 +141,10 @@
codeHttpServletRequest.getPathTranslated()/code returns a value
that
is based on the modified PathInfo. (markt)
/fix
+ fix
+bug56698/bug: When persisting idle sessions, only
[Bug 56698] Sessions will be backed up too often by PersistentManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=56698 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas ma...@apache.org --- Thanks for the report and for the patches. This has been fixed in 8.0.x for 8.0.10 onwards and in 7.0.x for 7.0.55 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
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/164 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] 1608448 Blamelist: markt BUILD FAILED: failed compile sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Working tc native build
Mark, On 7/1/14, 11:44 AM, Mark Thomas wrote: On 01/07/2014 16:04, Mark Thomas wrote: With some additional information from Mladen regrading the build tools to use, I now have a working build environment for the Tomcat Native connector binaries. This is documented at: http://wiki.apache.org/tomcat/BuildTcNativeWin (excluding a working I64 build that I am still looking at) I just glanced through the current contents of BuildTcNativeWin on the wiki, and I can still see this comment: IA64 OpenSSL build failed. Commenting out destest from ms\nt.mak worked around the issue. The problem is that the tests require a compatible supporting architecture. That is, if you cross-compile to IA64 then try to run the tests, the tests will fail because you are running on x86_84 and IA64 is not available. The same thing will happen if you try to build/test on ia32: you can produce x86_64 binaries, but you will be unable to test them. Therefore, it would be safest to specify in the instructions that either x86_64 or IA64 should be used for the build -- that way, at least one of the 64-bit architectures can be tested along with the 32-bit one. It's also worth mentioning that a 32-bit environment would need to comment-out *all* the 64-bit tests, and not just the IA64 ones. Thanks for continuing to work on this, Mark. I'm glad you've been able to remove Cygwin as a requirement... looking at your initial build instructions seemed overly complicated -- or at least had many more requirements than strictly necessary. I'm not sure how much of Mladen's magic environment is strictly necessary, either: I think a lot of it could be put into scripts that ship with the tcnative source distribution. I am still going to continue to work on getting all this stuff to build using Microsoft Visual Studio Express: it should be possible to do, and I *have* been able to get a 32-bit build working. But these days, I think not having a 64-bit build available is not a practical solution, of course. -chris signature.asc Description: OpenPGP digital signature
[Tomcat Wiki] Update of BuildTcNativeWin by ChristopherSchultz
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The BuildTcNativeWin page has been changed by ChristopherSchultz:
https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diffrev1=20rev2=21
Comment:
Add notes and clarifications.
2. Others TBD
== Building ==
+
+ While tcnative itself needs to be built ''last'', we unpack it first because
there are some patches in the tcnative source distribution that will need to be
applied to both APR and OpenSSL.
+
{{{
c:
cd \
svn co https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x/
tomcat-native-1.1.x
cd tomcat-native-1.1.x\native\srclib\apr
}}}
+
- Unpack APR 1.4.8 source distribution in this directory. (Note that APR 1.4.8
source is not the current default. Visiting the APR project's page will steer
you towards APR 1.5.1 which requires a slightly different patch. The effect is
the same, but the line numbers are sufficiently different that the patch
included in the tcnative sources will not apply at all.)
+ Unpack APR 1.4.8 source distribution in this directory
({{{C:\tomcat-native-1.1.x\native\srclib\apr}}}). (Note that APR 1.4.8 source
is not the current default. Visiting the APR project's page will steer you
towards APR 1.5.1 which requires a slightly different patch. The effect is the
same, but the line numbers are sufficiently different that the patch included
in the tcnative sources will not apply at all.)
Apply the apr-enable-ipv6.patch.
{{{
@@ -66, +70 @@
cd ..\openssl
}}}
- Unpack the OpenSSL 1.0.1h source distribution in this directory.
+ Unpack the OpenSSL 1.0.1h source distribution in this directory
({{{C:\tomcat-native-1.1.x\native\srclib\openssl}}}).
Apply openssl-msvcrt.patch
{{{
@@ -167, +171 @@
cd ..\tomcat-native-%VER%-ocsp-win32-bin
jar -cMf ..\tomcat-native-%VER%-ocsp-win32-bin.zip
}}}
- The Windows binary distributions may then be found in
C:\tomcat-native-1.1.x\native\
+ The Windows binary distributions may then be found in
{{{C:\tomcat-native-1.1.x\native\}}}
These need to be signed and hashed before uploading for the release vote.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608475 - in /tomcat/site/trunk: docs/migration-8.html xdocs/migration-8.xml
Author: markt Date: Mon Jul 7 14:40:46 2014 New Revision: 1608475 URL: http://svn.apache.org/r1608475 Log: Add note about removal of org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener Modified: tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/xdocs/migration-8.xml Modified: tomcat/site/trunk/docs/migration-8.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1608475r1=1608474r2=1608475view=diff == --- tomcat/site/trunk/docs/migration-8.html (original) +++ tomcat/site/trunk/docs/migration-8.html Mon Jul 7 14:40:46 2014 @@ -221,6 +221,9 @@ a href=#Database_Connection_PoolingDatabase Connection Pooling/a /li li +a href=#ClusteringClustering/a +/li +li a href=#DebuggingDebugging/a /li li @@ -412,6 +415,22 @@ of Apache Tomcat./p div class=subsection +h4 id=ClusteringClustering/h4 +div class=text + + +pThe addition of the codeHttpServletRequest.changeSessionId()/code +method in Servlet 3.1 made the +codeorg.apache.catalina.ha.session.JvmRouteSessionIDBinderListener/code +unnecessary so it has been removed. It must be removed from cluster +configurations when upgrading to Tomcat 8./p + + +/div +/div + + +div class=subsection h4 id=DebuggingDebugging/h4 div class=text Modified: tomcat/site/trunk/xdocs/migration-8.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-8.xml?rev=1608475r1=1608474r2=1608475view=diff == --- tomcat/site/trunk/xdocs/migration-8.xml (original) +++ tomcat/site/trunk/xdocs/migration-8.xml Mon Jul 7 14:40:46 2014 @@ -122,6 +122,16 @@ of Apache Tomcat./p /subsection + subsection name=Clustering + +pThe addition of the codeHttpServletRequest.changeSessionId()/code +method in Servlet 3.1 made the +codeorg.apache.catalina.ha.session.JvmRouteSessionIDBinderListener/code +unnecessary so it has been removed. It must be removed from cluster +configurations when upgrading to Tomcat 8./p + + /subsection + subsection name=Debugging pWhen starting Tomcat with the codejpda/code option to enable remote - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608481 - in /tomcat/trunk: bin/daemon.sh webapps/docs/changelog.xml
Author: markt Date: Mon Jul 7 15:03:52 2014 New Revision: 1608481 URL: http://svn.apache.org/r1608481 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56685 Add quotes necessary for codedaemon.sh/code to work correctly on Solaris. Based on a suggesiton by lfuka. Modified: tomcat/trunk/bin/daemon.sh tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/bin/daemon.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/daemon.sh?rev=1608481r1=1608480r2=1608481view=diff == --- tomcat/trunk/bin/daemon.sh (original) +++ tomcat/trunk/bin/daemon.sh Mon Jul 7 15:03:52 2014 @@ -105,9 +105,9 @@ test .$CATALINA_HOME = . CATALINA_H test .$CATALINA_BASE = . CATALINA_BASE=$CATALINA_HOME test .$CATALINA_MAIN = . CATALINA_MAIN=org.apache.catalina.startup.Bootstrap # If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME -if [ -z $JSVC ]; then +if [ -z $JSVC ]; then JSVC=$CATALINA_BASE/bin/jsvc -if [ ! -x $JSVC ]; then +if [ ! -x $JSVC ]; then JSVC=$CATALINA_HOME/bin/jsvc fi fi Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1608481r1=1608480r2=1608481view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 7 15:03:52 2014 @@ -195,6 +195,10 @@ Update to Tomcat Native Library version 1.1.31 to pick up the Windows binaries that are based on OpenSSL 1.0.1h. (markt) /update + fix +bug56685/bug: Add quotes necessary for codedaemon.sh/code to +work correctly on Solaris. Based on a suggesiton by lfuka. (markt) + /fix /changelog /subsection /section - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608484 - /tomcat/trunk/webapps/docs/index.xml
Author: remm Date: Mon Jul 7 15:10:45 2014 New Revision: 1608484 URL: http://svn.apache.org/r1608484 Log: Add missing link for rewrite. Modified: tomcat/trunk/webapps/docs/index.xml Modified: tomcat/trunk/webapps/docs/index.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=1608484r1=1608483r2=1608484view=diff == --- tomcat/trunk/webapps/docs/index.xml (original) +++ tomcat/trunk/webapps/docs/index.xml Mon Jul 7 15:10:45 2014 @@ -137,6 +137,8 @@ Apache Tomcat, and using many of the Apa Configuring Tomcat to use an alternative JDBC pool./li lia href=web-socket-howto.htmlstrongWebSocket support/strong/a - Developing WebSocket applications for Apache Tomcat./li +lia href=rewrite.htmlstrongURL rewrite/strong/a - +Using the regexp based rewrite valve for conditional URL and host rewrite./li /ol - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56661] ServletRequest#getLocalAddr() returns the hostname, not the IP address
https://issues.apache.org/bugzilla/show_bug.cgi?id=56661 --- Comment #6 from Christopher Schultz ch...@christopherschultz.net --- Technically, this shouldn't require a change to the AJP protocol, as arbitrary HTTP headers can be sent just by modifying the configuration. Unfortunately, the CGI spec does not specify anything like localAddr... the closest thing available is SERVER_NAME which ... comes from the client's Host header. I suspect this is what is being used for getLocalAddr, here. Reading a bit about httpd's capabilities, I'm not sure it's actually possible to get the IP address of the server interface that accepted the request from the client. If the address *can* be obtained, sending it via an HTTP header and using something like the RemoteIpValve would probably work. -- 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: Working tc native build
On 07/07/2014 14:48, Christopher Schultz wrote: Mark, On 7/1/14, 11:44 AM, Mark Thomas wrote: On 01/07/2014 16:04, Mark Thomas wrote: With some additional information from Mladen regrading the build tools to use, I now have a working build environment for the Tomcat Native connector binaries. This is documented at: http://wiki.apache.org/tomcat/BuildTcNativeWin (excluding a working I64 build that I am still looking at) I just glanced through the current contents of BuildTcNativeWin on the wiki, and I can still see this comment: IA64 OpenSSL build failed. Commenting out destest from ms\nt.mak worked around the issue. The problem is that the tests require a compatible supporting architecture. I don't believe that is the problem. I shouldn't need a supporting architecture to build the tests (that part that is failing), only to run them. That is, if you cross-compile to IA64 then try to run the tests, the tests will fail because you are running on x86_84 and IA64 is not available. The same thing will happen if you try to build/test on ia32: you can produce x86_64 binaries, but you will be unable to test them. Agreed. Therefore, it would be safest to specify in the instructions that either x86_64 or IA64 should be used for the build -- that way, at least one of the 64-bit architectures can be tested along with the 32-bit one. It's also worth mentioning that a 32-bit environment would need to comment-out *all* the 64-bit tests, and not just the IA64 ones. I don't believe any of the tests are specifically 32-bit or 64-bit. Thanks for continuing to work on this, Mark. I'm glad you've been able to remove Cygwin as a requirement... looking at your initial build instructions seemed overly complicated -- or at least had many more requirements than strictly necessary. I'm not sure how much of Mladen's magic environment is strictly necessary, either: I think a lot of it could be put into scripts that ship with the tcnative source distribution. Keep in mind that these are build instructions for a completely clean OS install so there are a number of tools lists that I would normally expect to be present on a developers machine. In terms of how much of this is necessary, experience suggests that most of it is required to avoid having to install a Visual C Runtime distribution. If you are prepared to do that (or more specifically prepared to make your users do that) then yes, this could get a lot simpler. Personally, I'm in favour of making the release manager jump through a few hoops rather than making our users jump through hoops. I am still going to continue to work on getting all this stuff to build using Microsoft Visual Studio Express: it should be possible to do, and I *have* been able to get a 32-bit build working. But these days, I think not having a 64-bit build available is not a practical solution, of course. I'm not sure it is possible to build with Visual Studio Express without introducing a dependency on a Visual C Runtime distribution but if you can find a way around that issue that would be great. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608490 - in /tomcat/tc7.0.x/trunk: ./ bin/daemon.sh webapps/docs/changelog.xml
Author: markt Date: Mon Jul 7 15:32:14 2014 New Revision: 1608490 URL: http://svn.apache.org/r1608490 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56685 Add quotes necessary for codedaemon.sh/code to work correctly on Solaris. Based on a suggesiton by lfuka. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/bin/daemon.sh tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1608481 Modified: tomcat/tc7.0.x/trunk/bin/daemon.sh URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/daemon.sh?rev=1608490r1=1608489r2=1608490view=diff == --- tomcat/tc7.0.x/trunk/bin/daemon.sh (original) +++ tomcat/tc7.0.x/trunk/bin/daemon.sh Mon Jul 7 15:32:14 2014 @@ -105,9 +105,9 @@ test .$CATALINA_HOME = . CATALINA_H test .$CATALINA_BASE = . CATALINA_BASE=$CATALINA_HOME test .$CATALINA_MAIN = . CATALINA_MAIN=org.apache.catalina.startup.Bootstrap # If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME -if [ -z $JSVC ]; then +if [ -z $JSVC ]; then JSVC=$CATALINA_BASE/bin/jsvc -if [ ! -x $JSVC ]; then +if [ ! -x $JSVC ]; then JSVC=$CATALINA_HOME/bin/jsvc fi fi 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=1608490r1=1608489r2=1608490view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 7 15:32:14 2014 @@ -253,6 +253,10 @@ update Update optional Checkstyle library to 5.7. (kkolinko) /update + fix +bug56685/bug: Add quotes necessary for codedaemon.sh/code to +work correctly on Solaris. Based on a suggesiton by lfuka. (markt) + /fix /changelog /subsection /section - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56685] Tomcat7 daemon.sh did not start
https://issues.apache.org/bugzilla/show_bug.cgi?id=56685 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- Thanks for the report and suggested solution. This has been fixed in 8.0.x for 8.0.10 onwards and in 7.0.x for 7.0.55 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608504 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java
Author: kkolinko Date: Mon Jul 7 15:59:34 2014 New Revision: 1608504 URL: http://svn.apache.org/r1608504 Log: svn:eol-style = native Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java (props changed) Propchange: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608505 - /tomcat/tc6.0.x/trunk/.gitignore
Author: kkolinko Date: Mon Jul 7 16:02:58 2014 New Revision: 1608505 URL: http://svn.apache.org/r1608505 Log: Set svn:eol-style = native for .gitignore file (like it is done in tc7.0.x and trunk). Modified: tomcat/tc6.0.x/trunk/.gitignore (props changed) Propchange: tomcat/tc6.0.x/trunk/.gitignore -- svn:eol-style = native - 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-6-trunk
The Buildbot has detected a new failure on builder tomcat-6-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-6-trunk/builds/31 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc6.0.x/trunk] 1608505 Blamelist: kkolinko BUILD FAILED: failed sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56661] ServletRequest#getLocalAddr() returns the hostname, not the IP address
https://issues.apache.org/bugzilla/show_bug.cgi?id=56661 --- Comment #7 from Mark Thomas ma...@apache.org --- I've just taken a look at the httpd docs as well and I don't see any way of obtaining the IP address of the interface that the request was received on. That reduces the choices to: a) returning null b) return the hose name (current behaviour) c) use DNS to get the IP address d) return an empty string If I was starting from a clean slate, I choose option a). However, given the current behaviour that is likely to start triggering NPEs in applications. That makes d) preferrable to a). There are many cases where c) will not return the correct value. DNS round-robin load-balancing being one. Therefore, I don't think this apporach should be used. So that leaves b) or d) as the possible options in this case. I don't think we should change it for 7.0.x or earlier but we could change it in 8.0x onwards. I leave it a few days before doing anything to give folks a chance to comment. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56661] ServletRequest#getLocalAddr() returns the hostname, not the IP address
https://issues.apache.org/bugzilla/show_bug.cgi?id=56661 --- Comment #8 from Mark Thomas ma...@apache.org --- Just re=read my previous comment and it isn't very clear. My proposal is to leave 7.0.x and earlier unchanged and to change 8.0.x onwards to return the empty string by default for getLocalAddr() -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56661] ServletRequest#getLocalAddr() returns the hostname, not the IP address
https://issues.apache.org/bugzilla/show_bug.cgi?id=56661 --- Comment #9 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to Mark Thomas from comment #7) I've just taken a look at the httpd docs as well and I don't see any way of obtaining the IP address of the interface that the request was received on. Looking at CustomLog formats [1] it says that %A is Local IP-address. Thus there should be a way. There is also such feature as IP-based virtual hosts. [2] [1] http://httpd.apache.org/docs/2.4/mod/mod_log_config.html#formats [2] http://httpd.apache.org/docs/2.4/vhosts/ip-based.html -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56686] compressionMinSize and compressableMimeType settings ignored
https://issues.apache.org/bugzilla/show_bug.cgi?id=56686 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- You have mis-intepretted the information Chrome is providing. The larger size is the size of thre content + headers. The smaller size is the size of the content. There is no compression occurring. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56608] WatchedResource configured in $TomcatHome\conf\Catalina\localhost context XML file not triggering context reload after working for several days
https://issues.apache.org/bugzilla/show_bug.cgi?id=56608 --- Comment #3 from Mark Thomas ma...@apache.org --- Ping. Without the requested information this is likely to get closed as WORKSFORME. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608509 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Author: kkolinko Date: Mon Jul 7 16:37:43 2014 New Revision: 1608509 URL: http://svn.apache.org/r1608509 Log: Correct typo in changelog. The directive name is OK, the typo is only in changelog. (The original commit was on 2005-05-07 http://tomcat.markmail.org/thread/2bax7pzkheaaey4n http://marc.info/?l=tomcat-devm=111545377731908w=2 ) Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1608509r1=1608508r2=1608509view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Jul 7 16:37:43 2014 @@ -2152,7 +2152,7 @@ subsection name=Native changelog update - Added ForwardLocallAddres JkOptions flag for passing local instead remote + Added ForwardLocalAddress JkOptions flag for passing local instead remote address. Useful for remote addr valve. (mturk) /update fixFix that worker not used, when stopped flag is true. (pero) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56661] ServletRequest#getLocalAddr() returns the hostname, not the IP address
https://issues.apache.org/bugzilla/show_bug.cgi?id=56661 --- Comment #10 from Konstantin Kolinko knst.koli...@gmail.com --- There is such directive as JkOptions +ForwardLocalAddress http://tomcat.apache.org/connectors-doc/webserver_howto/apache.html Commit that implemented it: http://marc.info/?l=tomcat-devm=111545377731908w=2 r-connection-local_ip -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56661] ServletRequest#getLocalAddr() returns the hostname, not the IP address
https://issues.apache.org/bugzilla/show_bug.cgi?id=56661 --- Comment #11 from Konstantin Kolinko knst.koli...@gmail.com --- As examples: Implementation of custom JK_LB_ACTIVATION request attribute: r1078846 Implementation of custom AJP_REMOTE_PORT request attribute: r756926 r757223 Those are the only custom header names in native/common/jk_ajp_common.h of mod_jk, so I think those are the only examples. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56685] Tomcat7 daemon.sh did not start
https://issues.apache.org/bugzilla/show_bug.cgi?id=56685 --- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com --- (This was a regression from bug 55297 fix - r1507096, so only 7.0.43 and later are affected). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 50604] Incorrect dependency in jasper.pom for eclipse ecj
https://issues.apache.org/bugzilla/show_bug.cgi?id=50604 --- Comment #15 from Mark Thomas ma...@apache.org --- The JAR in that repo is over twice the size of the JAR we currently use. Further there is only a partial overlap between the JARs so the larger file is not a superset of the smaller. I'm currently looking around the Eclipse Maven repo to see if the JAR we want is in there somewhere. -- 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: r1608484 - /tomcat/trunk/webapps/docs/index.xml
2014-07-07 19:10 GMT+04:00 r...@apache.org: Author: remm Date: Mon Jul 7 15:10:45 2014 New Revision: 1608484 URL: http://svn.apache.org/r1608484 Log: Add missing link for rewrite. Thank you for noting and fixing. One more here: The RewriteValve is not mentioned at all in config/valve.html. Modified: tomcat/trunk/webapps/docs/index.xml == --- tomcat/trunk/webapps/docs/index.xml (original) +++ tomcat/trunk/webapps/docs/index.xml Mon Jul 7 15:10:45 2014 @@ -137,6 +137,8 @@ Apache Tomcat, and using many of the Apa Configuring Tomcat to use an alternative JDBC pool./li lia href=web-socket-howto.htmlstrongWebSocket support/strong/a - Developing WebSocket applications for Apache Tomcat./li +lia href=rewrite.htmlstrongURL rewrite/strong/a - +Using the regexp based rewrite valve for conditional URL and host rewrite./li /ol - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56661] ServletRequest#getLocalAddr() returns the hostname, not the IP address
https://issues.apache.org/bugzilla/show_bug.cgi?id=56661 Mark Thomas ma...@apache.org changed: What|Removed |Added Component|Servlet JSP API |mod_jk Version|7.0.53 |1.2.40 Product|Tomcat 7|Tomcat Connectors --- Comment #12 from Mark Thomas ma...@apache.org --- OK. Looks like the information is available in the httpd internals but not (obviously) via config. Therefore, if mod_jk implements a new request atribute to pass this information, Tomcat can use it for getLocalAddr(). Moving this to mod_jk to get that implemented. -- 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: Early Access builds for JDK 9 b21, JDK 8u20 b21 are available on java.net
On 04/07/2014 10:22, Rory O'Donnell Oracle, Dublin Ireland wrote: Hi Mladen/Mark, Early Access builds for JDK 9 b21 https://jdk9.java.net/download/ and JDK 8u20 b21 https://jdk8.java.net/download.html are available on java.net. As we enter the later phases of development for JDK 8u20 , please log any show stoppers as soon as possible. Rory, We have received a bug report that indicates that there may well be a regression in ServerSocket.accept() in Java 7[1] (and I suspect later versions but I haven't had a chance to look at the code yet). Given that we have had much more success getting Java bugs fixed when you point us in the best direction to report stuff, where would you recommend that we report this issue? Thanks, Mark [1] https://issues.apache.org/bugzilla/show_bug.cgi?id=56684 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56684] java7: java.net.SocketTimeoutException: Accept timed out
https://issues.apache.org/bugzilla/show_bug.cgi?id=56684 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #1 from Mark Thomas ma...@apache.org --- Hmm. My initial impression is that that is a JRE bug. I've contacted someone at Oracle (see the dev list) who has been helpful in pointing us in the right direction to report bugs. Keep an eye on the dev list for progress on that. However, I can't repeat the results you report. When I run strace on the same Java version as you are using, I see a call to poll with a timeout of -1 which I am assuming is an infinite timeout. You'll need to provide enough information about your environment to enable us (and Oracle) to repeat this otherwise this is going to get resolved as WORKSFORME. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56648] ContainerBase.addChild blocks all user requests while single webapp is being deployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=56648 --- Comment #2 from Mark Thomas ma...@apache.org --- The 7.0.x fix to be reviewed for backport is http://svn.apache.org/viewvc?view=revisionrevision=1036918 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56684] java7: java.net.SocketTimeoutException: Accept timed out
https://issues.apache.org/bugzilla/show_bug.cgi?id=56684
Gustavo Lopes gust...@thehyve.nl changed:
What|Removed |Added
Status|NEEDINFO|NEW
--- Comment #2 from Gustavo Lopes gust...@thehyve.nl ---
I tested this on Ubuntu Trusty amd64. I can also reproduce on my home machine,
which runas arch (amd64).
You can try this Vagrantfile:
Vagrant.configure('2') do |config|
config.vm.box = ubuntu/trusty64
provision_script = -eos
cat ~vagrant/run-test eod
#!/bin/bash
# only one version of Java installed; no need to set JAVA_HOME
# so Groovy picks the correct one
aptitude install -y oracle-java7-installer groovy
java -version
strace -f -o /tmp/hh groovy -e 'new ServerSocket(60001, 1,
InetAddress.getByName(localhost)).accept()'
eod
chmod +x ~vagrant/run-test
apt-get install -y python-software-properties strace vim
add-apt-repository -y ppa:webupd8team/java
apt-get update
eos
config.vm.provision shell, inline: provision_script
end
after ssh'ing, run sudo ./run-test, accept the license and then Ctrl+C. You can
then instpect /tmp/hh
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56684] java7: java.net.SocketTimeoutException: Accept timed out
https://issues.apache.org/bugzilla/show_bug.cgi?id=56684
--- Comment #3 from Gustavo Lopes gust...@thehyve.nl ---
The strace output may actually be a bug in strace because poll() takes a signed
int as timeout; it would seem strace is interpreting the value as an unsigned
int. Indeed:
$ cat a.c gcc a.c strace ./a.out
#include poll.h
#include stdio.h
void main() {
struct pollfd fd = { .fd = fileno(stdin), .events = POLLIN };
int timeout = -1;
poll(fd, 1, timeout);
}
execve(./a.out, [./a.out], [/* 57 vars */]) = 0
brk(0) = 0xeb5000
(...)
poll([{fd=0, events=POLLIN}], 1, 4294967295^CProcess 6565 detached
That leaves me (short of a bug in glibc or the kernel) with no explanation for
the exception I got, which takes quite a while to reproduce, though if poll
doesn't use the monotonic clock, there may be an faster way. I'll check
tomorrow.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56684] java7: java.net.SocketTimeoutException: Accept timed out
https://issues.apache.org/bugzilla/show_bug.cgi?id=56684 --- Comment #4 from Gustavo Lopes gust...@thehyve.nl --- A quick observation: the poll syscall used to take a long, and now takes an int. Maybe strace hasn't been updated yet: http://lwn.net/Articles/483078/ -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-validate : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 28 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20140708.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/tar get/commons-exec-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20140708.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20140708.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20140708.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-18.0-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 5.8-SNAPSHOT on 2598 files [checkstyle] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/catalina/session/TestPersistentManager.java:37: Wrong order for 'org.junit.After' import. BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:496: Got 1 errors and 0 warnings. Total time: 28 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 2014070809, vmgump.apache.org:vmgump:2014070809 Gump E-mail Identifier (unique within run) #5. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 33 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20140708.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/tar get/commons-exec-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20140708.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20140708.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20140708.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-18.0-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar setproxy: downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 5.8-SNAPSHOT on 2896 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/catalina/session/TestPersistentManager.java:37: Wrong order for 'org.junit.After' import. [checkstyle] /srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:199: Line matches the illegal pattern '\s+$'. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:539: Got 2 errors and 0 warnings. Total time: 33 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 2014070809, vmgump.apache.org:vmgump:2014070809 Gump E-mail Identifier (unique within run) #6. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 25 mins 20 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140708-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140708.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140708-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.tes t.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140708.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servle t-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat
svn commit: r1608653 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Author: kkolinko
Date: Tue Jul 8 04:02:41 2014
New Revision: 1608653
URL: http://svn.apache.org/r1608653
Log:
Replace field with a getter, to allow to change implementation
(in view of possible backport of r1606651, r1606680)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=1608653r1=1608652r2=1608653view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Tue Jul 8 04:02:41 2014
@@ -93,7 +93,7 @@ public final class Mapper {
} else {
Host duplicate = hosts[find(hosts, name)];
log.error(sm.getString(mapper.duplicateHost, name,
-duplicate.realHostName));
+duplicate.getRealHostName()));
// Do not add aliases, as removeHost(hostName) won't be able to
remove them
return;
}
@@ -160,7 +160,7 @@ public final class Mapper {
return;
}
log.error(sm.getString(mapper.duplicateHostAlias, alias,
-realHost.realHostName, duplicate.realHostName));
+realHost.getRealHostName(), duplicate.getRealHostName()));
}
}
@@ -1468,7 +1468,7 @@ public final class Mapper {
protected static final class Host
extends MapElement {
-public final String realHostName;
+private final String realHostName;
public ContextList contextList;
/**
@@ -1492,6 +1492,10 @@ public final class Mapper {
public boolean isAlias() {
return !name.equals(realHostName);
}
+
+public String getRealHostName() {
+return realHostName;
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1608655 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Jul 8 04:06:30 2014 New Revision: 1608655 URL: http://svn.apache.org/r1608655 Log: Add amendment to the patch 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=1608655r1=1608654r2=1608655view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 8 04:06:30 2014 @@ -60,7 +60,8 @@ PATCHES PROPOSED TO BACKPORT: Log an error if there is a conflict between Host and Alias names. Improve host management methods in Mapper to avoid occasionally removing a wrong host. - https://issues.apache.org/bugzilla/attachment.cgi?id=31744 + 1) https://issues.apache.org/bugzilla/attachment.cgi?id=31744 + 2) http://svn.apache.org/r1608653 +1: kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
