Re: svn commit: r612319 - /tomcat/current/tc5.5.x/STATUS.txt
Hi Filip and Mark, you can found the patch at: http://people.apache.org/~markt/patches/2008-01-15-tc5-lib-updates.patch Peter Am 16.01.2008 um 03:44 schrieb Filip Hanik - Dev Lists: I get a 404 on the URL Filip [EMAIL PROTECTED] wrote: Author: markt Date: Tue Jan 15 16:03:57 2008 New Revision: 612319 URL: http://svn.apache.org/viewvc?rev=612319view=rev Log: Propose a library update for TC5 Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/ STATUS.txt?rev=612319r1=612318r2=612319view=diff = = --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Jan 15 16:03:57 2008 @@ -54,3 +54,8 @@ +1: funkman, pero, markt -1: +* Update to latest versions of all libraries (assumes HttpClient patch) + Update Eclipse classpaths to new versions + http://people.apache.org/~markt/patches/2008-01-15-tc5-lib- update.patch + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612455 - /tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
Author: pero
Date: Wed Jan 16 05:47:40 2008
New Revision: 612455
URL: http://svn.apache.org/viewvc?rev=612455view=rev
Log:
Set correct sessionCounter after reload sessions!
Fix two indent lines.
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=612455r1=612454r2=612455view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Wed Jan
16 05:47:40 2008
@@ -395,9 +395,10 @@
session.setManager(this);
sessions.put(session.getIdInternal(), session);
session.activate();
+sessionCounter++;
}
} catch (ClassNotFoundException e) {
- log.error(sm.getString(standardManager.loading.cnfe, e), e);
+log.error(sm.getString(standardManager.loading.cnfe, e), e);
if (ois != null) {
try {
ois.close();
@@ -408,7 +409,7 @@
}
throw e;
} catch (IOException e) {
- log.error(sm.getString(standardManager.loading.ioe, e), e);
+log.error(sm.getString(standardManager.loading.ioe, e), e);
if (ois != null) {
try {
ois.close();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612457 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Wed Jan 16 05:52:49 2008 New Revision: 612457 URL: http://svn.apache.org/viewvc?rev=612457view=rev Log: Propose Correct StandardManager.sessionCounter after reload! 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=612457r1=612456r2=612457view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 05:52:49 2008 @@ -81,3 +81,8 @@ http://svn.apache.org/viewvc?view=revrevision=612192 +1: fhanik -1: + + Set correct sessionCounter at StandardManager after reload sessions + http://svn.apache.org/viewvc?view=revrevision=612455 + +1: pero + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612460 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Wed Jan 16 05:57:29 2008 New Revision: 612460 URL: http://svn.apache.org/viewvc?rev=612460view=rev Log: Cast my vote 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=612460r1=612459r2=612460view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 05:57:29 2008 @@ -33,7 +33,7 @@ CometProcessor should implement the Servlet interface, since it is defined in web.xml http://people.apache.org/~fhanik/patches/comet-interface.patch - +1: fhanik, markt + +1: fhanik, markt, pero -1: Fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=7 regression @@ -42,19 +42,19 @@ This fix also corrects the CRLF parsing, previously both CRCRLF and just LF would have been valid as well, but they are not http://people.apache.org/~fhanik/patches/fix-bz7-alt-1.patch - +1: fhanik, markt + +1: fhanik, markt, pero -1: Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43692 Clean up build files. Patch by Paul Shemansky http://svn.apache.org/viewvc?rev=610157view=rev - +1: markt + +1: markt, pero -1: Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43344 Fix typo in if.jsp example http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp?r1=610946r2=610945pathrev=610946 - +1: markt, fhanik + +1: markt, fhanik, pero -1: Fix Windows installer issue that was including files when it should not @@ -64,17 +64,17 @@ Update libs. commons-logging-1.1.1, nsis 2.34 http://svn.apache.org/viewvc?rev=611635view=rev - +1: markt + +1: markt, pero -1: - Update the Eclipse calsspath (needs libs update above) + Update the Eclipse classpath (needs libs update above) http://svn.apache.org/viewvc?rev=611637view=rev - +1: markt + +1: markt, pero -1: Update release notes with available libraries http://svn.apache.org/viewvc?rev=611940view=rev - +1: markt + +1: markt, pero -1: Add global flag to turn off reverse DNS lookups, performance improvement for tribes - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612461 - /tomcat/trunk/webapps/docs/changelog.xml
Author: pero Date: Wed Jan 16 06:01:14 2008 New Revision: 612461 URL: http://svn.apache.org/viewvc?rev=612461view=rev Log: Propose Correct StandardManager.sessionCounter after reload! Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=612461r1=612460r2=612461view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Jan 16 06:01:14 2008 @@ -46,6 +46,9 @@ /subsection subsection name=Catalina changelog + fix +Set correct StandardManager.sessionCounter after reload/restart. (pero) + /fix updateAdd -Dorg.apache.catalina.tribes.dns_lookups=false as default. The ability to turn off reverse DNS lookups for membership.(fhanik)/update updateGuess java location from the PATH environment and improve fix for 37284/update updateAdd NIO connector to server.xml parsing warning, remove Connector as exception case/update - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612462 - /tomcat/current/tc5.5.x/STATUS.txt
Author: pero Date: Wed Jan 16 06:02:19 2008 New Revision: 612462 URL: http://svn.apache.org/viewvc?rev=612462view=rev Log: Cast my Vote Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=612462r1=612461r2=612462view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Jan 16 06:02:19 2008 @@ -57,5 +57,5 @@ * Update to latest versions of all libraries (assumes HttpClient patch) Update Eclipse classpaths to new versions http://people.apache.org/~markt/patches/2008-01-15-tc5-lib-update.patch - +1: markt + +1: markt, pero -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612463 - /tomcat/current/tc5.5.x/STATUS.txt
Author: pero Date: Wed Jan 16 06:05:25 2008 New Revision: 612463 URL: http://svn.apache.org/viewvc?rev=612463view=rev Log: Propose: Set correct StandardManager sessionCounter after reload Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=612463r1=612462r2=612463view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Jan 16 06:05:25 2008 @@ -59,3 +59,9 @@ http://people.apache.org/~markt/patches/2008-01-15-tc5-lib-update.patch +1: markt, pero -1: + +* Backport from Tc6 trunk: Set correct sessionCounter at StandardManager after reload sessions + http://svn.apache.org/viewvc?view=revrevision=612455 + +1: pero + -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612529 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/CometProcessor.java java/org/apache/coyote/http11/filters/ChunkedInputFilter.java webapps/docs/changelog.xml
Author: fhanik
Date: Wed Jan 16 09:47:51 2008
New Revision: 612529
URL: http://svn.apache.org/viewvc?rev=612529view=rev
Log:
Update with more fixes
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612529r1=612528r2=612529view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 09:47:51 2008
@@ -31,20 +31,6 @@
+1: jfclere
-1: fhanik - Can we add the 'package' directive to make the package match
the dir structure
- CometProcessor should implement the Servlet interface, since it is defined
in web.xml
- http://people.apache.org/~fhanik/patches/comet-interface.patch
- +1: fhanik, markt, pero
- -1:
-
- Fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=7 regression
- The ratio of when needCRLFParse=true vs direct parseCRLF is low:high, meaning
- The original fix for Comet not needing to block will be 95% satisfied
- This fix also corrects the CRLF parsing, previously both CRCRLF and just LF
- would have been valid as well, but they are not
- http://people.apache.org/~fhanik/patches/fix-bz7-alt-1.patch
- +1: fhanik, markt, pero
- -1:
-
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43692
Clean up build files. Patch by Paul Shemansky
http://svn.apache.org/viewvc?rev=610157view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometProcessor.java?rev=612529r1=612528r2=612529view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometProcessor.java Wed Jan
16 09:47:51 2008
@@ -21,6 +21,7 @@
import java.io.IOException;
import javax.servlet.ServletException;
+import javax.servlet.Servlet;
/**
* This interface should be implemented by servlets which would like to handle
@@ -29,7 +30,7 @@
* Note: When this interface is implemented, the service method of the servlet
will
* never be called, and will be replaced with a begin event.
*/
-public interface CometProcessor {
+public interface CometProcessor extends Servlet{
/**
* Process the given Comet event.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=612529r1=612528r2=612529view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Wed Jan 16 09:47:51 2008
@@ -154,7 +154,14 @@
chunk.setBytes(buf, pos, remaining);
pos = pos + remaining;
remaining = 0;
-parseCRLF(); //a chunk should end with CRLF
+//we need a CRLF
+if ((pos+1) = lastValid) {
+//if we call parseCRLF we overrun the buffer here
+//so we defer it to the next call BZ 7
+needCRLFParse = true;
+} else {
+parseCRLF(); //parse the CRLF immediately
+}
}
return result;
@@ -311,6 +318,7 @@
throws IOException {
boolean eol = false;
+boolean crfound = false;
while (!eol) {
@@ -320,7 +328,10 @@
}
if (buf[pos] == Constants.CR) {
+if (crfound) throw new IOException(Invalid CRLF, two CR
characters encountered.);
+crfound = true;
} else if (buf[pos] == Constants.LF) {
+if (!crfound) throw new IOException(Invalid CRLF, no CR
character encountered.);
eol = true;
} else {
throw new IOException(Invalid CRLF);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=612529r1=612528r2=612529view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 16 09:47:51 2008
@@ -35,6 +35,16 @@
section name=Tomcat 6.0.16 (remm)
subsection name=General
changelog
+ update
+Change chunked input parsing, always parse CRLF directly after a chunk
svn commit: r612530 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: fhanik Date: Wed Jan 16 09:51:01 2008 New Revision: 612530 URL: http://svn.apache.org/viewvc?rev=612530view=rev Log: votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612530r1=612529r2=612530view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 09:51:01 2008 @@ -34,7 +34,7 @@ Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43692 Clean up build files. Patch by Paul Shemansky http://svn.apache.org/viewvc?rev=610157view=rev - +1: markt, pero + +1: markt, pero, fhanik -1: Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43344 @@ -45,22 +45,22 @@ Fix Windows installer issue that was including files when it should not http://svn.apache.org/viewvc?rev=611660view=rev - +1: markt + +1: markt, fhanik -1: Update libs. commons-logging-1.1.1, nsis 2.34 http://svn.apache.org/viewvc?rev=611635view=rev - +1: markt, pero + +1: markt, pero, fhanik -1: Update the Eclipse classpath (needs libs update above) http://svn.apache.org/viewvc?rev=611637view=rev - +1: markt, pero + +1: markt, pero, fhanik -1: Update release notes with available libraries http://svn.apache.org/viewvc?rev=611940view=rev - +1: markt, pero + +1: markt, pero, fhanik -1: Add global flag to turn off reverse DNS lookups, performance improvement for tribes @@ -70,5 +70,5 @@ Set correct sessionCounter at StandardManager after reload sessions http://svn.apache.org/viewvc?view=revrevision=612455 - +1: pero + +1: pero, fhanik -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612539 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
Author: rjung Date: Wed Jan 16 10:47:02 2008 New Revision: 612539 URL: http://svn.apache.org/viewvc?rev=612539view=rev Log: Minor fix for r611696. Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=612539r1=612538r2=612539view=diff == --- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Wed Jan 16 10:47:02 2008 @@ -642,7 +642,7 @@ if (conf-options JK_OPT_FLUSHEADER) s-flush_header = 1; -reply_timeout = apr_table_get(r-subprocess_env, JK_REPLY_TIMEOUT); +reply_timeout = ap_table_get(r-subprocess_env, JK_REPLY_TIMEOUT); if (reply_timeout) s-reply_timeout = atoi(reply_timeout); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43968] - [patch] support ipv6 with mod_jk
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=43968. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=43968 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612562 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Author: rjung
Date: Wed Jan 16 12:22:20 2008
New Revision: 612562
URL: http://svn.apache.org/viewvc?rev=612562view=rev
Log:
Pass service struct through to the find methods in lb.
We'll need info int those struct for decisions soon.
Let the find methods return the index of the member instead
of the member itself. We'll also need the index soon.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?rev=612562r1=612561r2=612562view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Wed Jan 16 12:22:20
2008
@@ -647,49 +647,53 @@
return JK_TRUE;
}
-static lb_sub_worker_t *find_by_session(lb_worker_t *p,
-const char *name,
-jk_logger_t *l)
+static int find_by_session(jk_ws_service_t *s,
+ lb_worker_t *p,
+ const char *name,
+ jk_logger_t *l)
{
-lb_sub_worker_t *rc = NULL;
+int rc = -1;
unsigned int i;
for (i = 0; i p-num_of_workers; i++) {
if (strcmp(p-lb_workers[i].route, name) == 0) {
-rc = p-lb_workers[i];
+rc = i;
break;
}
}
return rc;
}
-static lb_sub_worker_t *find_best_bydomain(lb_worker_t *p,
- const char *domain,
- jk_logger_t *l)
+static int find_best_bydomain(jk_ws_service_t *s,
+ lb_worker_t *p,
+ const char *domain,
+ jk_logger_t *l)
{
unsigned int i;
int d = 0;
jk_uint64_t curmin = 0;
-lb_sub_worker_t *candidate = NULL;
+int candidate = -1;
+lb_sub_worker_t wr;
/* First try to see if we have available candidate */
for (i = 0; i p-num_of_workers; i++) {
/* Skip all workers that are not member of domain */
-if (strlen(p-lb_workers[i].domain) == 0 ||
-strcmp(p-lb_workers[i].domain, domain))
+wr = p-lb_workers[i];
+if (strlen(wr.domain) == 0 ||
+strcmp(wr.domain, domain))
continue;
/* Take into calculation only the workers that are
* not in error state, stopped, disabled or busy.
*/
-if (JK_WORKER_USABLE(p-lb_workers[i])) {
-if (!candidate || p-lb_workers[i].distance d ||
-(p-lb_workers[i].s-lb_value curmin
-p-lb_workers[i].distance == d)) {
-candidate = p-lb_workers[i];
-curmin = p-lb_workers[i].s-lb_value;
-d = p-lb_workers[i].distance;
+if (JK_WORKER_USABLE(wr)) {
+if (!candidate || wr.distance d ||
+(wr.s-lb_value curmin
+wr.distance == d)) {
+candidate = i;
+curmin = wr.s-lb_value;
+d = wr.distance;
}
}
}
@@ -698,8 +702,9 @@
}
-static lb_sub_worker_t *find_best_byvalue(lb_worker_t *p,
- jk_logger_t *l)
+static int find_best_byvalue(jk_ws_service_t *s,
+ lb_worker_t *p,
+ jk_logger_t *l)
{
unsigned int i;
unsigned int j;
@@ -708,24 +713,26 @@
jk_uint64_t curmin = 0;
/* find the least busy worker */
-lb_sub_worker_t *candidate = NULL;
+int candidate = -1;
+lb_sub_worker_t wr;
offset = p-next_offset;
/* First try to see if we have available candidate */
for (j = offset; j p-num_of_workers + offset; j++) {
i = j % p-num_of_workers;
+wr = p-lb_workers[i];
/* Take into calculation only the workers that are
* not in error state, stopped, disabled or busy.
*/
-if (JK_WORKER_USABLE(p-lb_workers[i])) {
-if (!candidate || p-lb_workers[i].distance d ||
-(p-lb_workers[i].s-lb_value curmin
-p-lb_workers[i].distance == d)) {
-candidate = p-lb_workers[i];
-curmin = p-lb_workers[i].s-lb_value;
-d = p-lb_workers[i].distance;
+if (JK_WORKER_USABLE(wr)) {
+if (candidate 0 || wr.distance d ||
+(wr.s-lb_value curmin
+wr.distance == d)) {
+candidate = i;
+curmin = wr.s-lb_value;
+d = wr.distance;
p-next_offset = i + 1;
}
}
@@ -733,22 +740,24 @@
return candidate;
}
-static lb_sub_worker_t *find_bysession_route(lb_worker_t *p,
-
svn commit: r612564 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Author: rjung
Date: Wed Jan 16 12:35:33 2008
New Revision: 612564
URL: http://svn.apache.org/viewvc?rev=612564view=rev
Log:
Now since we have the service struct in all find
methods, we don't need route_is_domain any more.
Let's set the service struct directly.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?rev=612564r1=612563r2=612564view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Wed Jan 16 12:35:33
2008
@@ -743,7 +743,6 @@
static int find_bysession_route(jk_ws_service_t *s,
lb_worker_t *p,
const char *name,
-int *route_is_domain,
jk_logger_t *l)
{
int uses_domain = 0;
@@ -753,10 +752,11 @@
if (candidate 0) {
uses_domain = 1;
candidate = find_best_bydomain(s, p, name, l);
-*route_is_domain = JK_TRUE;
}
if (candidate = 0) {
lb_sub_worker_t wr = p-lb_workers[candidate];
+if (uses_domain)
+s-route = wr.domain;
if (!JK_WORKER_USABLE_STICKY(wr)) {
/* We have a worker that is error state or stopped.
* If it has a redirection set use that redirection worker.
@@ -768,11 +768,11 @@
candidate = -1;
else if (*wr.redirect) {
candidate = find_by_session(s, p, wr.redirect, l);
-*route_is_domain = JK_FALSE;
+s-route = NULL;
}
else if (*wr.domain !uses_domain) {
candidate = find_best_bydomain(s, p, wr.domain, l);
-*route_is_domain = JK_TRUE;
+s-route = wr.domain;
}
if (candidate = 0) {
wr = p-lb_workers[candidate];
@@ -786,7 +786,6 @@
static int find_failover_worker(jk_ws_service_t *s,
lb_worker_t * p,
-int *route_is_domain,
jk_logger_t *l)
{
int rc = -1;
@@ -800,13 +799,12 @@
}
}
if (redirect)
-rc = find_bysession_route(s, p, redirect, route_is_domain, l);
+rc = find_bysession_route(s, p, redirect, l);
return rc;
}
static int find_best_worker(jk_ws_service_t *s,
lb_worker_t * p,
-int *route_is_domain,
jk_logger_t *l)
{
int rc = -1;
@@ -814,14 +812,13 @@
rc = find_best_byvalue(s, p, l);
/* By default use worker route as session route */
if (rc 0)
-rc = find_failover_worker(s, p, route_is_domain, l);
+rc = find_failover_worker(s, p, l);
return rc;
}
static lb_sub_worker_t *get_most_suitable_worker(jk_ws_service_t *s,
lb_worker_t * p,
char *sessionid,
- int *route_is_domain,
jk_logger_t *l)
{
int rc = -1;
@@ -874,7 +871,7 @@
session_route);
/* We have a session route. Whow! */
-rc = find_bysession_route(s, p, session_route,
route_is_domain, l);
+rc = find_bysession_route(s, p, session_route, l);
if (rc = 0) {
lb_sub_worker_t *wr = (p-lb_workers[rc]);
if (p-lblock == JK_LB_LOCK_PESSIMISTIC)
@@ -907,7 +904,7 @@
return NULL;
}
}
-rc = find_best_worker(s, p, route_is_domain, l);
+rc = find_best_worker(s, p, l);
if (p-lblock == JK_LB_LOCK_PESSIMISTIC)
jk_shm_unlock();
else {
@@ -1034,9 +1031,8 @@
p-worker-sticky_session, sessionid ? sessionid : empty);
while (attempt = num_of_workers recoverable == JK_TRUE) {
-int route_is_domain = JK_FALSE;
lb_sub_worker_t *rec =
-get_most_suitable_worker(s, p-worker, sessionid,
route_is_domain, l);
+get_most_suitable_worker(s, p-worker, sessionid, l);
rc = JK_FALSE;
*is_error = JK_HTTP_SERVER_BUSY;
/* Do not reuse previous worker, because
@@ -1049,10 +1045,9 @@
jk_endpoint_t *end = NULL;
int retry = 0;
int retry_wait = JK_LB_MIN_RETRY_WAIT;
-if (route_is_domain == JK_FALSE)
+
+if (!s-route)
s-route = rec-route;
-else
-s-route = rec-domain;
prec = rec;
if (JK_IS_DEBUG_LEVEL(l))
svn commit: r612573 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Wed Jan 16 13:34:40 2008 New Revision: 612573 URL: http://svn.apache.org/viewvc?rev=612573view=rev Log: Fix url. Sorry for noise. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=612573r1=612572r2=612573view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Jan 16 13:34:40 2008 @@ -56,7 +56,7 @@ * Update to latest versions of all libraries (assumes HttpClient patch) Update Eclipse classpaths to new versions - http://people.apache.org/~markt/patches/2008-01-15-tc5-lib-update.patch + http://people.apache.org/~markt/patches/2008-01-15-tc5-lib-updates.patch +1: markt, pero -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612588 - /tomcat/trunk/RELEASE-NOTES
Author: markt Date: Wed Jan 16 14:12:50 2008 New Revision: 612588 URL: http://svn.apache.org/viewvc?rev=612588view=rev Log: Fix odd statement. Modified: tomcat/trunk/RELEASE-NOTES Modified: tomcat/trunk/RELEASE-NOTES URL: http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=612588r1=612587r2=612588view=diff == --- tomcat/trunk/RELEASE-NOTES (original) +++ tomcat/trunk/RELEASE-NOTES Wed Jan 16 14:12:50 2008 @@ -42,8 +42,7 @@ === Dependency Changes: === -Tomcat 6.0 is designed to run on JSE 5.0 and later, and requires -configuration to run on JSE 5.0. +Tomcat 6.0 is designed to run on JSE 5.0 and later. In addition, Tomcat 6.0 uses the Eclipse JDT Java compiler for compiling JSP pages. This means you no longer need to have the complete - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612595 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 16 14:24:43 2008 New Revision: 612595 URL: http://svn.apache.org/viewvc?rev=612595view=rev Log: Propose wording tweak. 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=612595r1=612594r2=612595view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 14:24:43 2008 @@ -72,3 +72,8 @@ http://svn.apache.org/viewvc?view=revrevision=612455 +1: pero, fhanik -1: + + Improve release note wording on Java version + http://svn.apache.org/viewvc?rev=612588view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Tagging 5.5.26
just a reminder Filip Filip Hanik - Dev Lists wrote: Hey all, I'm planning on tagging 5.5.26 on Monday Jan 21st, roughly around noon MST. This should give us plenty of time to clear out status and test everything before doing the release. I'll assume lazy consensus unless anyone objects to the release or we find show stoppers Filip - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: new year, new version? 6.0.16
could we get a target date for this? I believe there is enough community interest to push out a new release Filip Filip Hanik - Dev Lists wrote: we have a lot of updates added in, I think it may be good to set a date for our next release and work towards that Filip - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612599 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.xml dist.xml extras.xml java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCo
Author: markt
Date: Wed Jan 16 14:37:36 2008
New Revision: 612599
URL: http://svn.apache.org/viewvc?rev=612599view=rev
Log:
Fix bug 43692. Clean up unused references. Patch provided by Paul Shemansky.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612599r1=612598r2=612599view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 14:37:36 2008
@@ -31,12 +31,6 @@
+1: jfclere
-1: fhanik - Can we add the 'package' directive to make the package match
the dir structure
- Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43692
- Clean up build files. Patch by Paul Shemansky
- http://svn.apache.org/viewvc?rev=610157view=rev
- +1: markt, pero, fhanik
- -1:
-
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43344
Fix typo in if.jsp example
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp?r1=610946r2=610945pathrev=610946
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=612599r1=612598r2=612599view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Jan 16 14:37:36 2008
@@ -63,7 +63,6 @@
property name=catalina-tribes.jar
value=${tomcat.build}/lib/catalina-tribes.jar/
property name=catalina-ha.jar
value=${tomcat.build}/lib/catalina-ha.jar/
property name=catalina-ant.jar
value=${tomcat.build}/lib/catalina-ant.jar/
- property name=catalina-ant-jmx.jar
value=${tomcat.build}/lib/catalina-ant-jmx.jar/
property name=tomcat-coyote.jar
value=${tomcat.build}/lib/tomcat-coyote.jar/
property name=jasper.jar value=${tomcat.build}/lib/jasper.jar/
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=612599r1=612598r2=612599view=diff
==
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Jan 16 14:37:36 2008
@@ -66,7 +66,6 @@
property name=el-api.jar value=${tomcat.build}/lib/el-api.jar/
property name=catalina.jar value=${tomcat.build}/lib/catalina.jar/
property name=catalina-ant.jar
value=${tomcat.build}/lib/catalina-ant.jar/
- property name=catalina-ant-jmx.jar
value=${tomcat.build}/lib/catalina-ant-jmx.jar/
property name=tomcat-coyote.jar
value=${tomcat.build}/lib/tomcat-coyote.jar/
property name=jasper.jar value=${tomcat.build}/lib/jasper.jar/
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=612599r1=612598r2=612599view=diff
==
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Jan 16 14:37:36 2008
@@ -63,7 +63,6 @@
property name=el-api.jar value=${tomcat.build}/lib/el-api.jar/
property name=catalina.jar value=${tomcat.build}/lib/catalina.jar/
property name=catalina-ant.jar
value=${tomcat.build}/lib/catalina-ant.jar/
- property name=catalina-ant-jmx.jar
value=${tomcat.build}/lib/catalina-ant-jmx.jar/
property name=tomcat-coyote.jar
value=${tomcat.build}/lib/tomcat-coyote.jar/
property name=jasper.jar value=${tomcat.build}/lib/jasper.jar/
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java?rev=612599r1=612598r2=612599view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
Wed Jan 16 14:37:36 2008
@@ -34,7 +34,6 @@
* lt;path id=catalina_ant
* lt;fileset dir=${catalina.home}/server/lib
* lt;include name=catalina-ant.jar/
- * lt;include name=catalina-ant-jmx.jar/
* lt;/fileset
* lt;/path
*
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java?rev=612599r1=612598r2=612599view=diff
==
DO NOT REPLY [Bug 43692] - Catalina Ant JMX is currently unused, and seems unnecessary.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=43692. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=43692 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2008-01-16 14:37 --- This has been fixed in svn and will be included in 6.0.16 onwards. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612600 - in /tomcat/tc6.0.x/trunk: STATUS.txt webapps/docs/changelog.xml webapps/examples/jsp/tagplugin/if.jsp
Author: markt Date: Wed Jan 16 14:40:16 2008 New Revision: 612600 URL: http://svn.apache.org/viewvc?rev=612600view=rev Log: Fix bug 43344. Typo in if.jsp example. Patch provided by Tim Nowaczyk. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/examples/jsp/tagplugin/if.jsp Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612600r1=612599r2=612600view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 14:40:16 2008 @@ -31,12 +31,6 @@ +1: jfclere -1: fhanik - Can we add the 'package' directive to make the package match the dir structure - Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43344 - Fix typo in if.jsp example - http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp?r1=610946r2=610945pathrev=610946 - +1: markt, fhanik, pero - -1: - Fix Windows installer issue that was including files when it should not http://svn.apache.org/viewvc?rev=611660view=rev +1: markt, fhanik Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=612600r1=612599r2=612600view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 16 14:40:16 2008 @@ -206,6 +206,10 @@ subsection name=Webapps changelog fix +bug43344/bug: Fix typo in if.jsp example. Patch provided by Tim +Nowaczyk. (markt) + /fix + fix bug43611/bug: Provide an error message if user tries to upload a war for a context defined in server.xml rather than failing silently. (markt/jim) Modified: tomcat/tc6.0.x/trunk/webapps/examples/jsp/tagplugin/if.jsp URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/jsp/tagplugin/if.jsp?rev=612600r1=612599r2=612600view=diff == --- tomcat/tc6.0.x/trunk/webapps/examples/jsp/tagplugin/if.jsp (original) +++ tomcat/tc6.0.x/trunk/webapps/examples/jsp/tagplugin/if.jsp Wed Jan 16 14:40:16 2008 @@ -25,7 +25,7 @@ /br a href=notes.htmlPlugin Introductory Notesfont font color=#FF/a br/ -a href=howto.htmlBrief Instructions for Wrieting Pluginsfont color=#FF/a +a href=howto.htmlBrief Instructions for Writing Pluginsfont color=#FF/a br/ br/ hr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43344] - Misspelling in if.jsp example
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=43344. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=43344 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2008-01-16 14:40 --- This has been fixed in svn and will be included in 6.0.16 onwards. Thanks for the patch. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612606 - in /tomcat/tc6.0.x/trunk: .classpath RELEASE-NOTES STATUS.txt build.properties.default extras.xml webapps/docs/changelog.xml
Author: markt
Date: Wed Jan 16 14:51:12 2008
New Revision: 612606
URL: http://svn.apache.org/viewvc?rev=612606view=rev
Log:
Update commons-logging to 1.1.1 and NSIS to 2.34
Modified:
tomcat/tc6.0.x/trunk/.classpath
tomcat/tc6.0.x/trunk/RELEASE-NOTES
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/.classpath
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/.classpath?rev=612606r1=612605r2=612606view=diff
==
--- tomcat/tc6.0.x/trunk/.classpath (original)
+++ tomcat/tc6.0.x/trunk/.classpath Wed Jan 16 14:51:12 2008
@@ -17,9 +17,11 @@
--
classpath
classpathentry
excluding=**/.svn/**|org/apache/tomcat/util/net/puretls/ kind=src
path=java/
+ classpathentry kind=src path=test/
classpathentry kind=src path=webapps/examples/WEB-INF/classes/
classpathentry kind=con
path=org.eclipse.jdt.launching.JRE_CONTAINER/
- classpathentry kind=var
path=TOMCAT_LIBS_BASE/apache-ant-1.6.5/lib/ant.jar/
- classpathentry kind=var
path=TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.1.2.jar/
+ classpathentry kind=var
path=TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar/
+ classpathentry kind=con
path=org.eclipse.jdt.junit.JUNIT_CONTAINER/3/
+ classpathentry kind=var path=ANT_HOME/lib/ant.jar/
classpathentry kind=output path=.settings/output/
/classpath
Modified: tomcat/tc6.0.x/trunk/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/RELEASE-NOTES?rev=612606r1=612605r2=612606view=diff
==
--- tomcat/tc6.0.x/trunk/RELEASE-NOTES (original)
+++ tomcat/tc6.0.x/trunk/RELEASE-NOTES Wed Jan 16 14:51:12 2008
@@ -85,11 +85,10 @@
* catalina-ant.jar (Tomcat Catalina Ant tasks)
* catalina-ha.jar (High availability package)
* catalina-tribes.jar (Group communication)
-* commons-logging-api.jar (Commons Logging API 1.0.x)
* el-api.jar (EL 2.1 API)
* jasper.jar (Jasper 2 Compiler and Runtime)
* jasper-el.jar (Jasper 2 EL implementation)
-* jasper-jdt.jar (Eclipse JDT 3.2 Java compiler)
+* jasper-jdt.jar (Eclipse JDT 3.3 Java compiler)
* jsp-api.jar (JSP 2.1 API)
* servlet-api.jar (Servlet 2.5 API)
* tomcat-coyote.jar (Tomcat connectors and utility classes)
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612606r1=612605r2=612606view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 14:51:12 2008
@@ -36,21 +36,6 @@
+1: markt, fhanik
-1:
- Update libs. commons-logging-1.1.1, nsis 2.34
- http://svn.apache.org/viewvc?rev=611635view=rev
- +1: markt, pero, fhanik
- -1:
-
- Update the Eclipse classpath (needs libs update above)
- http://svn.apache.org/viewvc?rev=611637view=rev
- +1: markt, pero, fhanik
- -1:
-
- Update release notes with available libraries
- http://svn.apache.org/viewvc?rev=611940view=rev
- +1: markt, pero, fhanik
- -1:
-
Add global flag to turn off reverse DNS lookups, performance improvement for
tribes
http://svn.apache.org/viewvc?view=revrevision=612192
+1: fhanik
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=612606r1=612605r2=612606view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Wed Jan 16 14:51:12 2008
@@ -47,7 +47,8 @@
base-tomcat.loc=http://archive.apache.org/dist/tomcat
# - Commons Logging, version 1.1 or later -
-commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-1.1-src.tar.gz
+commons-logging-version=1.1.1
+commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
# - Webservices -
jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
@@ -81,12 +82,12 @@
commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.2-src.tar.gz
# - NSIS, version 2.0 or later -
-nsis.home=${base.path}/nsis-2.22
+nsis.home=${base.path}/nsis-2.34
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.22-setup.exe
+nsis.loc=${base-sf.loc}/nsis/nsis-2.34-setup.exe
# - Commons Daemon, version 1.0-Alpha or later
svn commit: r612607 - /tomcat/trunk/res/bootstrap.jar.manifest
Author: markt Date: Wed Jan 16 14:52:00 2008 New Revision: 612607 URL: http://svn.apache.org/viewvc?rev=612607view=rev Log: One more place where a commons-logging-api.jar reference can be removed now extras repackages the source. Modified: tomcat/trunk/res/bootstrap.jar.manifest Modified: tomcat/trunk/res/bootstrap.jar.manifest URL: http://svn.apache.org/viewvc/tomcat/trunk/res/bootstrap.jar.manifest?rev=612607r1=612606r2=612607view=diff == --- tomcat/trunk/res/bootstrap.jar.manifest (original) +++ tomcat/trunk/res/bootstrap.jar.manifest Wed Jan 16 14:52:00 2008 @@ -1,5 +1,5 @@ Manifest-Version: 1.0 Main-Class: org.apache.catalina.startup.Bootstrap -Class-Path: commons-daemon.jar commons-logging-api.jar tomcat-juli.jar tomcat-coyote.jar +Class-Path: commons-daemon.jar tomcat-juli.jar tomcat-coyote.jar Specification-Title: Catalina Specification-Version: 6.0 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612608 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 16 14:52:57 2008 New Revision: 612608 URL: http://svn.apache.org/viewvc?rev=612608view=rev Log: Add missing bullets - makes it easier to read 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=612608r1=612607r2=612608view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 14:52:57 2008 @@ -31,22 +31,22 @@ +1: jfclere -1: fhanik - Can we add the 'package' directive to make the package match the dir structure - Fix Windows installer issue that was including files when it should not +* Fix Windows installer issue that was including files when it should not http://svn.apache.org/viewvc?rev=611660view=rev +1: markt, fhanik -1: - Add global flag to turn off reverse DNS lookups, performance improvement for tribes +* Add global flag to turn off reverse DNS lookups, performance improvement for tribes http://svn.apache.org/viewvc?view=revrevision=612192 +1: fhanik -1: - Set correct sessionCounter at StandardManager after reload sessions +* Set correct sessionCounter at StandardManager after reload sessions http://svn.apache.org/viewvc?view=revrevision=612455 +1: pero, fhanik -1: - Improve release note wording on Java version +* Improve release note wording on Java version http://svn.apache.org/viewvc?rev=612588view=rev +1: markt -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r612192 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
[EMAIL PROTECTED] wrote: Author: fhanik Date: Tue Jan 15 11:34:10 2008 New Revision: 612192 URL: http://svn.apache.org/viewvc?rev=612192view=rev Log: Add in the ability to turn off reverse DNS lookups for membership on a global scale. alot of system aren't configured for this, so simple debugging or warn messages that try to print the name, cause timeouts What is the reasoning for making this a global flag rather than a standard server.xml configuration option? Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612612 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 16 15:00:42 2008 New Revision: 612612 URL: http://svn.apache.org/viewvc?rev=612612view=rev Log: Vote 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=612612r1=612611r2=612612view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 15:00:42 2008 @@ -43,7 +43,7 @@ * Set correct sessionCounter at StandardManager after reload sessions http://svn.apache.org/viewvc?view=revrevision=612455 - +1: pero, fhanik + +1: pero, fhanik, markt -1: * Improve release note wording on Java version - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612616 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Wed Jan 16 15:09:41 2008 New Revision: 612616 URL: http://svn.apache.org/viewvc?rev=612616view=rev Log: Vote Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=612616r1=612615r2=612616view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Jan 16 15:09:41 2008 @@ -62,6 +62,6 @@ * Backport from Tc6 trunk: Set correct sessionCounter at StandardManager after reload sessions http://svn.apache.org/viewvc?view=revrevision=612455 - +1: pero + +1: pero, markt -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43479] - APR sendfile thread leaks memory
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=43479. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=43479 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2008-01-16 15:25 --- This was fixed in svn for 6.0.15 - which failed the release vote. It will be part of the next stable 6.0.x release. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612622 - /tomcat/trunk/webapps/docs/logging.xml
Author: markt Date: Wed Jan 16 15:30:19 2008 New Revision: 612622 URL: http://svn.apache.org/viewvc?rev=612622view=rev Log: Fix bug 43173. Correct location for logging.properties. Modified: tomcat/trunk/webapps/docs/logging.xml Modified: tomcat/trunk/webapps/docs/logging.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/logging.xml?rev=612622r1=612621r2=612622view=diff == --- tomcat/trunk/webapps/docs/logging.xml (original) +++ tomcat/trunk/webapps/docs/logging.xml Wed Jan 16 15:30:19 2008 @@ -214,7 +214,7 @@ /ul /p p -Example logging.properties file to be placed in common/classes: +Example logging.properties file to be placed in $CATALINA_HOME/conf: source handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, \ 3manager.org.apache.juli.FileHandler, 4admin.org.apache.juli.FileHandler, \ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43173] - Logging documentation says to put logging.properties in common/classes
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=43173. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=43173 --- Additional Comments From [EMAIL PROTECTED] 2008-01-16 15:33 --- Fixed in trunk. Proposed for 6.0.x -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612624 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 16 15:33:16 2008 New Revision: 612624 URL: http://svn.apache.org/viewvc?rev=612624view=rev Log: Propose fix for 43173 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=612624r1=612623r2=612624view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 15:33:16 2008 @@ -50,3 +50,8 @@ http://svn.apache.org/viewvc?rev=612588view=rev +1: markt -1: + +* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43173 + http://svn.apache.org/viewvc?rev=612622view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r612192 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
cause I'm likely to discover elsewhere in the tribes module where reverse DNS lookups are taking place, and at that point can take advantage of the global flag rather than creating duplicate configs or creating component dependencies that are not supposed to be there. does that make sense? Filip Mark Thomas wrote: [EMAIL PROTECTED] wrote: Author: fhanik Date: Tue Jan 15 11:34:10 2008 New Revision: 612192 URL: http://svn.apache.org/viewvc?rev=612192view=rev Log: Add in the ability to turn off reverse DNS lookups for membership on a global scale. alot of system aren't configured for this, so simple debugging or warn messages that try to print the name, cause timeouts What is the reasoning for making this a global flag rather than a standard server.xml configuration option? Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612632 - in /tomcat/trunk: build.properties.default java/org/apache/catalina/manager/HTMLManagerServlet.java java/org/apache/catalina/manager/LocalStrings.properties
Author: markt
Date: Wed Jan 16 15:40:53 2008
New Revision: 612632
URL: http://svn.apache.org/viewvc?rev=612632view=rev
Log:
Fix bug 43468. Prevent NPE.
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=612632r1=612631r2=612632view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Jan 16 15:40:53 2008
@@ -43,12 +43,12 @@
compile.target=1.5
compile.debug=true
-base-jakarta.loc=http://archive.apache.org/dist/jakarta
+base-commons.loc=http://archive.apache.org/dist/commons
base-tomcat.loc=http://archive.apache.org/dist/tomcat
# - Commons Logging, version 1.1 or later -
commons-logging-version=1.1.1
-commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
+commons-logging-src.loc=${base-commons.loc}/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
# - Webservices -
jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
@@ -68,18 +68,18 @@
# - Commons DBCP, version 1.1 or later -
commons-dbcp.version=1.2.2
commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
-commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
+commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
# - Commons Pool, version 1.1 or later -
-commons-pool.home=${base.path}/commons-pool-1.3-src
-commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.3-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.4-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.4-src.tar.gz
# - Commons Collections, version 2.0 or later -
commons-collections.home=${base.path}/commons-collections-3.2-src
commons-collections.lib=${commons-collections.home}
commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.jar
commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.2.tar.gz
-commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.2-src.tar.gz
+commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
# - NSIS, version 2.0 or later -
nsis.home=${base.path}/nsis-2.34
@@ -93,5 +93,5 @@
commons-daemon.home=${base.path}/commons-daemon-1.0.1
commons-daemon.lib=${commons-daemon.home}
commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-commons-daemon.loc=${base-jakarta.loc}/commons/daemon/binaries/commons-daemon-1.0.1.tar.gz
+commons-daemon.loc=${base-commons.loc}/daemon/binaries/commons-daemon-1.0.1.tar.gz
commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=612632r1=612631r2=612632view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Wed
Jan 16 15:40:53 2008
@@ -38,6 +38,7 @@
import org.apache.catalina.Container;
import org.apache.catalina.Context;
+import org.apache.catalina.Manager;
import org.apache.catalina.Session;
import org.apache.catalina.manager.util.BaseSessionComparator;
import org.apache.catalina.manager.util.ReverseComparator;
@@ -440,7 +441,13 @@
/html/expire?path= + displayPath);
args[9] = appsExpire;
args[10] = sm.getString(htmlManagerServlet.expire.explain);
-args[11] = new
Integer(context.getManager().getMaxInactiveInterval()/60);
+Manager manager = context.getManager();
+if (manager == null) {
+args[11] = sm.getString(htmlManagerServlet.noManager);
+} else {
+args[11] = new Integer(
+context.getManager().getMaxInactiveInterval()/60);
+}
args[12] = sm.getString(htmlManagerServlet.expire.unit);
args[13] = highlightColor;
Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=612632r1=612631r2=612632view=diff
svn commit: r612636 - /tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Author: markt
Date: Wed Jan 16 15:42:37 2008
New Revision: 612636
URL: http://svn.apache.org/viewvc?rev=612636view=rev
Log:
Fix 43315. Display value rather than key.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=612636r1=612635r2=612636view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Wed
Jan 16 15:42:37 2008
@@ -382,7 +382,7 @@
Map.Entry entry = (Map.Entry) iterator.next();
String displayPath = (String) entry.getKey();
-String contextPath = (String) entry.getKey();
+String contextPath = (String) entry.getValue();
Context context = (Context) host.findChild(contextPath);
if (displayPath.equals()) {
displayPath = /;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r612192 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
Filip Hanik - Dev Lists wrote: cause I'm likely to discover elsewhere in the tribes module where reverse DNS lookups are taking place, and at that point can take advantage of the global flag rather than creating duplicate configs or creating component dependencies that are not supposed to be there. does that make sense? Yep. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612637 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 16 15:44:47 2008 New Revision: 612637 URL: http://svn.apache.org/viewvc?rev=612637view=rev Log: Vote. 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=612637r1=612636r2=612637view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 15:44:47 2008 @@ -38,7 +38,7 @@ * Add global flag to turn off reverse DNS lookups, performance improvement for tribes http://svn.apache.org/viewvc?view=revrevision=612192 - +1: fhanik + +1: fhanik, markt -1: * Set correct sessionCounter at StandardManager after reload sessions - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612640 - /tomcat/trunk/build.properties.default
Author: markt
Date: Wed Jan 16 15:46:55 2008
New Revision: 612640
URL: http://svn.apache.org/viewvc?rev=612640view=rev
Log:
Undo accidental commit.
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=612640r1=612639r2=612640view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Jan 16 15:46:55 2008
@@ -43,12 +43,12 @@
compile.target=1.5
compile.debug=true
-base-commons.loc=http://archive.apache.org/dist/commons
+base-jakarta.loc=http://archive.apache.org/dist/jakarta
base-tomcat.loc=http://archive.apache.org/dist/tomcat
# - Commons Logging, version 1.1 or later -
commons-logging-version=1.1.1
-commons-logging-src.loc=${base-commons.loc}/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
+commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
# - Webservices -
jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
@@ -68,18 +68,18 @@
# - Commons DBCP, version 1.1 or later -
commons-dbcp.version=1.2.2
commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
-commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
+commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
# - Commons Pool, version 1.1 or later -
-commons-pool.home=${base.path}/commons-pool-1.4-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.4-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.3-src
+commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.3-src.tar.gz
# - Commons Collections, version 2.0 or later -
commons-collections.home=${base.path}/commons-collections-3.2-src
commons-collections.lib=${commons-collections.home}
commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.jar
commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.2.tar.gz
-commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
+commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.2-src.tar.gz
# - NSIS, version 2.0 or later -
nsis.home=${base.path}/nsis-2.34
@@ -93,5 +93,5 @@
commons-daemon.home=${base.path}/commons-daemon-1.0.1
commons-daemon.lib=${commons-daemon.home}
commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-commons-daemon.loc=${base-commons.loc}/daemon/binaries/commons-daemon-1.0.1.tar.gz
+commons-daemon.loc=${base-jakarta.loc}/commons/daemon/binaries/commons-daemon-1.0.1.tar.gz
commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612643 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 16 15:49:17 2008 New Revision: 612643 URL: http://svn.apache.org/viewvc?rev=612643view=rev Log: Propose a couple more fixes. 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=612643r1=612642r2=612643view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 15:49:17 2008 @@ -55,3 +55,14 @@ http://svn.apache.org/viewvc?rev=612622view=rev +1: markt -1: + +* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43468 + http://svn.apache.org/viewvc?rev=612632view=rev + (less the build.properties changes) + +1: markt + -1: + +* http://issues.apache.org/bugzilla/show_bug.cgi?id=43515 + http://svn.apache.org/viewvc?rev=612636view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43515] - Small bug in org.apache.catalina.manager.HTMLManagerServlet
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=43515. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=43515 --- Additional Comments From [EMAIL PROTECTED] 2008-01-16 15:49 --- This has been fixed in trunk and proposed for 6.0.x -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43468] - HTMLManagerServlet NullPointerException listing context
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=43468. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=43468 --- Additional Comments From [EMAIL PROTECTED] 2008-01-16 15:50 --- This has been fixed in trunk and proposed for 6.0.x -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 41557] - build.xml uses a different (from the documentation) variable to enable proxying
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=41557. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=41557 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2008-01-16 15:52 --- Closing this as invalid based on Tim's comments which show the proxy handling is working as intended. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612647 - /tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
Author: markt Date: Wed Jan 16 15:53:19 2008 New Revision: 612647 URL: http://svn.apache.org/viewvc?rev=612647view=rev Log: Add missing change from previous commit Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=612647r1=612646r2=612647view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Wed Jan 16 15:53:19 2008 @@ -46,7 +46,7 @@ htmlManagerServlet.list=List Applications htmlManagerServlet.manager=Manager htmlManagerServlet.messageLabel=Message: -htmlManagerServlet.noManager=N/A +htmlManagerServlet.noManager=- htmlManagerServlet.serverJVMVendor=JVM Vendor htmlManagerServlet.serverJVMVersion=JVM Version htmlManagerServlet.serverOSArch=OS Architecture - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612648 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 16 15:55:04 2008 New Revision: 612648 URL: http://svn.apache.org/viewvc?rev=612648view=rev Log: Update patch with better idea. 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=612648r1=612647r2=612648view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 15:55:04 2008 @@ -58,6 +58,7 @@ * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43468 http://svn.apache.org/viewvc?rev=612632view=rev + http://svn.apache.org/viewvc?rev=612647view=rev (less the build.properties changes) +1: markt -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 42337] - jasper-howto docs should use bin/catalina-tasks.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=42337. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=42337 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2008-01-16 15:57 --- This fix was applied to svn shortly after the bug was opened and has been in 6.0.x since. Thanks for the patch. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 38001] - TruncatedClassFile when loadind applets
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=38001. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=38001 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2008-01-16 16:08 --- No response for several years, so closing as invalid. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 39126] - on some conditions, tomcat 'forget' an exception
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=39126. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=39126 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2008-01-16 16:22 --- With the current 5.5.25 code you get the following in th elocalhost log so it looks like this bug has been fixed. 17-Jan-2008 00:15:29 org.apache.catalina.core.StandardWrapperValve invoke SEVERE: Servlet.service() for servlet jsp threw exception javax.servlet.jsp.JspException: merde at org.apache.jsp.bug39126_jsp._jspService(bug39126_jsp.java:5672) at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:98) at javax.servlet.http.HttpServlet.service(HttpServlet.java:803) at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:331) at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:329) at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:265) at javax.servlet.http.HttpServlet.service(HttpServlet.java:803) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:269) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:213) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:174) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:117) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:108) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:174) at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:874) at org.apache.coyote.http11.Http11BaseProtocol$Http11ConnectionHandler.processConnection(Http11BaseProtocol.java:665) at org.apache.tomcat.util.net.PoolTcpEndpoint.processSocket(PoolTcpEndpoint.java:528) at org.apache.tomcat.util.net.LeaderFollowerWorkerThread.runIt(LeaderFollowerWorkerThread.java:81) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:689) at java.lang.Thread.run(Thread.java:619) -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r612653 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Jan 16 16:29:29 2008 New Revision: 612653 URL: http://svn.apache.org/viewvc?rev=612653view=rev Log: Fix typo. Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=612653r1=612652r2=612653view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Jan 16 16:29:29 2008 @@ -48,7 +48,7 @@ changelog fix Set correct StandardManager.sessionCounter after reload/restart. (pero) - /fix + /fix updateAdd -Dorg.apache.catalina.tribes.dns_lookups=false as default. The ability to turn off reverse DNS lookups for membership.(fhanik)/update updateGuess java location from the PATH environment and improve fix for 37284/update updateAdd NIO connector to server.xml parsing warning, remove Connector as exception case/update - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 42337] - jasper-howto docs should use bin/catalina-tasks.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=42337. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=42337 --- Additional Comments From [EMAIL PROTECTED] 2008-01-16 21:17 --- (In reply to comment #2) This fix was applied to svn shortly after the bug was opened and has been in 6.0.x since. Thanks for the patch. w00t, thanks :) -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44257] New: - User sessions become invalid Randomly
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=44257. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=44257 Summary: User sessions become invalid Randomly Product: Tomcat 4 Version: 4.1.31 Platform: All OS/Version: AIX Status: NEW Severity: critical Priority: P2 Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Hi, We are experiencing issues where about 10% of the total user sessions get timed out in 20 mins, inspite of the setup of 120 mins for the web-based app. This issue seems to be random and across all user bases. The tomcat webservers are installed in different flavors ( AIX, OSX servers ) and the timeout seems to happen randomly in both these enviornments. The Webserver seems to have the session id value of the user null, because of which, the session id of user ( coming via the request object ) is not matching with the session id stored in the server ( that has become null ), during authentication of the validity of the user session. Average time out period of idle session seems to be around 20 mins for all the affected users. we are using Apache 4.1.31 Any help on this would be greatly appreciated. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
