svn commit: r1439334 - /tomcat/trunk/webapps/docs/windows-auth-howto.xml
Author: markt
Date: Mon Jan 28 10:34:24 2013
New Revision: 1439334
URL: http://svn.apache.org/viewvc?rev=1439334&view=rev
Log:
Add Jespa
Modified:
tomcat/trunk/webapps/docs/windows-auth-howto.xml
Modified: tomcat/trunk/webapps/docs/windows-auth-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/windows-auth-howto.xml?rev=1439334&r1=1439333&r2=1439334&view=diff
==
--- tomcat/trunk/webapps/docs/windows-auth-howto.xml (original)
+++ tomcat/trunk/webapps/docs/windows-auth-howto.xml Mon Jan 28 10:34:24 2013
@@ -51,8 +51,9 @@ sections.
-This is a work in progress. There are a number of outstanding
-questions that require further testing. These include:
+This documentation is a work in progress. There are a number of
+outstanding questions around the edge cases that require further
+testing. These include:
Does the domain name have to be in upper case?
@@ -219,7 +220,8 @@ com.sun.security.jgss.krb5.accept {
Full details of this solution can be found through the
- http://waffle.codeplex.com/";>Waffle site. The key features
are:
+ http://waffle.codeplex.com/";>Waffle web site. The key features
+ are:
Drop-in solution
Simple configuration (no JAAS or Kerberos keytab configuration required)
@@ -231,7 +233,7 @@ com.sun.security.jgss.krb5.accept {
Full details of this solution can be found through the
http://static.springsource.org/spring-security/site/extensions/krb/index.html";>
- Kerberos extension site. The key features are:
+ Kerberos extension web site. The key features are:
Extension to Spring Security
Requires a Kerberos keytab file to be generated
@@ -248,6 +250,16 @@ com.sun.security.jgss.krb5.accept {
Pure Java solution
+
+
+ Full details of this solution can be found through the
+ http://www.ioplex.com/";>project web siteThe key
+ features are:
+
+ Pure Java solution
+ Advanced Active Directory integration
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439335 - /tomcat/native/trunk/native/os/unix/system.c
Author: rjung
Date: Mon Jan 28 10:34:27 2013
New Revision: 1439335
URL: http://svn.apache.org/viewvc?rev=1439335&view=rev
Log:
Add CPU information to OS info for Linux.
This was already available under Windows and Solaris.
Forward port of r1350339 from 1.1.x branch.
Modified:
tomcat/native/trunk/native/os/unix/system.c
Modified: tomcat/native/trunk/native/os/unix/system.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/unix/system.c?rev=1439335&r1=1439334&r2=1439335&view=diff
==
--- tomcat/native/trunk/native/os/unix/system.c (original)
+++ tomcat/native/trunk/native/os/unix/system.c Mon Jan 28 10:34:27 2013
@@ -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;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439337 - /tomcat/native/trunk/native/os/unix/system.c
Author: rjung
Date: Mon Jan 28 10:55:45 2013
New Revision: 1439337
URL: http://svn.apache.org/viewvc?rev=1439337&view=rev
Log:
Docs in OS.java tell us we want microseconds.
Linux impl already provides microsecs, so lets
switch Solaris impl also to micro instead of milli.
Modified:
tomcat/native/trunk/native/os/unix/system.c
Modified: tomcat/native/trunk/native/os/unix/system.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/unix/system.c?rev=1439337&r1=1439336&r2=1439337&view=diff
==
--- tomcat/native/trunk/native/os/unix/system.c (original)
+++ tomcat/native/trunk/native/os/unix/system.c Mon Jan 28 10:55:45 2013
@@ -210,8 +210,8 @@ TCN_IMPLEMENT_CALL(jint, OS, info)(TCN_S
int res = 0; /* general result state */
/* non-static variables - sysinfo/swapctl use */
long ret_sysconf; /* value returned from sysconf
call */
-long tck_dividend; /* factor used by transforming
tick numbers to milliseconds */
-long tck_divisor; /* divisor used by transforming
tick numbers to milliseconds */
+long tck_dividend; /* factor used by transforming
tick numbers to microseconds */
+long tck_divisor; /* divisor used by transforming
tick numbers to microseconds */
long sys_pagesize = sysconf(_SC_PAGESIZE); /* size of a system memory
page in bytes */
long sys_clk_tck = sysconf(_SC_CLK_TCK); /* number of system ticks per
second */
struct anoninfo info; /* structure for information
about sizes in anonymous memory system */
@@ -283,11 +283,11 @@ TCN_IMPLEMENT_CALL(jint, OS, info)(TCN_S
creation = (long)(now - (prusg.pr_tstamp.tv_sec -
prusg.pr_create.tv_sec));
}
-pvals[10] = (jlong)(creation);
-pvals[11] = (jlong)((jlong)prusg.pr_stime.tv_sec * 1000 +
-(prusg.pr_stime.tv_nsec / 100));
-pvals[12] = (jlong)((jlong)prusg.pr_utime.tv_sec * 1000 +
-(prusg.pr_utime.tv_nsec / 100));
+pvals[10] = (jlong)(creation * 100L);
+pvals[11] = (jlong)((jlong)prusg.pr_stime.tv_sec * 100L +
+(prusg.pr_stime.tv_nsec / 1000L));
+pvals[12] = (jlong)((jlong)prusg.pr_utime.tv_sec * 100L +
+(prusg.pr_utime.tv_nsec / 1000L));
pvals[15] = (jlong)(prusg.pr_majf);
}
else {
@@ -299,7 +299,7 @@ TCN_IMPLEMENT_CALL(jint, OS, info)(TCN_S
rv = apr_get_os_error();
}
else {
-tck_dividend = 1000;
+tck_dividend = 100L;
tck_divisor = sys_clk_tck;
for (i = 0; i < 3; i++) {
if (tck_divisor % 2 == 0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439338 - in /tomcat/site/trunk: docs/security-6.html docs/security-7.html xdocs/security-6.xml xdocs/security-7.xml
Author: markt Date: Mon Jan 28 10:57:09 2013 New Revision: 1439338 URL: http://svn.apache.org/viewvc?rev=1439338&view=rev Log: Add CVE-2012-5568 to the not a vulnerability in Tomcat section. Modified: tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/xdocs/security-6.xml tomcat/site/trunk/xdocs/security-7.xml Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1439338&r1=1439337&r2=1439338&view=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Mon Jan 28 10:57:09 2013 @@ -1791,6 +1791,33 @@ +Low: Denial Of Service + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5568"; rel="nofollow">CVE-2012-5568 + + + +Sending an HTTP request 1 byte at a time will consume a thread from the + connection pool until the request has been fully processed if using the + BIO or APR/native HTTP connectors. Multiple requests may be used to + consume all threads in the connection pool thereby creating a denial of + service. + + +Since the relationship between the client side resources and server side + resources is a linear one, this issue is not something that the Tomcat + Security Team views as a vulnerability. This is a generic DoS problem and + there is no magic solution. This issue has been discussed several times + on the Tomcat mailing lists. The best place to start to review these + discussions is the report for + https://issues.apache.org/bugzilla/show_bug.cgi?id=54263";>bug + 54236. + + +This was first discussed on the public Tomcat users mailing list on 19 + June 2009. + + + Important: Remote Denial Of Service http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-4476"; rel="nofollow">CVE-2010-4476 Modified: tomcat/site/trunk/docs/security-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1439338&r1=1439337&r2=1439338&view=diff == --- tomcat/site/trunk/docs/security-7.html (original) +++ tomcat/site/trunk/docs/security-7.html Mon Jan 28 10:57:09 2013 @@ -1395,6 +1395,36 @@ +Low: Denial Of Service + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5568"; rel="nofollow">CVE-2012-5568 + + + +Sending an HTTP request 1 byte at a time will consume a thread from the + connection pool until the request has been fully processed if using the + BIO or APR/native HTTP connectors. Multiple requests may be used to + consume all threads in the connection pool thereby creating a denial of + service. + + +Since the relationship between the client side resources and server side + resources is a linear one, this issue is not something that the Tomcat + Security Team views as a vulnerability. This is a generic DoS problem and + there is no magic solution. This issue has been discussed several times + on the Tomcat mailing lists. The best place to start to review these + discussions is the report for + https://issues.apache.org/bugzilla/show_bug.cgi?id=54263";>bug + 54236. + + +This was first discussed on the public Tomcat users mailing list on 19 + June 2009. + + +Affects: 7.0.0-7.0.x + + + Important: Remote Denial Of Service http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-4476"; rel="nofollow">CVE-2010-4476 Modified: tomcat/site/trunk/xdocs/security-6.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1439338&r1=1439337&r2=1439338&view=diff == --- tomcat/site/trunk/xdocs/security-6.xml (original) +++ tomcat/site/trunk/xdocs/security-6.xml Mon Jan 28 10:57:09 2013 @@ -909,6 +909,27 @@ +Low: Denial Of Service + CVE-2012-5568 + +Sending an HTTP request 1 byte at a time will consume a thread from the + connection pool until the request has been fully processed if using the + BIO or APR/native HTTP connectors. Multiple requests may be used to + consume all threads in the connection pool thereby creating a denial of + service. + +Since the relationship between the client side resources and server side + resources is a linear one, this issue is not something that the Tomcat + Security Team views as a vulnerability. This is a generic DoS problem and + there is no magic solution. This issue has been discussed several times + on the Tomcat mailing lists. The best place to start to review these + discussions is the report for + https://issues.apache.org/bugzilla/show_bug.cgi?id=54263";>bug + 54236. + +This was fir
svn commit: r1439341 - in /tomcat/native/branches/1.1.x: ./ native/os/unix/system.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Mon Jan 28 11:00:09 2013
New Revision: 1439341
URL: http://svn.apache.org/viewvc?rev=1439341&view=rev
Log:
Docs in OS.java tell us we want microseconds.
Linux impl already provides microsecs, so lets
switch Solaris impl also to micro instead of milli.
Backport of 1439337 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/os/unix/system.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Propchange: tomcat/native/branches/1.1.x/
--
Merged /tomcat/native/trunk:r1439337
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=1439341&r1=1439340&r2=1439341&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 Mon Jan 28 11:00:09
2013
@@ -210,8 +210,8 @@ TCN_IMPLEMENT_CALL(jint, OS, info)(TCN_S
int res = 0; /* general result state */
/* non-static variables - sysinfo/swapctl use */
long ret_sysconf; /* value returned from sysconf
call */
-long tck_dividend; /* factor used by transforming
tick numbers to milliseconds */
-long tck_divisor; /* divisor used by transforming
tick numbers to milliseconds */
+long tck_dividend; /* factor used by transforming
tick numbers to microseconds */
+long tck_divisor; /* divisor used by transforming
tick numbers to microseconds */
long sys_pagesize = sysconf(_SC_PAGESIZE); /* size of a system memory
page in bytes */
long sys_clk_tck = sysconf(_SC_CLK_TCK); /* number of system ticks per
second */
struct anoninfo info; /* structure for information
about sizes in anonymous memory system */
@@ -283,11 +283,11 @@ TCN_IMPLEMENT_CALL(jint, OS, info)(TCN_S
creation = (long)(now - (prusg.pr_tstamp.tv_sec -
prusg.pr_create.tv_sec));
}
-pvals[10] = (jlong)(creation);
-pvals[11] = (jlong)((jlong)prusg.pr_stime.tv_sec * 1000 +
-(prusg.pr_stime.tv_nsec / 100));
-pvals[12] = (jlong)((jlong)prusg.pr_utime.tv_sec * 1000 +
-(prusg.pr_utime.tv_nsec / 100));
+pvals[10] = (jlong)(creation * 100L);
+pvals[11] = (jlong)((jlong)prusg.pr_stime.tv_sec * 100L +
+(prusg.pr_stime.tv_nsec / 1000L));
+pvals[12] = (jlong)((jlong)prusg.pr_utime.tv_sec * 100L +
+(prusg.pr_utime.tv_nsec / 1000L));
pvals[15] = (jlong)(prusg.pr_majf);
}
else {
@@ -299,7 +299,7 @@ TCN_IMPLEMENT_CALL(jint, OS, info)(TCN_S
rv = apr_get_os_error();
}
else {
-tck_dividend = 1000;
+tck_dividend = 100L;
tck_divisor = sys_clk_tck;
for (i = 0; i < 3; i++) {
if (tck_divisor % 2 == 0) {
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=1439341&r1=1439340&r2=1439341&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Mon Jan 28
11:00:09 2013
@@ -36,6 +36,14 @@
new documentation project for Tomcat Native was started.
+
+
+
+ Switch CPU information on Solaris from milliseconds to
+ microseconds. Make consistent with OS.java and Linux impl. (rjung)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 52318] Version in tomcat-jdbc POM is conflicted with Version in MANIFEST for JULI JAR
https://issues.apache.org/bugzilla/show_bug.cgi?id=52318 --- Comment #17 from Martin Lichtin --- Created attachment 29897 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29897&action=edit Updated dependency on Juli, allow versions 7.0.x Could this be fixed? I would like to use tomcat-jdbc in an OSGi environment and currently the version restriction [6.0.18, 7.1.0) on juli.logging forces me to install a version 6 of tomcat-juli. -- 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 52318] Version in tomcat-jdbc POM is conflicted with Version in MANIFEST for JULI JAR
https://issues.apache.org/bugzilla/show_bug.cgi?id=52318 Martin Lichtin changed: What|Removed |Added CC||lich...@yahoo.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3845 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1439334 Blamelist: markt Build succeeded! sincerely, -The Buildbot
svn commit: r1439345 - /tomcat/native/branches/1.1.x/native/src/sslutils.c
Author: rjung
Date: Mon Jan 28 11:19:50 2013
New Revision: 1439345
URL: http://svn.apache.org/viewvc?rev=1439345&view=rev
Log:
Fix unused variable warning.
Modified:
tomcat/native/branches/1.1.x/native/src/sslutils.c
Modified: tomcat/native/branches/1.1.x/native/src/sslutils.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslutils.c?rev=1439345&r1=1439344&r2=1439345&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslutils.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslutils.c Mon Jan 28 11:19:50 2013
@@ -902,7 +902,6 @@ static int add_ocsp_cert(OCSP_REQUEST **
*/
static apr_socket_t *make_socket(char *hostname, int port, apr_pool_t *mp)
{
-int r = 0;
apr_sockaddr_t *sa_in;
apr_status_t status;
apr_socket_t *sock = NULL;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Confusion around tcnative
I'm a bit confused about tcnative and the various trunks and branches: 1) tcnative trunk vs. branch 1.1.x. It seems most updates are directly done to the branch. So trunk is outdated. On the other hand originally there were some updates to trunk not in 1.1.x. I think this should be cleaned up. The current trunk doesn't seem to be useful. 2) tcnative and Java classes We still have Java classes in the tcnative branch. They neither match with the copies maintained in the tc7 branch, nor with the ones in the tc trunk branch. tcnative trunk does not have the Java files. Is there any use for the copies of the Java files in the tcnative 1.1.x branch? Otherwise I think we should remov them and check them out from TC7 or TC trunk when rolling a tcnative release. Note that tcnative also contains test and examples Java classes, which are *not* also in the TC branches. Those must be kept in tcnative (or moved to TC). Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439347 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Author: markt Date: Mon Jan 28 11:20:48 2013 New Revision: 1439347 URL: http://svn.apache.org/viewvc?rev=1439347&view=rev Log: Drop 10 10s. 100s was a local change while I was debugging so I had more time. Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1439347&r1=1439346&r2=1439347&view=diff == --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Mon Jan 28 11:20:48 2013 @@ -79,7 +79,7 @@ public class TestWsWebSocketContainer ex wsSession.addMessageHandler(handler); wsSession.getRemote().sendString(MESSAGE_STRING_1); -boolean latchResult = handler.getLatch().await(100, TimeUnit.SECONDS); +boolean latchResult = handler.getLatch().await(10, TimeUnit.SECONDS); Assert.assertTrue(latchResult); @@ -223,7 +223,7 @@ public class TestWsWebSocketContainer ex wsSession.getRemote().sendBytes(ByteBuffer.wrap(MESSAGE_BINARY_4K)); } -boolean latchResult = handler.getLatch().await(100, TimeUnit.SECONDS); +boolean latchResult = handler.getLatch().await(10, TimeUnit.SECONDS); Assert.assertTrue(latchResult); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1438747 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
On 26/01/2013 12:30, Konstantin Kolinko wrote: > 2013/1/26 Mark Thomas : >> kkoli...@apache.org wrote: >> >>> Author: kkolinko >>> Date: Fri Jan 25 22:34:57 2013 >>> New Revision: 1438747 >>> >>> URL: http://svn.apache.org/viewvc?rev=1438747&view=rev >>> Log: >>> Make the messages list synchronized as a whole, instead of just using a >>> volatile reference to it. >>> I am still observing random failures with TestWsWebSocketContainer, so >>> an issue is not here. >> >> So why make the change? >> > > Because of > http://svn.apache.org/viewvc?view=revision&revision=1437930 OK. The log message seemed to suggest the change was pointless. Hence my question. > If you just need to propagate the "messages" reference across threads, > then I think r1437930 should have been more simple: just marking the > field as "final". > If you are protecting access to inner structures of ArrayList class, I > think that marking the reference as volatile is not enough and that > using a synchronized list is more adequate. > > I think "volatile" modifier applies to accessing the filed itself, and > has no effect when you use the value returned by getMessages() or > store it in a local variable. > > Well, I do not see where a concurrency can come from here, so mere > "final" should be enough. The latch did count down (otherwise > assertTrue(latchResult) detected a failure) so either a message was > received or TesterEndpoint.onClose() or TesterEndpoint.onError() was > called. The latch should provide synchronization between threads. Having just read up on "happens-before" I do not believe the list needs to be synchronised. I believe the root cause of the problem I was trying to solve was fixed in r1437930 when I switched the order of adding the message to the list and counting down the latch. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439351 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Author: markt
Date: Mon Jan 28 11:32:26 2013
New Revision: 1439351
URL: http://svn.apache.org/viewvc?rev=1439351&view=rev
Log:
Same ends, different means.
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1439351&r1=1439350&r2=1439351&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Mon Jan 28 11:32:26 2013
@@ -19,9 +19,8 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
import java.net.URI;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -246,8 +245,7 @@ public class TestWsWebSocketContainer ex
private final CountDownLatch latch;
-private final List messages = Collections
-.synchronizedList(new ArrayList());
+private final List messages = new CopyOnWriteArrayList<>();
public TesterMessageHandler(CountDownLatch latch) {
this.latch = latch;
-
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.26
On 25.01.2013 17:01, jean-frederic clere wrote:
> Version 1.1.26 is bug fixing release.
> 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 48 hours.
>
> The Apache Tomcat Native 1.1.26 is
> [X] Stable, go ahead and release
> [ ] Broken because of ...
+1 to release
Detailed results ("-" indicates things which we could improve). Though
the list is long, it is again shorter than when I checked last time
(1.1.24). Overall I'm still +1 for stable, because I didn't find
regressions. But there is room for improvement.
+ Tested with Java 1.6.0_37 (but configured against Java 1.5.0_22),
APR 1.4.6 and OpenSSL 1.0.1c
+ Platforms Solaris 8+10 Sparc, SLES 10, 32 and 64 Bits,
SLES 11 64 Bits, RHEL 5+6 64 Bits
+ MD5 OK
+ signatures OK
+ key in KEYS file
- File 'bin/tcnative-1-src.pdb' missing in the binaries zips
- name of ocsp binary changed from
...ocsp-win32... to ...win32-ocsp...
(changed back to how it was before 1.1.24).
+ gz and zip for sources consistent
- Except for different permissions: zip seems to also contain group
write permissions. Not a real problem, but it's a bit strange
that perms differ between the archive (no regression).
+ source dist consistent with svn tag
- config-guess and config.sub should get an update this year
('2011-05-11' resp. '2011-03-23' instead of recent '2012-12-30'
resp. '2013-01-23'). They are copied from the APR source tree
when running buildconf.
+ recreated release with jnirelease script, results are
consistent with source dist, except for minor expected diffs in
CHANGELOG.txt, build-outputs.mk and generated docs
(whitespace and attribute ordering)
+ make succeeds and builds lib (no warnings)
- most unit tests contained in TC 7 headrun successful with
APR connector and this version of tcnative
Except:
- TestMaxConnections: failed on several platforms, but also for
non-apr connectors. Not reproducible
- TestStandardWrapper: Crash on Solaris 8 during shutdown
Stack see end of mail.
- ant part of build (no regressions, cited from 1.1.24 tests):
- 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? Users should not run tests as root.
- "ant run-ssl-server": Could't we include a test certificates in the
test folder? What should the test produce, if run successfully?
- "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.
- run-echo, run-ssl-server and run-local-server: I couldn't figure
out, what those were actually supposed to show (what is a positive
result vs. a negative one).
Last time sebb responded to the announcement mail:
- 8>< ---
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...
- 8>< ---
You might want to add such type of info to the announcement for 1.1.26.
Stack of crash during unit test on Solaris 8 (non-reproducible):
C [libapr-1.so.0+0x14d54] apr_allocator_destroy+0x10
C [libapr-1.so.0+0x15a7c] apr_pool_terminate+0x4c
j org.apache.tomcat.jni.Library.terminate()V+0
j org.apache.tomcat.jni.Library.terminate()V+0
v ~StubRoutines::call_stub
V [libjvm.so+0xe8ff8] void
JavaCalls::call_helper(JavaValue*,methodHandle*,JavaCallArguments*,Thread*)+0x218
V [libjvm.so+0x506c94]
oopDesc*Reflection::invoke(instanceKlassHandle,methodHandle,Handle,bool,objArrayHandle,BasicType,objArrayHandle,bool,Thread*)+0x13a8
V [libjvm.so+0x178048]
oopDesc*Reflection::invoke_method(oopDesc*,Handle,objArrayHandle,Thread*)+0x260
V [libjvm.so+0x177a9c] JVM_InvokeMethod+0x350
C [libjava.so+0x10d6c]
Java_sun_reflect_NativeMethodAccessorImpl_invoke0+0x18
j
sun.reflect.NativeMethodAccessorImpl.invoke0(Ljava/lang/reflect/Method;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;+0
j
sun.reflect.NativeMethodAccessorImpl.invoke0(Ljava/lang/reflect/Method;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;+0
j
sun.reflect.NativeMethodAccessorImpl.invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;+87
J
sun.reflect.DelegatingMethodAccessorImpl.invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
J
java.lang.reflect.Method.invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
j org.apache.catalina.core.AprLife
[Tomcat Wiki] Trivial Update of "LinnieNow" by LinnieNow
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "LinnieNow" page has been changed by LinnieNow: http://wiki.apache.org/tomcat/LinnieNow New page: I am 22 years old and my name is Bernardo Kowalski. I life in Gonten (Switzerland).<><><>My blog post [[http://www.oesterreich-online.info/index.php?go=valid&user=c82d264570c391f71cdb14eb647ea886|perfect keylogger]] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for Taglibs to be sent to the archive?
On 26/01/2013 21:51, Henri Yandell wrote: > On Fri, Jan 18, 2013 at 8:30 AM, Jeremy Boynes wrote: >> On Jan 18, 2013, at 1:34 AM, Konstantin Kolinko wrote: >>> Regarding the two taglibs that are not yet in the attic, I have no >>> interest in "RDC" taglib, but I am interested in JSTL one. >> >> +1 >> >>> >>> I think once we make the first release, things should go easier after that. >>> >>> A few notes after quick review of the sources: >>> >>> 1. Can we go up from Java 5 and require/use at least Java 6 to build >>> the project? >>> >>> I am even OK to be brave and go up to Java 7. >>> >>> I do not like Java 5, because >>> a) It is outdated. >>> It would be strange for a "new" project to use that if we are going >>> to support it for long. >>> b) It is not opensource. >>> OpenJDK is since Java 6. >>> >>> The version of Java is important for this class, that implements >>> javax.sql.DataSource: >>> >>> \standard\impl\src\main\java\org\apache\taglibs\standard\tag\common\sql\DataSourceWrapper.java >>> >>> Java 7 will allow us to support a later version of JDBC and will allow >>> this project to build on Gump. >> >> There is also an issue with the I18N tags taking a long time to start on a >> Java6 platform due to changes in the way Locales are located by the JRE. I >> remember some discussion on fixing this but a requirement to stay on Java 5 >> meant having to build two implementations and switch between them which I'd >> planned to do once a release was out. If we pre-req 6 or 7 then the >> implementation can just be updated and this issue closed easier. > > Would the TCK pass if it was on Java 7? We are talking about Taglibs 1.2 right? (If not adjust versions below accordingly). Taglibs 1.2 requires JSP 2.1. JSP 2.1 requires Java 5 or later (as does Servlet 2.5 and J2EE 5). Based on that, I would say that the TCK has to pass when running on Java 5. /me goes looking for some TCK docs I've just checked the latest version of the TCK documentation for JSTL 1.2 and while the TCK has been updated so it will run on Java 7, the reference runtime remains Java 5. My interpretation of that is that the TCK must pass when running with a Java 5 JRE. Mark - 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-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3846 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1439347 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
Re: Confusion around tcnative
On 01/28/2013 12:20 PM, Rainer Jung wrote: I'm a bit confused about tcnative and the various trunks and branches: 1) tcnative trunk vs. branch 1.1.x. It seems most updates are directly done to the branch. So trunk is outdated. On the other hand originally there were some updates to trunk not in 1.1.x. I think this should be cleaned up. The current trunk doesn't seem to be useful. Agreed. Trunk should be used for 1.2 and not backward compatible. I plan to add different polling mechanism using interrupts instead timeout polling (one of the reasons why split was made). This is now possible with APR_WAKEABLE pollsets. It would require rewriting Java part as well. Initial plan was to finish that for Tomcat8, but not sure how much time we still have before 8 gets released. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "LocalBadContent" by KonstantinKolinko
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "LocalBadContent" page has been changed by KonstantinKolinko: http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=69&rev2=70 nordenpark\.com novolinespielen\.org oa8000\.com\.cn + oesterreich-online\.info oro-compro\.com o-f\.com paisi\.com - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54060] DigestAuthenticator doesn't parse Authorization header correctly
https://issues.apache.org/bugzilla/show_bug.cgi?id=54060 Konstantin Kolinko changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- --- Comment #13 from Konstantin Kolinko --- REOPENing the issue to address Comment 12 -- 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: Confusion around tcnative
On 28.01.2013 13:33, Mladen Turk wrote: > On 01/28/2013 12:20 PM, Rainer Jung wrote: >> I'm a bit confused about tcnative and the various trunks and branches: >> >> 1) tcnative trunk vs. branch 1.1.x. >> >> It seems most updates are directly done to the branch. So trunk is >> outdated. On the other hand originally there were some updates to trunk >> not in 1.1.x. I think this should be cleaned up. The current trunk >> doesn't seem to be useful. >> > > Agreed. > Trunk should be used for 1.2 and not backward compatible. > I plan to add different polling mechanism using interrupts instead > timeout polling (one of the reasons why split was made). > This is now possible with APR_WAKEABLE pollsets. > It would require rewriting Java part as well. But how do we clean up trunk? Throw away and start from new? I think currently trunk misses things which are in the 1.1 branch, so building something on top of the current trunk will be troublesome. > Initial plan was to finish that for Tomcat8, but not sure how > much time we still have before 8 gets released. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1438747 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
2013/1/28 Mark Thomas : > On 26/01/2013 12:30, Konstantin Kolinko wrote: >> 2013/1/26 Mark Thomas : >>> kkoli...@apache.org wrote: >>> Author: kkolinko Date: Fri Jan 25 22:34:57 2013 New Revision: 1438747 URL: http://svn.apache.org/viewvc?rev=1438747&view=rev Log: Make the messages list synchronized as a whole, instead of just using a volatile reference to it. I am still observing random failures with TestWsWebSocketContainer, so an issue is not here. >>> >>> So why make the change? >>> >> >> Because of >> http://svn.apache.org/viewvc?view=revision&revision=1437930 > > OK. The log message seemed to suggest the change was pointless. Hence my > question. > >> If you just need to propagate the "messages" reference across threads, >> then I think r1437930 should have been more simple: just marking the >> field as "final". >> If you are protecting access to inner structures of ArrayList class, I >> think that marking the reference as volatile is not enough and that >> using a synchronized list is more adequate. >> >> I think "volatile" modifier applies to accessing the filed itself, and >> has no effect when you use the value returned by getMessages() or >> store it in a local variable. >> >> Well, I do not see where a concurrency can come from here, so mere >> "final" should be enough. The latch did count down (otherwise >> assertTrue(latchResult) detected a failure) so either a message was >> received or TesterEndpoint.onClose() or TesterEndpoint.onError() was >> called. The latch should provide synchronization between threads. > > Having just read up on "happens-before" I do not believe the list needs > to be synchronised. Agreed. I am OK with leaving it as is (as well as with CopyOnWriteArrayList from r1439351). It should not matter for this test case. > I believe the root cause of the problem I was trying > to solve was fixed in r1437930 when I switched the order of adding the > message to the list and counting down the latch. Agreed. It should be it. (For the record, you obviously meant r1438229 and the change in onMessage(..) in TestWsWebSocketContainer.java) BTW, the test still fails for BIO in the last two buildbot runs. (NIO was OK). Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1439334 - /tomcat/trunk/webapps/docs/windows-auth-howto.xml
2013/1/28 :
> Author: markt
> Date: Mon Jan 28 10:34:24 2013
> New Revision: 1439334
>
> URL: http://svn.apache.org/viewvc?rev=1439334&view=rev
> Log:
> Add Jespa
>
> Modified:
> tomcat/trunk/webapps/docs/windows-auth-howto.xml
>
> Modified: tomcat/trunk/webapps/docs/windows-auth-howto.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/windows-auth-howto.xml?rev=1439334&r1=1439333&r2=1439334&view=diff
> ==
> --- tomcat/trunk/webapps/docs/windows-auth-howto.xml (original)
> +++ tomcat/trunk/webapps/docs/windows-auth-howto.xml Mon Jan 28 10:34:24 2013
> @@ -51,8 +51,9 @@ sections.
>
>
>
> -This is a work in progress. There are a number of outstanding
> -questions that require further testing. These include:
> +This documentation is a work in progress. There are a number of
> +outstanding questions around the edge cases that require further
> +testing. These include:
>
>
> Does the domain name have to be in upper case?
> @@ -219,7 +220,8 @@ com.sun.security.jgss.krb5.accept {
>
>
>Full details of this solution can be found through the
> - http://waffle.codeplex.com/";>Waffle site. The key features
> are:
> + http://waffle.codeplex.com/";>Waffle web site. The key features
Maybe it would be better with a rel="nofollow" like elsewhere on
tomcat.apache.org.
This fix has not been merged to 7.0.x yet
> + are:
>
>Drop-in solution
>Simple configuration (no JAAS or Kerberos keytab configuration
> required)
> @@ -231,7 +233,7 @@ com.sun.security.jgss.krb5.accept {
>
>Full details of this solution can be found through the
> href="http://static.springsource.org/spring-security/site/extensions/krb/index.html";>
> - Kerberos extension site. The key features are:
> + Kerberos extension web site. The key features are:
>
>Extension to Spring Security
>Requires a Kerberos keytab file to be generated
> @@ -248,6 +250,16 @@ com.sun.security.jgss.krb5.accept {
>Pure Java solution
>
>
> +
> +
> + Full details of this solution can be found through the
> + http://www.ioplex.com/";>project web siteThe key
> + features are:
> +
> + Pure Java solution
> + Advanced Active Directory integration
> +
> +
>
>
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Confusion around tcnative
On 01/28/2013 01:45 PM, Rainer Jung wrote: On 28.01.2013 13:33, Mladen Turk wrote: On 01/28/2013 12:20 PM, Rainer Jung wrote: I'm a bit confused about tcnative and the various trunks and branches: 1) tcnative trunk vs. branch 1.1.x. It seems most updates are directly done to the branch. So trunk is outdated. On the other hand originally there were some updates to trunk not in 1.1.x. I think this should be cleaned up. The current trunk doesn't seem to be useful. Agreed. Trunk should be used for 1.2 and not backward compatible. I plan to add different polling mechanism using interrupts instead timeout polling (one of the reasons why split was made). This is now possible with APR_WAKEABLE pollsets. It would require rewriting Java part as well. But how do we clean up trunk? Throw away and start from new? Well, not sure how much stuff was added directly to trunk which is specific to trunk only. IMO Charles added few bits, but other then that it's just copying over from 1.1 branch. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1438747 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
On 28/01/2013 13:35, Konstantin Kolinko wrote: > 2013/1/28 Mark Thomas : >> On 26/01/2013 12:30, Konstantin Kolinko wrote: >>> 2013/1/26 Mark Thomas : kkoli...@apache.org wrote: > Author: kkolinko > Date: Fri Jan 25 22:34:57 2013 > New Revision: 1438747 > > URL: http://svn.apache.org/viewvc?rev=1438747&view=rev > Log: > Make the messages list synchronized as a whole, instead of just using a > volatile reference to it. > I am still observing random failures with TestWsWebSocketContainer, so > an issue is not here. So why make the change? >>> >>> Because of >>> http://svn.apache.org/viewvc?view=revision&revision=1437930 >> >> OK. The log message seemed to suggest the change was pointless. Hence my >> question. >> >>> If you just need to propagate the "messages" reference across threads, >>> then I think r1437930 should have been more simple: just marking the >>> field as "final". >>> If you are protecting access to inner structures of ArrayList class, I >>> think that marking the reference as volatile is not enough and that >>> using a synchronized list is more adequate. >>> >>> I think "volatile" modifier applies to accessing the filed itself, and >>> has no effect when you use the value returned by getMessages() or >>> store it in a local variable. >>> >>> Well, I do not see where a concurrency can come from here, so mere >>> "final" should be enough. The latch did count down (otherwise >>> assertTrue(latchResult) detected a failure) so either a message was >>> received or TesterEndpoint.onClose() or TesterEndpoint.onError() was >>> called. The latch should provide synchronization between threads. >> >> Having just read up on "happens-before" I do not believe the list needs >> to be synchronised. > > Agreed. > > I am OK with leaving it as is (as well as with CopyOnWriteArrayList > from r1439351). It should not matter for this test case. > >> I believe the root cause of the problem I was trying >> to solve was fixed in r1437930 when I switched the order of adding the >> message to the list and counting down the latch. > > Agreed. It should be it. > (For the record, you obviously meant r1438229 and the change in > onMessage(..) in TestWsWebSocketContainer.java) > > BTW, the test still fails for BIO in the last two buildbot runs. (NIO was OK). Yeah, something isn't quite right yet. I need to dig into this some more. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439434 - /tomcat/trunk/webapps/docs/windows-auth-howto.xml
Author: markt
Date: Mon Jan 28 14:57:07 2013
New Revision: 1439434
URL: http://svn.apache.org/viewvc?rev=1439434&view=rev
Log:
Add no-follow as suggested by kkolinko
Modified:
tomcat/trunk/webapps/docs/windows-auth-howto.xml
Modified: tomcat/trunk/webapps/docs/windows-auth-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/windows-auth-howto.xml?rev=1439434&r1=1439433&r2=1439434&view=diff
==
--- tomcat/trunk/webapps/docs/windows-auth-howto.xml (original)
+++ tomcat/trunk/webapps/docs/windows-auth-howto.xml Mon Jan 28 14:57:07 2013
@@ -220,8 +220,8 @@ com.sun.security.jgss.krb5.accept {
Full details of this solution can be found through the
- http://waffle.codeplex.com/";>Waffle web site. The key features
- are:
+ http://waffle.codeplex.com/"; rel="nofollow">Waffle web site.
The
+ key features are:
Drop-in solution
Simple configuration (no JAAS or Kerberos keytab configuration required)
@@ -232,8 +232,8 @@ com.sun.security.jgss.krb5.accept {
Full details of this solution can be found through the
- http://static.springsource.org/spring-security/site/extensions/krb/index.html";>
- Kerberos extension web site. The key features are:
+ http://static.springsource.org/spring-security/site/extensions/krb/index.html";
+ rel="nofollow"> Kerberos extension web site. The key features are:
Extension to Spring Security
Requires a Kerberos keytab file to be generated
@@ -243,8 +243,8 @@ com.sun.security.jgss.krb5.accept {
Full details of this solution can be found through the
- http://spnego.sourceforge.net/index.html/";>project site. The key
- features are:
+ http://spnego.sourceforge.net/index.html/"; rel="nofollow">project
+ site. The key features are:
Uses Kerberos
Pure Java solution
@@ -253,7 +253,7 @@ com.sun.security.jgss.krb5.accept {
Full details of this solution can be found through the
- http://www.ioplex.com/";>project web siteThe key
+ http://www.ioplex.com/"; rel="nofollow">project web siteThe key
features are:
Pure Java solution
@@ -282,12 +282,12 @@ com.sun.security.jgss.krb5.accept {
Apache httpd does not support Windows authentication out of the box but
there are a number of third-party modules that can be used. These
include:
- http://sourceforge.net/projects/mod-auth-sspi/";>mod_auth_sspi
- for use on Windows platforms.
- http://adldap.sourceforge.net/wiki/doku.php?id=mod_auth_ntlm_winbind";>
- mod_auth_ntlm_winbind for non-Windows platforms. Known to work with httpd
- 2.0.x on 32-bit platforms. Some users have reported stability issues with
both
- httpd 2.2.x builds and 64-bit Linux builds.
+ http://sourceforge.net/projects/mod-auth-sspi/";
+ rel="nofollow">mod_auth_sspi for use on Windows platforms.
+ http://adldap.sourceforge.net/wiki/doku.php?id=mod_auth_ntlm_winbind";
+ rel="nofollow">mod_auth_ntlm_winbind for non-Windows platforms. Known to
+ work with httpd 2.0.x on 32-bit platforms. Some users have reported stability
+ issues with both httpd 2.2.x builds and 64-bit Linux builds.
There are three steps to configuring httpd to provide Windows
authentication. They are:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439437 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/windows-auth-howto.xml
Author: markt
Date: Mon Jan 28 15:00:22 2013
New Revision: 1439437
URL: http://svn.apache.org/viewvc?rev=1439437&view=rev
Log:
Add Jespa
Use no-follow as suggested by kkolinko
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/windows-auth-howto.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1439334,1439434
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=1439437&r1=1439436&r2=1439437&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 28 15:00:22 2013
@@ -138,6 +138,11 @@
54461: Improve the documentation for the compiler attribute
in the Jasper how-to. (markt)
+
+Add Jespa to the list of third-party Windows authentication providers
+and make external links in the documentation for those providers
+no-follow. (markt)
+
Modified: tomcat/tc7.0.x/trunk/webapps/docs/windows-auth-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/windows-auth-howto.xml?rev=1439437&r1=1439436&r2=1439437&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/windows-auth-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/windows-auth-howto.xml Mon Jan 28
15:00:22 2013
@@ -51,8 +51,9 @@ sections.
-This is a work in progress. There are a number of outstanding
-questions that require further testing. These include:
+This documentation is a work in progress. There are a number of
+outstanding questions around the edge cases that require further
+testing. These include:
Does the domain name have to be in upper case?
@@ -219,7 +220,8 @@ com.sun.security.jgss.krb5.accept {
Full details of this solution can be found through the
- http://waffle.codeplex.com/";>Waffle site. The key features
are:
+ http://waffle.codeplex.com/"; rel="nofollow">Waffle web site.
The
+ key features are:
Drop-in solution
Simple configuration (no JAAS or Kerberos keytab configuration required)
@@ -230,8 +232,8 @@ com.sun.security.jgss.krb5.accept {
Full details of this solution can be found through the
- http://static.springsource.org/spring-security/site/extensions/krb/index.html";>
- Kerberos extension site. The key features are:
+ http://static.springsource.org/spring-security/site/extensions/krb/index.html";
+ rel="nofollow"> Kerberos extension web site. The key features are:
Extension to Spring Security
Requires a Kerberos keytab file to be generated
@@ -241,13 +243,23 @@ com.sun.security.jgss.krb5.accept {
Full details of this solution can be found through the
- http://spnego.sourceforge.net/index.html/";>project site. The key
- features are:
+ http://spnego.sourceforge.net/index.html/"; rel="nofollow">project
+ site. The key features are:
Uses Kerberos
Pure Java solution
+
+
+ Full details of this solution can be found through the
+ http://www.ioplex.com/"; rel="nofollow">project web siteThe key
+ features are:
+
+ Pure Java solution
+ Advanced Active Directory integration
+
+
@@ -270,12 +282,12 @@ com.sun.security.jgss.krb5.accept {
Apache httpd does not support Windows authentication out of the box but
there are a number of third-party modules that can be used. These
include:
- http://sourceforge.net/projects/mod-auth-sspi/";>mod_auth_sspi
- for use on Windows platforms.
- http://adldap.sourceforge.net/wiki/doku.php?id=mod_auth_ntlm_winbind";>
- mod_auth_ntlm_winbind for non-Windows platforms. Known to work with httpd
- 2.0.x on 32-bit platforms. Some users have reported stability issues with
both
- httpd 2.2.x builds and 64-bit Linux builds.
+ http://sourceforge.net/projects/mod-auth-sspi/";
+ rel="nofollow">mod_auth_sspi for use on Windows platforms.
+ http://adldap.sourceforge.net/wiki/doku.php?id=mod_auth_ntlm_winbind";
+ rel="nofollow">mod_auth_ntlm_winbind for non-Windows platforms. Known to
+ work with httpd 2.0.x on 32-bit platforms. Some users have reported stability
+ issues with both httpd 2.2.x builds and 64-bit Linux builds.
There are three steps to configuring httpd to provide Windows
authentication. They are:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439442 - /tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
Author: markt
Date: Mon Jan 28 15:07:53 2013
New Revision: 1439442
URL: http://svn.apache.org/viewvc?rev=1439442&view=rev
Log:
Follow-up to https://issues.apache.org/bugzilla/show_bug.cgi?id=54060
More buggy client implementations of DIGEST auth. This time it is the JDK
(Oracle 6.x, Oracle 7.x, OpenJDK 7.*)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1439442&r1=1439441&r2=1439442&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java Mon
Jan 28 15:07:53 2013
@@ -43,6 +43,7 @@ import java.util.Map;
*/
public class HttpParser {
+@SuppressWarnings("unused") // Unused due to buggy client implementations
private static final Integer FIELD_TYPE_TOKEN = Integer.valueOf(0);
private static final Integer FIELD_TYPE_QUOTED_STRING = Integer.valueOf(1);
private static final Integer FIELD_TYPE_TOKEN_OR_QUOTED_STRING =
Integer.valueOf(2);
@@ -63,7 +64,7 @@ public class HttpParser {
fieldTypes.put("nonce", FIELD_TYPE_QUOTED_STRING);
fieldTypes.put("digest-uri", FIELD_TYPE_QUOTED_STRING);
fieldTypes.put("response", FIELD_TYPE_QUOTED_LHEX);
-fieldTypes.put("algorithm", FIELD_TYPE_TOKEN);
+fieldTypes.put("algorithm", FIELD_TYPE_QUOTED_TOKEN);
fieldTypes.put("cnonce", FIELD_TYPE_QUOTED_STRING);
fieldTypes.put("opaque", FIELD_TYPE_QUOTED_STRING);
fieldTypes.put("qop", FIELD_TYPE_QUOTED_TOKEN);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439443 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/parser/HttpParser.java webapps/docs/changelog.xml
Author: markt
Date: Mon Jan 28 15:10:28 2013
New Revision: 1439443
URL: http://svn.apache.org/viewvc?rev=1439443&view=rev
Log:
Follow-up to https://issues.apache.org/bugzilla/show_bug.cgi?id=54060
More buggy client implementations of DIGEST auth. This time it is the JDK
(Oracle 6.x, Oracle 7.x, OpenJDK 7.*)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1439442
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1439443&r1=1439442&r2=1439443&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
Mon Jan 28 15:10:28 2013
@@ -43,6 +43,7 @@ import java.util.Map;
*/
public class HttpParser {
+@SuppressWarnings("unused") // Unused due to buggy client implementations
private static final Integer FIELD_TYPE_TOKEN = Integer.valueOf(0);
private static final Integer FIELD_TYPE_QUOTED_STRING = Integer.valueOf(1);
private static final Integer FIELD_TYPE_TOKEN_OR_QUOTED_STRING =
Integer.valueOf(2);
@@ -64,7 +65,7 @@ public class HttpParser {
fieldTypes.put("nonce", FIELD_TYPE_QUOTED_STRING);
fieldTypes.put("digest-uri", FIELD_TYPE_QUOTED_STRING);
fieldTypes.put("response", FIELD_TYPE_QUOTED_LHEX);
-fieldTypes.put("algorithm", FIELD_TYPE_TOKEN);
+fieldTypes.put("algorithm", FIELD_TYPE_QUOTED_TOKEN);
fieldTypes.put("cnonce", FIELD_TYPE_QUOTED_STRING);
fieldTypes.put("opaque", FIELD_TYPE_QUOTED_STRING);
fieldTypes.put("qop", FIELD_TYPE_QUOTED_TOKEN);
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=1439443&r1=1439442&r2=1439443&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 28 15:10:28 2013
@@ -57,6 +57,10 @@
+Make additional allowances for buggy client implementations of HTTP
+DIGEST authentication. This is a follow-on to 54060. (markt)
+
+
54438: Fix a regression in the fix for 52953 that
triggered a NPE when digested passwords were used and an authentication
attempt was made for a user that did not exist in the realm. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54060] DigestAuthenticator doesn't parse Authorization header correctly
https://issues.apache.org/bugzilla/show_bug.cgi?id=54060 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #14 from Mark Thomas --- Fixed in trunk and 7.0.x and will be included in 7.0.36 onwards. algorithm is now permitted to be a quoted token. Note no such definition exists in the specs. It is <"><"> as some clients insist on adding quotes to tokens. -- 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: r1439445 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
Author: markt
Date: Mon Jan 28 15:18:04 2013
New Revision: 1439445
URL: http://svn.apache.org/viewvc?rev=1439445&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54496
Don't use hard-coded class name in toString()
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1439445&r1=1439444&r2=1439445&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Mon
Jan 28 15:18:04 2013
@@ -513,7 +513,8 @@ public class MemberImpl implements Membe
*/
@Override
public String toString() {
-StringBuilder buf = new
StringBuilder("org.apache.catalina.tribes.membership.MemberImpl[");
+StringBuilder buf = new StringBuilder(getClass().getName());
+buf.append(getName()).append("[");
buf.append(getName()).append(",");
buf.append(getHostname()).append(",");
buf.append(port).append(", alive=");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 52318] Version in tomcat-jdbc POM is conflicted with Version in MANIFEST for JULI JAR
https://issues.apache.org/bugzilla/show_bug.cgi?id=52318 Martin Lichtin changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|LATER |--- --- Comment #18 from Martin Lichtin --- Just realize there is another problem when trying to use tomcat-jdbc under OSGi: Juli is not a bundle. So the version restriction in tomcat-jdbc's MANIFEST does not really make sense, as Juli does not export its packages with a version. -- 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: r1439447 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/tribes/membership/MemberImpl.java webapps/docs/changelog.xml
Author: markt
Date: Mon Jan 28 15:20:35 2013
New Revision: 1439447
URL: http://svn.apache.org/viewvc?rev=1439447&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54496
Don't use hard-coded class name in toString()
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1439445
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1439447&r1=1439446&r2=1439447&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
Mon Jan 28 15:20:35 2013
@@ -534,7 +534,8 @@ public class MemberImpl implements Membe
*/
@Override
public String toString() {
-StringBuilder buf = new
StringBuilder("org.apache.catalina.tribes.membership.MemberImpl[");
+StringBuilder buf = new StringBuilder(getClass().getName());
+buf.append(getName()).append("[");
buf.append(getName()).append(",");
buf.append(getHostname()).append(",");
buf.append(port).append(", alive=");
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=1439447&r1=1439446&r2=1439447&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 28 15:20:35 2013
@@ -149,6 +149,14 @@
+
+
+
+54496: Don't use a hard-coded class name in
+MemberImpl.toString(). (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54496] ..tribes.membership.MemberImpl.toString() might be better using .getClass().getName()
https://issues.apache.org/bugzilla/show_bug.cgi?id=54496 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report. This has been fixed in trunk and 7.0.x and will be included in 7.0.36 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 success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3848 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1439434 Blamelist: markt Build succeeded! sincerely, -The Buildbot
Re: Confusion around tcnative
Rainer, On 1/28/13 6:20 AM, Rainer Jung wrote: > I'm a bit confused about tcnative and the various trunks and branches: > > 1) tcnative trunk vs. branch 1.1.x. > > It seems most updates are directly done to the branch. So trunk is > outdated. On the other hand originally there were some updates to trunk > not in 1.1.x. I think this should be cleaned up. The current trunk > doesn't seem to be useful. I've tried to always commit to trunk and back-port to 1.1.x. I have had some irritation building trunk because it requires bleeding-edge versions of APR that I don't have available from Debian. It's a minor inconvenience, honestly. trunk 'configure' also does not properly support --with-java or --with-java-home like 1.1.x does. That would be helpful to fix... my configure-fu is not strong. > 2) tcnative and Java classes > > We still have Java classes in the tcnative branch. They neither match > with the copies maintained in the tc7 branch, nor with the ones in the > tc trunk branch. tcnative trunk does not have the Java files. +1 to removing the Java sources from tcnative in 1.1.x branch. We have had at least one recent report on the users' list where someone hand-compiled the Java sources and was then unable to use tcnative successfully (because the Java sources were out of date with respect to those in the main Tomcat sources). > Is there any use for the copies of the Java files in the tcnative 1.1.x > branch? Otherwise I think we should remov them and check them out from > TC7 or TC trunk when rolling a tcnative release. I'm not even sure that a tcnative release requires any .class or .jar files, as Tomcat itself contains everything necessary. I believe they are tightly-coupled enough with the rest of Tomcat that shipping a JAR file along with the tcnative library might break installations with mismatched Java code accompanying the native stuff. > Note that tcnative also contains test and examples Java classes, which > are *not* also in the TC branches. Those must be kept in tcnative (or > moved to TC). +1 to moving/adapting to Tomcat. -chris signature.asc Description: OpenPGP digital signature
svn commit: r1439667 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
Author: kkolinko
Date: Mon Jan 28 22:06:56 2013
New Revision: 1439667
URL: http://svn.apache.org/viewvc?rev=1439667&view=rev
Log:
Correct a glitch in r1439445.
Remove duplicate "append(getName())" that was copied from the next line.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1439667&r1=1439666&r2=1439667&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Mon
Jan 28 22:06:56 2013
@@ -514,7 +514,7 @@ public class MemberImpl implements Membe
@Override
public String toString() {
StringBuilder buf = new StringBuilder(getClass().getName());
-buf.append(getName()).append("[");
+buf.append("[");
buf.append(getName()).append(",");
buf.append(getHostname()).append(",");
buf.append(port).append(", alive=");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439669 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/tribes/membership/MemberImpl.java
Author: kkolinko
Date: Mon Jan 28 22:10:44 2013
New Revision: 1439669
URL: http://svn.apache.org/viewvc?rev=1439669&view=rev
Log:
Merged revision 1439667 from tomcat/trunk:
Correct the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=54496
Remove duplicate "append(getName())" that was copied from the next line.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1439667
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1439669&r1=1439668&r2=1439669&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
Mon Jan 28 22:10:44 2013
@@ -535,7 +535,7 @@ public class MemberImpl implements Membe
@Override
public String toString() {
StringBuilder buf = new StringBuilder(getClass().getName());
-buf.append(getName()).append("[");
+buf.append("[");
buf.append(getName()).append(",");
buf.append(getHostname()).append(",");
buf.append(port).append(", alive=");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439678 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
Author: markt
Date: Mon Jan 28 22:42:09 2013
New Revision: 1439678
URL: http://svn.apache.org/viewvc?rev=1439678&view=rev
Log:
Handle session close higher up the call stack
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1439678&r1=1439677&r2=1439678&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Mon Jan 28
22:42:09 2013
@@ -497,8 +497,7 @@ public abstract class WsFrameBase {
sm.getString("wsFrame.bufferToSmall",
Integer.valueOf(inputBuffer.length),
Long.valueOf(payloadLength)));
-wsSession.close(cr);
-throw new IOException(cr.getReasonPhrase());
+throw new WsIOException(cr);
}
makeRoom();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439679 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
Author: markt
Date: Mon Jan 28 22:42:48 2013
New Revision: 1439679
URL: http://svn.apache.org/viewvc?rev=1439679&view=rev
Log:
Look to see if a CloseReason is available before generating one.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java?rev=1439679&r1=1439678&r2=1439679&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java Mon Jan 28
22:42:48 2013
@@ -68,8 +68,14 @@ public class WsFrameClient extends WsFra
private final void close(Throwable t) {
-CloseReason cr = new CloseReason(
+CloseReason cr;
+if (t instanceof WsIOException) {
+cr = ((WsIOException) t).getCloseReason();
+} else {
+cr = new CloseReason(
CloseCodes.CLOSED_ABNORMALLY, t.getMessage());
+}
+
try {
wsSession.close(cr);
} catch (IOException ignore) {
-
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/1044 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] 1439669 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3851 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1439679 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1439757 - /tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Author: kfujino
Date: Tue Jan 29 07:04:52 2013
New Revision: 1439757
URL: http://svn.apache.org/viewvc?rev=1439757&view=rev
Log:
Prevent the SSO deregister when web application is stopped or reloaded.
When StandardManager(pathname="") or DeltaManager stops normally, all sessions
in the context are expired.
In this case, because most sessions is not time-out, SSO deregister was
triggered.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1439757&r1=1439756&r2=1439757&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Tue
Jan 29 07:04:52 2013
@@ -224,7 +224,8 @@ public class SingleSignOn extends ValveB
if (((session.getMaxInactiveInterval() > 0)
&& (System.currentTimeMillis() -
session.getThisAccessedTimeInternal() >=
session.getMaxInactiveInterval() * 1000))
-|| (Session.SESSION_PASSIVATED_EVENT.equals(event.getType( {
+|| (Session.SESSION_PASSIVATED_EVENT.equals(event.getType()))
+|| (!session.getManager().getContext().getState().isAvailable())) {
removeSession(ssoId, session);
} else {
// The session was logged out.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439758 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/authenticator/SingleSignOn.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Jan 29 07:08:16 2013
New Revision: 1439758
URL: http://svn.apache.org/viewvc?rev=1439758&view=rev
Log:
Prevent the SSO deregister when web application is stopped or reloaded.
When StandardManager(pathname="") or DeltaManager stops normally, all sessions
in the context are expired.
In this case, because most sessions is not time-out, SSO deregister was
triggered.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1439758&r1=1439757&r2=1439758&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Tue Jan 29 07:08:16 2013
@@ -238,7 +238,8 @@ public class SingleSignOn extends ValveB
if (((session.getMaxInactiveInterval() > 0)
&& (System.currentTimeMillis() -
session.getThisAccessedTimeInternal() >=
session.getMaxInactiveInterval() * 1000))
-|| (Session.SESSION_PASSIVATED_EVENT.equals(event.getType( {
+|| (Session.SESSION_PASSIVATED_EVENT.equals(event.getType()))
+||
(!session.getManager().getContainer().getState().isAvailable())) {
removeSession(ssoId, session);
} else {
// The session was logged out.
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=1439758&r1=1439757&r2=1439758&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jan 29 07:08:16 2013
@@ -83,6 +83,13 @@
54483: Correct one of the Spanish translations. Based on a
suggestion from adinamita. (markt)
+
+Prevent the SSO deregister when web application is stopped or reloaded.
+When StandardManager(pathname="") or DeltaManager stops normally, all
+sessions in the context are expired.
+In this case, because most sessions is not time-out, SSO deregister was
+triggered. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
