Tomcat Harmony bundle

[Alexey Petrenko]

We've created Apache Tomcat Harmony bundle with the latest published
snapshots: Tomcat 6.0.14 and Harmony M3.
You can find the binaries here: http://harmony.apache.org/bundles.html#Tomcat

Feel free to try it and share your experience :)

Thanks in advance.

SY, Alexey

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r604253 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c common/jk_service.h

[rjung]

Author: rjung
Date: Fri Dec 14 10:50:44 2007
New Revision: 604253

URL: http://svn.apache.org/viewvc?rev=604253&view=rev
Log:
Use size_t instead of int for string lengths.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_service.h

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=604253&r1=604252&r2=604253&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Fri Dec 14 10:50:44 
2007
@@ -247,7 +247,7 @@
 
 static void * JK_METHOD ws_next_vhost(void *d);
 
-static void JK_METHOD ws_vhost_to_text(void *d, char *buf, int len);
+static void JK_METHOD ws_vhost_to_text(void *d, char *buf, size_t len);
 
 static jk_uri_worker_map_t * JK_METHOD ws_vhost_to_uw_map(void *d);
 
@@ -465,10 +465,10 @@
 return s->next;
 }
 
-static void JK_METHOD ws_vhost_to_text(void *d, char *buf, int len)
+static void JK_METHOD ws_vhost_to_text(void *d, char *buf, size_t len)
 {
 server_rec *s = (server_rec *)d;
-int used = 0;
+size_t used = 0;
 
 if (s->server_hostname)
 used += strlen(s->server_hostname);

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=604253&r1=604252&r2=604253&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Fri Dec 14 10:50:44 
2007
@@ -261,7 +261,7 @@
 
 static void * JK_METHOD ws_next_vhost(void *d);
 
-static void JK_METHOD ws_vhost_to_text(void *d, char *buf, int len);
+static void JK_METHOD ws_vhost_to_text(void *d, char *buf, size_t len);
 
 static jk_uri_worker_map_t * JK_METHOD ws_vhost_to_uw_map(void *d);
 
@@ -497,10 +497,10 @@
 return s->next;
 }
 
-static void JK_METHOD ws_vhost_to_text(void *d, char *buf, int len)
+static void JK_METHOD ws_vhost_to_text(void *d, char *buf, size_t len)
 {
 server_rec *s = (server_rec *)d;
-int used = 0;
+size_t used = 0;
 
 if (s->server_hostname)
 used += strlen(s->server_hostname);

Modified: tomcat/connectors/trunk/jk/native/common/jk_service.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_service.h?rev=604253&r1=604252&r2=604253&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_service.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_service.h Fri Dec 14 10:50:44 
2007
@@ -292,7 +292,7 @@
 /*
  * String representation of a vhost
  */
-void (JK_METHOD * vhost_to_text) (void *d, char *buf, int len);
+void (JK_METHOD * vhost_to_text) (void *d, char *buf, size_t len);
 
 /*
  * Get uw_map associated with a vhost



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r604266 - /tomcat/tc6.0.x/trunk/STATUS.txt

[jim]

Author: jim
Date: Fri Dec 14 11:18:08 2007
New Revision: 604266

URL: http://svn.apache.org/viewvc?rev=604266&view=rev
Log:
cast 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=604266&r1=604265&r2=604266&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Dec 14 11:18:08 2007
@@ -33,5 +33,5 @@
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44041
   http://svn.apache.org/viewvc?rev=603340&view=rev
-  +1: markt
+  +1: markt, jim
   -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r604267 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

[rjung]

Author: rjung
Date: Fri Dec 14 11:19:17 2007
New Revision: 604267

URL: http://svn.apache.org/viewvc?rev=604267&view=rev
Log:
Various minor cleanups + function comments.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=604267&r1=604266&r2=604267&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Fri Dec 14 
11:19:17 2007
@@ -717,13 +717,17 @@
 }
 
 
-/*
- * Try another connection from cache
+/** Steal a connection from an idle cache endpoint
+ * @param ae   endpoint that needs a new connection
+ * @param llogger
+ * @return JK_FALSE: failure
+ * JK_TRUE: success
+ * @remark Always closes old socket endpoint
  */
-
-static void ajp_next_connection(ajp_endpoint_t *ae, jk_logger_t *l)
+static int ajp_next_connection(ajp_endpoint_t *ae, jk_logger_t *l)
 {
 int rc;
+int ret = JK_FALSE;
 ajp_worker_t *aw = ae->worker;
 
 JK_TRACE_ENTER(l);
@@ -745,17 +749,25 @@
 }
 }
 JK_LEAVE_CS(&aw->cs, rc);
-if (IS_VALID_SOCKET(ae->sd))
+if (IS_VALID_SOCKET(ae->sd)) {
+ret = JK_TRUE;
 jk_log(l, JK_LOG_INFO,
"(%s) Will try pooled connection sd = %d from slot %d",
 ae->worker->name, ae->sd, i);
+}
 }
 JK_TRACE_EXIT(l);
+return ret;
 }
 
-/*
- * Handle the CPING/CPONG initial query
- * Cares about ae->errno.
+/** Handle the cping/cpong query
+ * @param ae   endpoint
+ * @param timeout  wait timeout in milliseconds
+ * @param llogger
+ * @return JK_FALSE: failure
+ * JK_TRUE: success
+ * @remark Always closes socket in case of
+ * a socket error
  */
 static int ajp_handle_cping_cpong(ajp_endpoint_t * ae, int timeout, 
jk_logger_t *l)
 {
@@ -793,7 +805,7 @@
  */
 if (jk_is_input_event(ae->sd, timeout, l) == JK_FALSE) {
 ae->last_errno = errno;
-jk_log(l, JK_LOG_INFO, "timeout in reply pong");
+jk_log(l, JK_LOG_INFO, "timeout in reply cpong");
 /* We can't trust this connection any more. */
 jk_shutdown_socket(ae->sd, l);
 ae->sd = JK_INVALID_SOCKET;
@@ -811,9 +823,12 @@
 }
 
 if ((cmd = jk_b_get_byte(msg)) != AJP13_CPONG_REPLY) {
-jk_log(l, JK_LOG_INFO,
+jk_log(l, JK_LOG_ERROR,
"awaited reply cpong, received %d instead",
cmd);
+/* We can't trust this connection any more. */
+jk_shutdown_socket(ae->sd, l);
+ae->sd = JK_INVALID_SOCKET;
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
@@ -822,9 +837,14 @@
 return JK_TRUE;
 }
 
-/*
- * Connect an endpoint to a backend.
- * Cares about ae->errno.
+/** Connect an endpoint to a backend
+ * @param ae   endpoint
+ * @param llogger
+ * @return JK_FALSE: failure
+ * JK_TRUE: success
+ * @remark Always closes socket in case of
+ * a socket error
+ * @remark Cares about ae->last_errno
  */
 int ajp_connect_to_endpoint(ajp_endpoint_t * ae, jk_logger_t *l)
 {
@@ -841,7 +861,7 @@
 
 if (!IS_VALID_SOCKET(ae->sd)) {
 ae->last_errno = errno;
-jk_log(l, JK_LOG_INFO,
+jk_log(l, JK_LOG_ERROR,
"Failed opening socket to (%s) (errno=%d)",
jk_dump_hinfo(&ae->worker->worker_inet_addr, buf), 
ae->last_errno);
 JK_TRACE_EXIT(l);
@@ -863,36 +883,38 @@
 /* XXX: and if no cping/cpong is allowed before or after logon. */
 if (ae->worker->logon != NULL) {
 rc = ae->worker->logon(ae, l);
-if (rc == JK_FALSE)
-jk_log(l, JK_LOG_INFO,
+if (rc == JK_FALSE) {
+jk_log(l, JK_LOG_ERROR,
"(%s) ajp14 worker logon to the backend server failed",
ae->worker->name);
+/* Close the socket if unable to logon */
+jk_shutdown_socket(ae->sd, l);
+ae->sd = JK_INVALID_SOCKET;
+}
 }
-/* should we send a CPING to validate connection ? */
+/* XXX: Should we send a cping also after logon to validate the 
connection? */
 else if (ae->worker->connect_timeout > 0) {
 rc = ajp_handle_cping_cpong(ae, ae->worker->connect_timeout, l);
 if (rc == JK_FALSE)
-jk_log(l, JK_LOG_INFO,
+jk_log(l, JK_LOG_ERROR,
"(%s) cping/cpong after connecting to the backend server 
failed (errno=%d)",
ae->worker->name, ae->last_errno);
 }
-if (rc != JK_TRUE) {
-/* Close the socket if unable to connect */
-jk_log(l, JK_LOG_INFO,
-   "(%s) error c

svn commit: r604274 - /tomcat/tc6.0.x/trunk/STATUS.txt

[fhanik]

Author: fhanik
Date: Fri Dec 14 11:39:13 2007
New Revision: 604274

URL: http://svn.apache.org/viewvc?rev=604274&view=rev
Log:
vote and proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=604274&r1=604273&r2=604274&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Dec 14 11:39:13 2007
@@ -33,5 +33,27 @@
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44041
   http://svn.apache.org/viewvc?rev=603340&view=rev
-  +1: markt, jim
+  +1: markt, jim, fhanik
   -1:
+
+* Fix chunked encoding parsing
+  The following patch fixes how the Comet processors blocks, it doesn't change 
the 
+  way chunked parsing is done, but changing when it blocks and doesn't block.
+  In the old way, it incorrectly blocks after parsing CRLF waiting for the 
next chunk
+  In the new way, it wont block after CRLF
+  Index: java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
+  ===
+  --- java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(revision 604269)
+  +++ java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(working copy)
+  @@ -154,7 +154,7 @@
+   chunk.setBytes(buf, pos, remaining);
+   pos = pos + remaining;
+   remaining = 0;
+  -needCRLFParse = true;
+  +parseCRLF(); //a chunk should end with CRLF, block right away
+   }
+   
+   return result;
+  
+  +1: fhanik
+  -1: 
\ No newline at end of file



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

trunk development

[Filip Hanik - Dev Lists]

In the near future, I plan to add the following to trunk

1. annotation dependency injection patch
2. cluster JMX configurations
3. any NIO improvements that haven't been ported

I've also completed a non blocking comet write implementation in 
sandbox, and will write some demo/sample apps to demonstrate before I 
suggest moving forward with it.


Filip

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r604285 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

[rjung]

Author: rjung
Date: Fri Dec 14 12:12:58 2007
New Revision: 604285

URL: http://svn.apache.org/viewvc?rev=604285&view=rev
Log:
Make synchronized blocks a little smaller,
remove unnecessary shutdown before reset
and log a little more data.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=604285&r1=604284&r2=604285&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Fri Dec 14 
12:12:58 2007
@@ -685,14 +685,18 @@
 
 static void ajp_reset_endpoint(ajp_endpoint_t * ae, jk_logger_t *l)
 {
+JK_TRACE_ENTER(l);
+
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+"(%s) resetting endpoint with sd = %u %s",
+ ae->worker->name, ae->sd, ae->reuse? "" : "(socket shutdown)");
 if (IS_VALID_SOCKET(ae->sd) && !ae->reuse) {
 jk_shutdown_socket(ae->sd, l);
-if (JK_IS_DEBUG_LEVEL(l))
-jk_log(l, JK_LOG_DEBUG,
-"reset socket with sd = %u", ae->sd );
 ae->sd = JK_INVALID_SOCKET;
 }
 jk_reset_pool(&(ae->pool));
+JK_TRACE_EXIT(l);
 }
 
 /*
@@ -703,14 +707,14 @@
 {
 JK_TRACE_ENTER(l);
 
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+"(%s) closing endpoint with sd = %u %s",
+ ae->worker->name, ae->sd, ae->reuse? "" : "(socket shutdown)");
 if (IS_VALID_SOCKET(ae->sd)) {
 jk_shutdown_socket(ae->sd, l);
-if (JK_IS_DEBUG_LEVEL(l))
-jk_log(l, JK_LOG_DEBUG,
-   "closed socket with sd = %d", ae->sd);
 ae->sd = JK_INVALID_SOCKET;
 }
-
 jk_close_pool(&(ae->pool));
 free(ae);
 JK_TRACE_EXIT(l);
@@ -2260,6 +2264,7 @@
"worker %s contact is '%s:%d'",
p->name, p->host, p->port);
 
+/* XXX: Why do we only resolve, if port > 1024 ? */
 if (p->port > 1024) {
 if (jk_resolve(p->host, p->port, &p->worker_inet_addr, l)) {
 JK_TRACE_EXIT(l);
@@ -2297,26 +2302,26 @@
 jk_log(l, JK_LOG_DEBUG,
 "setting connection pool size to %u with min %u",
 p->ep_cache_sz, p->ep_mincache_sz);
-for (i = 0; i < p->ep_cache_sz; i++) {
-p->ep_cache[i] = (ajp_endpoint_t *)calloc(1, 
sizeof(ajp_endpoint_t));
-if (!p->ep_cache[i]) {
-jk_log(l, JK_LOG_ERROR,
-"allocating endpoint slot %d (errno=%d)",
-i, errno);
-JK_TRACE_EXIT(l);
-return JK_FALSE;
-}
-p->ep_cache[i]->sd = JK_INVALID_SOCKET;
-p->ep_cache[i]->reuse = JK_FALSE;
-p->ep_cache[i]->last_access = now;
-jk_open_pool(&(p->ep_cache[i]->pool), p->ep_cache[i]->buf,
- sizeof(p->ep_cache[i]->buf));
-p->ep_cache[i]->worker = p;
-p->ep_cache[i]->endpoint.endpoint_private = p->ep_cache[i];
-p->ep_cache[i]->proto = proto;
-p->ep_cache[i]->endpoint.service = ajp_service;
-p->ep_cache[i]->endpoint.done= ajp_done;
+for (i = 0; i < p->ep_cache_sz; i++) {
+p->ep_cache[i] = (ajp_endpoint_t *)calloc(1, sizeof(ajp_endpoint_t));
+if (!p->ep_cache[i]) {
+jk_log(l, JK_LOG_ERROR,
+"allocating endpoint slot %d (errno=%d)",
+i, errno);
+JK_TRACE_EXIT(l);
+return JK_FALSE;
 }
+p->ep_cache[i]->sd = JK_INVALID_SOCKET;
+p->ep_cache[i]->reuse = JK_FALSE;
+p->ep_cache[i]->last_access = now;
+jk_open_pool(&(p->ep_cache[i]->pool), p->ep_cache[i]->buf,
+ sizeof(p->ep_cache[i]->buf));
+p->ep_cache[i]->worker = p;
+p->ep_cache[i]->endpoint.endpoint_private = p->ep_cache[i];
+p->ep_cache[i]->proto = proto;
+p->ep_cache[i]->endpoint.service = ajp_service;
+p->ep_cache[i]->endpoint.done= ajp_done;
+}
 
 JK_TRACE_EXIT(l);
 return JK_TRUE;
@@ -2374,7 +2379,6 @@
  &p->http_status_fail[0],
  JK_MAX_HTTP_STATUS_FAILS);
 
-
 pThis->retries =
 jk_get_worker_retries(props, p->name,
   JK_RETRIES);
@@ -2510,42 +2514,23 @@
 int rc;
 ajp_worker_t *w = p->worker;
 
+/* set last_access only if needed */
+if (w->cache_timeout > 0)
+p->last_access = time(NULL);
+ajp_reset_endpoint(p, l);
+*e = NULL;
 JK_ENTER_CS(&w->cs, rc);
 if (rc) {
 int i;
-jk_sock_t sock = JK_INVALID_SOCKET;
 
-/* If we 

[Tomcat Wiki] Trivial Update of "FAQ/Miscellaneous" by Dan

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The following page has been changed by Dan:
http://wiki.apache.org/tomcat/FAQ/Miscellaneous

--
  
  To make a global change, this is done in TOMCAT_HOME/conf/web.xml by changing 
the listings property for the default servlet.
  
- If you want to enable it for an individual webapp, then you need to add 
something similar to the following to your web.xml file:
+ If you want to enable it for an individual webapp, then you need to add 
something similar to the following to your web.xml file (for your individual 
app):
  
  {{{
 

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Fwd: building 6.0.14 download issue eclipse-JDT-3.2.2.zip

[SuperAaron]

When I checked out tag 6.0.14 and ran the ant download task,
the download process could not find the following file:
http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-JDT-3.2.2.zip

In build.properties.default I replaced:
jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-JDT-3.2.2.zip
with:
jdt.loc=http://mirror.calvin.edu/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-JDT-3.2.2.zip

I would like to save others the hassle of figuring this out, but I am not
sure if this is the best site to use. Or what the procedure is.
Is there a better site to link to?
Should I check in?
Do I have permission to check in?

Thanks
Super Aaron

PS be gentle this is my first time.
-- 
/** Super Aaron **/

[Tomcat Wiki] Update of "FAQ/Miscellaneous" by Dan

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The following page has been changed by Dan:
http://wiki.apache.org/tomcat/FAQ/Miscellaneous

The comment on the change is:
improving an answer

--
  
  '''How do I enable/disable directory listings?'''
  
- This is done in TOMCAT_HOME/conf/web.xml by changing the listings property 
for the default servlet.
+ To make a global change, this is done in TOMCAT_HOME/conf/web.xml by changing 
the listings property for the default servlet.
+ 
+ If you want to enable it for an individual webapp, then you need to add 
something similar to the following to your web.xml file:
+ 
+ {{{
+
+listing
+
org.apache.catalina.servlets.DefaultServlet
+
+debug
+0
+
+
+listings
+true
+
+1
+
+ 
+
+listing
+/
+
+ 
+ }}}
  
  '''How do I make Tomcat listen on a specific IP address instead of all 
available addresses?'''
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Fwd: building 6.0.14 download issue eclipse-JDT-3.2.2.zip

[Filip Hanik - Dev Lists]

check out build.properties.default from the 6.0.x trunk, that one has a 
valid link


Filip

SuperAaron wrote:

When I checked out tag 6.0.14 and ran the ant download task,
the download process could not find the following file:
http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-JDT-3.2.2.zip

In build.properties.default I replaced:
jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-JDT-3.2.2.zip
with:
jdt.loc=http://mirror.calvin.edu/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-JDT-3.2.2.zip

I would like to save others the hassle of figuring this out, but I am not
sure if this is the best site to use. Or what the procedure is.
Is there a better site to link to?
Should I check in?
Do I have permission to check in?

Thanks
Super Aaron

PS be gentle this is my first time.
  



No virus found in this incoming message.
Checked by AVG Free Edition. 
Version: 7.5.503 / Virus Database: 269.17.2/1184 - Release Date: 12/14/2007 11:29 AM
  



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Fwd: building 6.0.14 download issue eclipse-JDT-3.2.2.zip

[SuperAaron]

Thanks.

On Dec 14, 2007 2:53 PM, Filip Hanik - Dev Lists <[EMAIL PROTECTED]> wrote:

> check out build.properties.default from the 6.0.x trunk, that one has a
> valid link
>
> Filip
>
> SuperAaron wrote:
> > When I checked out tag 6.0.14 and ran the ant download task,
> > the download process could not find the following file:
> >
> http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-JDT-3.2.2.zip
> >
> > In build.properties.default I replaced:
> >
> jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-JDT-3.2.2.zip
> > with:
> >
> jdt.loc=http://mirror.calvin.edu/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-JDT-3.2.2.zip
> >
> > I would like to save others the hassle of figuring this out, but I am
> not
> > sure if this is the best site to use. Or what the procedure is.
> > Is there a better site to link to?
> > Should I check in?
> > Do I have permission to check in?
> >
> > Thanks
> > Super Aaron
> >
> > PS be gentle this is my first time.
> >
> > 
> >
> > No virus found in this incoming message.
> > Checked by AVG Free Edition.
> > Version: 7.5.503 / Virus Database: 269.17.2/1184 - Release Date:
> 12/14/2007 11:29 AM
> >
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>


-- 
/** Super Aaron **/

svn commit: r604383 - in /tomcat/connectors/trunk/jk/native/common: jk_ajp_common.c jk_global.h

[rjung]

Author: rjung
Date: Fri Dec 14 19:26:30 2007
New Revision: 604383

URL: http://svn.apache.org/viewvc?rev=604383&view=rev
Log:
Make http status code names consistent.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_global.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=604383&r1=604382&r2=604383&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Fri Dec 14 
19:26:30 2007
@@ -1929,7 +1929,7 @@
  * return value  is_error  op->recoverablereason
  * JK_FALSE  JK_HTTP_SERVER_ERROR  UNDEF  Invalid 
Parameters (null values)
  * JK_SERVER_ERROR   JK_HTTP_OKUNDEF  Error during 
initializing empty request, response or post body objects
- * JK_CLIENT_ERROR   JK_REQUEST_TOO_LARGE  JK_TRUERequest doesn't 
fit into buffer (error during ajp_marshal_into_msgb())
+ * JK_CLIENT_ERROR   JK_HTTP_REQUEST_TOO_LARGE JK_TRUERequest doesn't 
fit into buffer (error during ajp_marshal_into_msgb())
  * JK_CLIENT_ERROR   JK_HTTP_BAD_REQUEST   JK_FALSE   Error during 
reading parts of POST body from client
  * JK_SERVER_ERROR   JK_HTTP_SERVER_ERROR  JK_FALSE   If 
ajp_send_request() returns JK_TRUE but !op->recoverable.
  *   This should never happen.
@@ -2036,7 +2036,7 @@
  * We get here initial request (in op->request)
  */
 if (!ajp_marshal_into_msgb(op->request, s, l, p)) {
-*is_error = JK_REQUEST_TOO_LARGE;
+*is_error = JK_HTTP_REQUEST_TOO_LARGE;
 jk_log(l, JK_LOG_INFO,
 "Creating AJP message failed, "
 "without recovery");

Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?rev=604383&r1=604382&r2=604383&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_global.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_global.h Fri Dec 14 19:26:30 
2007
@@ -214,14 +214,14 @@
 /* HTTP Error codes
  */
 
-#define JK_HTTP_OK   200
-#define JK_HTTP_BAD_REQUEST  400
-#define JK_REQUEST_TOO_LARGE 413
-#define JK_HTTP_SERVER_ERROR 500
-#define JK_HTTP_NOT_IMPLEMENTED  501
-#define JK_HTTP_BAD_GATEWAY  502
-#define JK_HTTP_SERVER_BUSY  503
-#define JK_HTTP_GATEWAY_TIME_OUT 504
+#define JK_HTTP_OK200
+#define JK_HTTP_BAD_REQUEST   400
+#define JK_HTTP_REQUEST_TOO_LARGE 413
+#define JK_HTTP_SERVER_ERROR  500
+#define JK_HTTP_NOT_IMPLEMENTED   501
+#define JK_HTTP_BAD_GATEWAY   502
+#define JK_HTTP_SERVER_BUSY   503
+#define JK_HTTP_GATEWAY_TIME_OUT  504
 
 
 /*



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r604384 - /tomcat/connectors/trunk/jk/native/common/jk_service.h

[rjung]

Author: rjung
Date: Fri Dec 14 19:27:22 2007
New Revision: 604384

URL: http://svn.apache.org/viewvc?rev=604384&view=rev
Log:
Introduce endpoint member to pass recoverability
back from member service() to lb service().

Modified:
tomcat/connectors/trunk/jk/native/common/jk_service.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_service.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_service.h?rev=604384&r1=604383&r2=604384&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_service.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_service.h Fri Dec 14 19:27:22 
2007
@@ -336,6 +336,14 @@
 jk_uint64_t wr;
 
 /*
+ * Flag to pass back recoverability status from
+ * a load balancer member to the load balancer itself.
+ * Depending on the configuration and request status
+ * recovery is not allowed.
+ */
+int recoverable;
+
+/*
  * A 'this' pointer which is used by the subclasses of this class to
  * point to data/functions which are specific to a given protocol
  * (e.g. ajp12 or ajp13 or ajp14).



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r604393 - in /tomcat/connectors/trunk/jk/native/common: jk_ajp_common.c jk_lb_worker.c

[rjung]

Author: rjung
Date: Fri Dec 14 21:38:45 2007
New Revision: 604393

URL: http://svn.apache.org/viewvc?rev=604393&view=rev
Log:
Refactoring jk_ajp_common.c
(and in smaller parts jk_lb_worker.c).
- we now explicitely pass back the information,
  if the lb should do failover. This was not
  an automatic consequence of the return codes we used.
- I hope the logic in ajp_send_request() is now
  easier to understand
- the service method has been adopted, to handle
  the slightly changed return codes from ajp_send_request(),
  and also w.r.t. the changed interface to the lb
  (recovery flag).
- improved handling of reply timeouts in lb
  (max_reply_timeouts should work better than before
  and reply_timeouts should now work again in
  combination with failover)
  Note: there is still a conceptual problem with
  max_reply_timeouts
- improved handling of  fail on status codes, especially
  concerning the decision, if the node should go
  into error state


Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=604393&r1=604392&r2=604393&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Fri Dec 14 
21:38:45 2007
@@ -755,9 +755,10 @@
 JK_LEAVE_CS(&aw->cs, rc);
 if (IS_VALID_SOCKET(ae->sd)) {
 ret = JK_TRUE;
-jk_log(l, JK_LOG_INFO,
-   "(%s) Will try pooled connection sd = %d from slot %d",
-ae->worker->name, ae->sd, i);
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+   "(%s) Will try pooled connection sd = %d from slot %d",
+ae->worker->name, ae->sd, i);
 }
 }
 JK_TRACE_EXIT(l);
@@ -912,7 +913,7 @@
  * @param ae   endpoint
  * @param msg  message to send
  * @param llogger
- * @return JK_FATAL_ERROR: message contains unknown protocol
+ * @return JK_FATAL_ERROR: endpoint contains unknown protocol
  * JK_FALSE: other failure 
  * JK_TRUE: success
  * @remark Always closes socket in case of
@@ -1230,7 +1231,7 @@
 /*
  * send request to Tomcat via Ajp13
  * - first try to find reuseable socket
- * - if no one available, try to connect
+ * - if no such available, try to connect
  * - send request, but send must be seen as asynchronous,
  *   since send() call will return noerror about 95% of time
  *   Hopefully we'll get more information on next read.
@@ -1240,23 +1241,23 @@
  *
  * Return values of ajp_send_request() function:
  * return valueop->recoverable   reason
- * JK_FALSEJK_FALSE/JK_TRUE  ajp_connection_tcp_send_message() 
returns JK_FATAL_ERROR
+ * JK_FATAL_ERROR  JK_FALSE  ajp_connection_tcp_send_message() 
returns JK_FATAL_ERROR
  *   Endpoint belongs to unknown protocol.
- * XXX: The recoverability handling of JK_FATAL_ERROR returning from
- * ajp_connection_tcp_send_message() seems to be inconsistent.
- * JK_FALSEJK_TRUE   ajp_connection_tcp_send_message() 
returns JK_FALSE
- *   Sending data in jk_tcp_socket_sendfull() returns with error.
- * JK_FALSEJK_TRUE   Could not connect to backend
- * JK_SERVER_ERROR JK_TRUE   Error during sending parts of POST 
body to backend
+ * JK_FATAL_ERROR  JK_TRUE   ajp_connection_tcp_send_message() 
returns JK_FALSE
+ *   Sending request or request body in jk_tcp_socket_sendfull() 
returns with error.
+ * JK_FATAL_ERROR  JK_TRUE   Could not connect to backend
  * JK_CLIENT_RD_ERROR  JK_FALSE  Error during reading parts of POST 
body from client
- * JK_TRUE JK_TRUE   All other cases
+ * JK_TRUE JK_TRUE   All other cases (OK)
  */
 static int ajp_send_request(jk_endpoint_t *e,
 jk_ws_service_t *s,
 jk_logger_t *l,
 ajp_endpoint_t * ae, ajp_operation_t * op)
 {
-int err = 0;
+int err_conn = 0;
+int err_cping = 0;
+int err_send = 0;
+int rc;
 int postlen;
 
 JK_TRACE_ENTER(l);
@@ -1268,16 +1269,19 @@
 /*
  * First try to reuse open connections...
  */
+if (!IS_VALID_SOCKET(ae->sd))
+ajp_next_connection(ae, l);
 while (IS_VALID_SOCKET(ae->sd)) {
-int rc = 0;
-err = 0;
-if (!jk_is_socket_connected(ae->sd, l)) {
+int err = JK_FALSE;
+if (jk_is_socket_connected(ae->sd, l) == JK_FALSE) {
 ae->last_errno = errno;
-jk_log(l, JK_LOG_DEBUG,
-   "(%s) so

DO NOT REPLY [Bug 42038] - JK uriworkermap ROOT mapping causes non-virtual exclusions to be ignored

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=42038


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




-- 
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 43229] - mod_jk 1.2.25 different fallback behavior on reply_timeout happens between 1.2.23 and 1.2.25

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=43229


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution||FIXED




-- 
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: r604395 - /tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

[rjung]

Author: rjung
Date: Fri Dec 14 22:03:35 2007
New Revision: 604395

URL: http://svn.apache.org/viewvc?rev=604395&view=rev
Log:
Update Changelog.

Modified:
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=604395&r1=604394&r2=604395&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Fri Dec 14 
22:03:35 2007
@@ -44,8 +44,19 @@
   
 
   
+43229: Load balancer does not do fail over after
+reply timeouts. (rjung)
+  
+  
 JKStatus: Repair detailed Apache httpd version display.
 This was broken for httpd version 2.2.4+. (rjung)
+  
+  
+LB/AJP: Refactoring of jk_connect.c, jk_ajp_common.c,
+jk_lb_worker.c (rjung)
+  
+  
+Configure: Repair broken apxs auto-detection. (rjung)
   
   
 Configure: Remove trace logging from compiled code



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]