DO NOT REPLY [Bug 33558] - When the master node is enter again, only the first request is not replicated.

[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=33558





--- Additional Comments From [EMAIL PROTECTED]  2005-02-21 05:23 ---
I think DeltaRequest already has to be in DeltaSession when setAttribute 
called before requestCompleted.
And this patch works when a master node starts, DeltaRequest of only the 
session that the replication has been done from a slave node is initialized.
The reliability of the session persistence is raised further. 

-- 
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]

Re: Visibility of resources under WEB-INF/classes

[Rico]

--- sven morales <[EMAIL PROTECTED]> wrote:

> Hi,
>I have no problem doing that in linux, having the 
> jsp files and  classes in another directory besides
> being under $CATALINA_HOME.
>   I wonder if you can try using a forward slash in
> windows.

There's no difference. The problem persists, exactly the same.

Rico.

> aka_sergio
>   
> --- Rico <[EMAIL PROTECTED]> wrote:
> 
> > --- sven morales <[EMAIL PROTECTED]> wrote:
> > > Hi,
> > > Are you putting your classes at
> > tomcat5/webapps/yourwebapp/WEB-INF/classes ?
> > 
> > What I outlined in my email is that when I don't do
> > the above
> > because I use my own  > path="/something">
> > 
> > Tomcat cannot find the resources as follows:
> > C:\myWebApp\WEB-INF\classes\hibernate.cfg.xml and
> > C:\myWebApp\WEB-INF\classes\log4j.properties
> > 
> > Is that supposed to be the case?
> > 
> > And when I install the web application to
> > /webapps/ then it can
> > find
> > 
> >
> /webapps//WEB-INF/classes/hibernate.cfg.xml
> > and
> >
> /webapps//WEB-INF/classes/log4j.properties
> > 
> > which I'm happy about but spent a lot of time to get
> > to.
> > 
> > Is there some further attributes for a  in
> > the case where
> > docBase isn't /webapps/ ?
> > 
> > Rico.



__ 
Do you Yahoo!? 
Yahoo! Mail - Easier than ever with enhanced search. Learn more.
http://info.mail.yahoo.com/mail_250

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

Gilles Huline/Cementia-Holding/Ch/Cement/Lafarge is out of the office.

[gilles . huline]

I will be out of the office starting  21.02.2005 and will not return until 
28.02.2005.

I will respond to your message when I return.
Call me at +41797468083 if urgent.
"This e-mail is confidential and may contain legally privileged information.  
If you are not the intended recipient, you should not copy, distribute,
disclose or use the information it contains.  Please e-mail the sender 
immediately and delete this message from your system.  E-mails are susceptible
to corruption, interception and unauthorised amendment; we do not accept 
liability for any such changes, or for their consequences. You should be
aware, that the company  may monitor your emails and their content"



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

DO NOT REPLY [Bug 32424] - Redirecting directiories with missing trailing slash breaks web applications

[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=32424





--- Additional Comments From [EMAIL PROTECTED]  2005-02-21 00:05 ---
The migration of Tomcat 4.x / Jetty web applications to 5.5.x is not possible
because of this 302/redirect for url's with names like existing directories in
the web app. This may be a real show stopper! I still do not understand why
Tomcat interferes with the url space my web app is responsible for?!

-- 
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]

[ANN] Apache Jakarta Tomcat 5.5.8-alpha Released

[Yoav Shapira]

The Apache Jakarta Tomcat team is proud to announce the immediate availability
of Tomcat 5.5.8-alpha. This build contains numerous bug fixes, documentation
updates, and other improvements. 

Release notes: http://jakarta.apache.org/tomcat/tomcat-5.5-doc/RELEASE-NOTES 

Please refer to the change log for the list of changes:
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/changelog.html 

Downloads: Binaries: http://jakarta.apache.org/site/binindex.cgi#tomcat-5.5 
Sources: http://jakarta.apache.org/site/sourceindex.cgi#tomcat-5.5 

The Apache Jakarta Tomcat Team

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.c jk_shm.h jk_status.c jk_uri_worker_map.c jk_uri_worker_map.h

[mturk]

mturk   2005/02/20 10:31:22

  Modified:jk/native/common jk_shm.c jk_shm.h jk_status.c
jk_uri_worker_map.c jk_uri_worker_map.h
  Log:
  Remove shared memory uri mappings. Dynamic update will not work
  for multi child servers. Updates will be done rereading uriworkermap
  properties file.
  
  Revision  ChangesPath
  1.16  +1 -17 jakarta-tomcat-connectors/jk/native/common/jk_shm.c
  
  Index: jk_shm.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- jk_shm.c  20 Feb 2005 12:21:10 -  1.15
  +++ jk_shm.c  20 Feb 2005 18:31:21 -  1.16
  @@ -35,7 +35,6 @@
   size_t pos;
   unsigned int childs;
   unsigned int workers;
  -unsigned int urimaps;
   time_t modified;
   char   buf[1];
   };
  @@ -419,18 +418,3 @@
   }
   return w;
   }
  -
  -jk_shm_urimap_t *jk_shm_alloc_urimap(jk_pool_t *p)
  -{
  -jk_shm_urimap_t *u = (jk_shm_urimap_t *)jk_shm_alloc(p, 
sizeof(jk_shm_urimap_t));
  -if (u) {
  -memset(u, 0, sizeof(jk_shm_urimap_t));
  -if (jk_shmem.hdr) {
  -jk_shmem.hdr->urimaps++;
  -u->id = jk_shmem.hdr->urimaps;
  -}
  -else
  -u->id = -1;
  -}
  -return u;
  -}
  
  
  
  1.15  +1 -15 jakarta-tomcat-connectors/jk/native/common/jk_shm.h
  
  Index: jk_shm.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_shm.h  20 Feb 2005 12:21:10 -  1.14
  +++ jk_shm.h  20 Feb 2005 18:31:21 -  1.15
  @@ -88,15 +88,6 @@
   };
   typedef struct jk_shm_worker jk_shm_worker_t;
   
  -/** jk shm uri worker map record structure */
  -struct jk_shm_urimap
  -{
  -int  id;
  -int  worker_id;
  -unsigned int match_type;
  -};
  -typedef struct jk_shm_urimap jk_shm_urimap_t;
  -
   const char *jk_shm_name();
   
   /* Open the shared memory creating file if needed
  @@ -122,11 +113,6 @@
*/
   jk_shm_worker_t *jk_shm_alloc_worker(jk_pool_t *p);
   
  -/* allocate shm uri worker map record
  - * If there is no shm present the pool will be used instead
  - */
  -jk_shm_urimap_t *jk_shm_alloc_urimap(jk_pool_t *p);
  -
   /* Return workers.properties last modified time
*/
   time_t jk_shm_get_workers_time();
  
  
  
  1.21  +4 -19 jakarta-tomcat-connectors/jk/native/common/jk_status.c
  
  Index: jk_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- jk_status.c   20 Feb 2005 13:57:14 -  1.20
  +++ jk_status.c   20 Feb 2005 18:31:21 -  1.21
  @@ -324,16 +324,13 @@
   unsigned int i;
   
   jk_puts(s, "Uri Mappings:\n");
  -jk_puts(s, "DisabledMatch 
TypeUri\n");
  +jk_puts(s, "Match TypeUri\n");
   for (i = 0; i < uwmap->size; i++) {
   uri_worker_record_t *uwr = uwmap->maps[i];
   if (strcmp(uwr->worker_name, worker))
   continue;
  -jk_printf(s, "s->match_type & MATCH_TYPE_DISABLED)
  -jk_puts(s, " checked");
  -jk_putv(s, ">",
  -status_val_match(uwr->s->match_type),
  +jk_putv(s, "",
  +status_val_match(uwr->match_type),
   "", NULL);
   jk_puts(s, uwr->uri);
   jk_puts(s, "\n");
  @@ -541,7 +538,6 @@
 const char *dworker, jk_logger_t *l)
   {
   int i;
  -unsigned int j;
   char buf[1024];
   const char *b;
   lb_worker_t *lb;
  @@ -557,17 +553,6 @@
   lb->s->recover_wait_time = i;
   lb->s->sticky_session = status_bool("ls", s->query_string);
   lb->s->sticky_session_force = status_bool("lf", s->query_string);
  -for (j = 0; j < s->uw_map->size; j++) {
  -uri_worker_record_t *uwr = s->uw_map->maps[j];
  -if (strcmp(uwr->worker_name, dworker))
  -continue;
  -sprintf(buf, "mi%d", j);
  -if (status_bool(buf, s->query_string))
  -uwr->s->match_type |= MATCH_TYPE_DISABLED;
  -else
  -uwr->s->match_type &= ~MATCH_TYPE_DISABLED;
  -
  -}
   }
   else  {
   int n = status_int("lb", s->query_string, -1);
  
  
  
  1.48  +18 -26
jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c
  
  Index: jk_uri_worker_map.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_work

Re: 5.5.8 tagged, cut, uploaded...

[Remy Maucherat]

Yoav Shapira wrote:
... per the usual routine.  I'll give the mirrors some time to synch before I
make the official release announcement.
I notice there's all sorts of junk in the conf folder. This should be 
cleaned up in the next build ;)

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c

[mturk]

mturk   2005/02/20 05:57:14

  Modified:jk/native/common jk_status.c
  Log:
  Fix displaying uri maps for worker.
  
  Revision  ChangesPath
  1.20  +16 -15jakarta-tomcat-connectors/jk/native/common/jk_status.c
  
  Index: jk_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- jk_status.c   20 Feb 2005 12:21:51 -  1.19
  +++ jk_status.c   20 Feb 2005 13:57:14 -  1.20
  @@ -322,8 +322,9 @@
const char *worker, jk_logger_t *l)
   {
   unsigned int i;
  -
  -jk_puts(s, "Uri mappings\n");
  +
  +jk_puts(s, "Uri Mappings:\n");
  +jk_puts(s, "DisabledMatch 
TypeUri\n");
   for (i = 0; i < uwmap->size; i++) {
   uri_worker_record_t *uwr = uwmap->maps[i];
   if (strcmp(uwr->worker_name, worker))
  @@ -331,11 +332,13 @@
   jk_printf(s, "s->match_type & MATCH_TYPE_DISABLED)
   jk_puts(s, " checked");
  -jk_putv(s, ">", status_val_match(uwr->s->match_type),
  +jk_putv(s, ">",
  +status_val_match(uwr->s->match_type),
   "", NULL);
   jk_puts(s, uwr->uri);
   jk_puts(s, "\n");
   }
  +jk_puts(s, "\n");
   }
   
   
  @@ -431,8 +434,8 @@
   jk_putv(s, "", status_strfsize(wr->s->transferred, buf),
   "", NULL);
   jk_putv(s, "", status_strfsize(wr->s->readed, buf),
  -"", NULL);
  -jk_printf(s, "%u", wr->s->busy);
  +"", NULL);
  +jk_printf(s, "%u", wr->s->busy);
   jk_puts(s, wr->s->redirect);
   jk_puts(s, "\n");
   jk_puts(s, wr->s->domain);
  @@ -466,11 +469,11 @@
   if (wr->s->is_disabled)
   jk_puts(s, " checked");
   jk_puts(s, ">\n");
  +jk_puts(s, "\n\n");
  +
   display_maps(s, sw, s->uw_map, wr->s->name, l);
   
  -jk_puts(s, " \n");
  -jk_puts(s, "");
  -jk_puts(s, "\n\n\n");
  +jk_puts(s, "\n\n");
   
   }
   else if (dworker && strcmp(dworker, sw->we->worker_list[i]) == 
0) {
  @@ -498,12 +501,10 @@
   if (lb->s->sticky_session_force)
   jk_puts(s, " checked");
   jk_puts(s, ">\n");
  +jk_puts(s, "\n\n");
   
   display_maps(s, sw, s->uw_map, dworker, l);
  -
  -jk_puts(s, " \n");
  -jk_puts(s, "");
  -jk_puts(s, "\n\n\n");
  +jk_puts(s, "\n");
   }
   }
   else {
  @@ -565,7 +566,7 @@
   uwr->s->match_type |= MATCH_TYPE_DISABLED;
   else
   uwr->s->match_type &= ~MATCH_TYPE_DISABLED;
  -
  +
   }
   }
   else  {
  @@ -589,7 +590,7 @@
   for (i = 0; i < (int)lb->num_of_workers; i++) {
   if (strcmp(dworker, lb->lb_workers[i].s->name) == 0) {
   wr = &(lb->lb_workers[i]);
  -break;
  +break;
   }
   }
   }
  
  
  

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

Re: Visibility of resources under WEB-INF/classes

[Rico]

Hi.

When I use my own 

Tomcat cannot find the resources as follows:
C:\myWebApp\WEB-INF\classes\hibernate.cfg.xml and
C:\myWebApp\WEB-INF\classes\log4j.properties

Is that supposed to be the case?

And when I install the web application to
/webapps/ then it can find

/webapps//WEB-INF/classes/hibernate.cfg.xml and
/webapps//WEB-INF/classes/log4j.properties

which I'm happy about but spent a lot of time to get to.

Is there some further attributes for a  in the case where
docBase isn't /webapps/ ?

Rico.


> --- Rico <[EMAIL PROTECTED]> wrote:
> 
> > Hello Everyone.
> > I'm using Tomcat 4.1.31, and observed a similar
> > problem on 4.1.18.
> > 
> > It is possible to deploy web applications to a
> > location of one's
> > choice, other than
> > /webapps/, by adding
> > a  to server.xml. 
> > With such a setup, I've been stuck with Tomcat not
> > seeing resources
> > that the documentation on their respective websites
> > claim to be just
> > a matter of placing in WEB-INF/classes and people
> > confirming success at it.
> > Examples are log4j.properties, hibernate.properties
> > and hibernate.cfg.xml.
> > 
> > So, is this the expected behaviour?
> > If I install the web application in e.g c:\\myWebApp
> > I'd consistently have Tomcat complaining as follows:
> > 
> > INFO [http-8080-Processor25] cfg.Environment
> > (:483)
> > - Hibernate 2.1.8
> > INFO [http-8080-Processor25] cfg.Environment
> > (:512)
> > - hibernate.properties not found
> > INFO [http-8080-Processor25] cfg.Environment
> > (:543)
> > - using CGLIB reflection optimizer
> > INFO [http-8080-Processor25] cfg.Environment
> > (:572)
> > - using JDK 1.4 java.sql.Timestamp handling
> > INFO [http-8080-Processor25] cfg.Configuration
> > (configure:909)
> > - configuring from resource: /hibernate.cfg.xml
> > INFO [http-8080-Processor25] cfg.Configuration
> > (getConfigurationInputStream:881)
> > - Configuration resource: /hibernate.cfg.xml
> > WARN [http-8080-Processor25] cfg.Configuration
> > (getConfigurationInputStream:885)
> > - /hibernate.cfg.xml not found
> > ERROR [http-8080-Processor25]
> > persistence.HibernateUtil (:19)
> > - Initial SessionFactory creation failed.
> > net.sf.hibernate.HibernateException:
> > /hibernate.cfg.xml not found
> > 
> > Possible workaround's include initialization servlet
> > for log4j and
> > use of ResourceBundle to pass in an absolute path
> > for Hibernate.
> > But still, the documentation says place the config
> > files under WEB-INF/classes
> > and they'll be found...
> > Not so, unless it's
> > /webapps/WEB-INF/classes.
> > 
> > Rico.

__
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com 

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_uri_worker_map.c

[mturk]

mturk   2005/02/20 04:48:51

  Modified:jk/native/common jk_uri_worker_map.c
  Log:
  Ensure there are no duplicates entries for uriworker map.
  
  Revision  ChangesPath
  1.47  +34 -12
jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c
  
  Index: jk_uri_worker_map.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- jk_uri_worker_map.c   20 Feb 2005 12:21:10 -  1.46
  +++ jk_uri_worker_map.c   20 Feb 2005 12:48:51 -  1.47
  @@ -95,7 +95,7 @@
   unsigned i;
   
   for (i = 0; i < uw_map->size; i++) {
  -if (MATCH_TYPE_SUFFIX == uw_map->maps[i]->s->match_type) {
  +if (uw_map->maps[i]->s->match_type == MATCH_TYPE_SUFFIX) {
   char *suffix_start;
   for (suffix_start = strstr(uri, uw_map->maps[i]->suffix);
suffix_start;
  @@ -217,19 +217,46 @@
   int uri_worker_map_add(jk_uri_worker_map_t *uw_map,
  const char *puri, const char *worker, jk_logger_t *l)
   {
  -uri_worker_record_t *uwr;
  +uri_worker_record_t *uwr = NULL;
   char *uri;
   unsigned int match_type = 0;
  +unsigned int i;
  +int allocated = 0;
   
   JK_TRACE_ENTER(l);
  +
  +if (*puri == '!') {
  +match_type = MATCH_TYPE_NO_MATCH;
  +puri++;
  +}
  +
  +/* Find if duplicate entry */
  +for (i = 0; i < uw_map->size; i++) {
  +uwr = uw_map->maps[i];
  +if (strcmp(uwr->uri, puri) == 0) {
  +if (strcmp(uwr->worker_name, worker) == 0) {
  +jk_log(l, JK_LOG_DEBUG,
  +   "map rule %s=%s already exists",
  +   puri, worker);
  +JK_TRACE_EXIT(l);
  +return JK_TRUE;
  +}
  +else {
  +jk_log(l, JK_LOG_DEBUG,
  +   "changing map rule %s=%s ",
  +   puri, worker);
  +uwr->worker_name = worker;
  +JK_TRACE_EXIT(l);
  +return JK_TRUE;
  +}
  +}
  +}
   if (uri_worker_map_realloc(uw_map) == JK_FALSE) {
   JK_TRACE_EXIT(l);
   return JK_FALSE;
   }
  -uwr =
  -(uri_worker_record_t *) jk_pool_alloc(&uw_map->p,
  -  sizeof(uri_worker_record_t));
  -
  +uwr = (uri_worker_record_t *)jk_pool_alloc(&uw_map->p,
  +sizeof(uri_worker_record_t));
   if (!uwr) {
   jk_log(l, JK_LOG_ERROR,
  "can't alloc map entry");
  @@ -238,11 +265,6 @@
   }
   uwr->suffix = NULL;
   
  -if (*puri == '!') {
  -match_type = MATCH_TYPE_NO_MATCH;
  -puri++;
  -}
  -
   uri = jk_pool_strdup(&uw_map->p, puri);
   if (!uri || !worker) {
   jk_log(l, JK_LOG_ERROR,
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c

[mturk]

mturk   2005/02/20 04:21:51

  Modified:jk/native/common jk_status.c
  Log:
  Display uri mappings with type and status for each worker.
  
  Revision  ChangesPath
  1.19  +72 -4 jakarta-tomcat-connectors/jk/native/common/jk_status.c
  
  Index: jk_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- jk_status.c   19 Feb 2005 08:12:29 -  1.18
  +++ jk_status.c   20 Feb 2005 12:21:51 -  1.19
  @@ -32,6 +32,7 @@
   #include "jk_ajp13_worker.h"
   #include "jk_ajp14_worker.h"
   #include "jk_connect.h"
  +#include "jk_uri_worker_map.h"
   
   #define HUGE_BUFFER_SIZE (8*1024)
   
  @@ -213,6 +214,28 @@
   return "OK";
   }
   
  +static const char *status_val_match(unsigned int match)
  +{
  +if (match & MATCH_TYPE_DISABLED)
  +return "Disabled";
  +else if (match & MATCH_TYPE_NO_MATCH)
  +return "Unmount";
  +else if (match & MATCH_TYPE_EXACT)
  +return "Exact";
  +else if (match & MATCH_TYPE_CONTEXT)
  +return "Context";
  +else if (match & MATCH_TYPE_CONTEXT_PATH)
  +return "Context Path";
  +else if (match & MATCH_TYPE_SUFFIX)
  +return "Suffix";
  +else if (match & MATCH_TYPE_GENERAL_SUFFIX)
  +return "General Suffix";
  +else if (match & MATCH_TYPE_WILDCHAR_PATH)
  +return "Wildchar";
  +else
  +return "Error";
  +}
  +
   static void jk_puts(jk_ws_service_t *s, const char *str)
   {
   if (str)
  @@ -294,6 +317,28 @@
   return rv;
   }
   
  +static void display_maps(jk_ws_service_t *s, status_worker_t *sw,
  + jk_uri_worker_map_t *uwmap,
  + const char *worker, jk_logger_t *l)
  +{
  +unsigned int i;
  +
  +jk_puts(s, "Uri mappings\n");
  +for (i = 0; i < uwmap->size; i++) {
  +uri_worker_record_t *uwr = uwmap->maps[i];
  +if (strcmp(uwr->worker_name, worker))
  +continue;
  +jk_printf(s, "s->match_type & MATCH_TYPE_DISABLED)
  +jk_puts(s, " checked");
  +jk_putv(s, ">", status_val_match(uwr->s->match_type),
  +"", NULL);
  +jk_puts(s, uwr->uri);
  +jk_puts(s, "\n");
  +}
  +}
  +
  +
   /**
* Command line reference:
* cmd=list (default) display configuration
  @@ -421,6 +466,7 @@
   if (wr->s->is_disabled)
   jk_puts(s, " checked");
   jk_puts(s, ">\n");
  +display_maps(s, sw, s->uw_map, wr->s->name, l);
   
   jk_puts(s, " \n");
   jk_puts(s, "");
  @@ -453,7 +499,7 @@
   jk_puts(s, " checked");
   jk_puts(s, ">\n");
   
  -/* TODO: display uri mappings with checkbox for disable */
  +display_maps(s, sw, s->uw_map, dworker, l);
   
   jk_puts(s, " \n");
   jk_puts(s, "");
  @@ -494,6 +540,7 @@
 const char *dworker, jk_logger_t *l)
   {
   int i;
  +unsigned int j;
   char buf[1024];
   const char *b;
   lb_worker_t *lb;
  @@ -509,6 +556,17 @@
   lb->s->recover_wait_time = i;
   lb->s->sticky_session = status_bool("ls", s->query_string);
   lb->s->sticky_session_force = status_bool("lf", s->query_string);
  +for (j = 0; j < s->uw_map->size; j++) {
  +uri_worker_record_t *uwr = s->uw_map->maps[j];
  +if (strcmp(uwr->worker_name, dworker))
  +continue;
  +sprintf(buf, "mi%d", j);
  +if (status_bool(buf, s->query_string))
  +uwr->s->match_type |= MATCH_TYPE_DISABLED;
  +else
  +uwr->s->match_type &= ~MATCH_TYPE_DISABLED;
  +
  +}
   }
   else  {
   int n = status_int("lb", s->query_string, -1);
  @@ -552,7 +610,6 @@
   if (i > 0)
   wr->s->lb_factor = i;
   }
  -
   }
   
   static int status_cmd_type(const char *req)
  @@ -598,8 +655,19 @@
   cmd = status_cmd_type(s->query_string);
   if (cmd > 0 && (status_cmd("w", s->query_string, buf, sizeof(buf)) 
!= NULL))
   worker = strdup(buf);
  -if (cmd == 2 && worker)
  +if (cmd == 2 && worker) {
  +/* lock shared memory */
  +jk_shm_lock();
   update_worker(s, p->s_worker, worker, l);
  +/* update modification time to reflect the current config */
  +jk_shm_set_workers_time(time(NULL));
  +/* Since we updated the config no need to reload
  + * on the next request
  + */
  +jk_shm_sync_access_time();
  +/* unlock the shared memory */
  +  

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.c jk_shm.h jk_uri_worker_map.c jk_uri_worker_map.h

[mturk]

mturk   2005/02/20 04:21:10

  Modified:jk/native/common jk_shm.c jk_shm.h jk_uri_worker_map.c
jk_uri_worker_map.h
  Log:
  Use shared memory for uri mappings. It stores only the match type
  inside shared memory to be able to disable particular map at runtime.
  Adding new maps will be done rereading uriworkermaps file.
  
  Revision  ChangesPath
  1.15  +19 -2 jakarta-tomcat-connectors/jk/native/common/jk_shm.c
  
  Index: jk_shm.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_shm.c  17 Feb 2005 15:03:15 -  1.14
  +++ jk_shm.c  20 Feb 2005 12:21:10 -  1.15
  @@ -20,7 +20,9 @@
* Version: $Revision$   *
***/
   
  +#include "jk_global.h"
   #include "jk_pool.h"
  +#include "jk_util.h"
   #include "jk_mt.h"
   #include "jk_shm.h"
   
  @@ -33,7 +35,6 @@
   size_t pos;
   unsigned int childs;
   unsigned int workers;
  -
   unsigned int urimaps;
   time_t modified;
   char   buf[1];
  @@ -58,6 +59,7 @@
   static const char shm_signature[] = { JK_SHM_MAGIC };
   static jk_shm_t jk_shmem = { 0, NULL, -1, -1, 0, NULL};
   static time_t jk_workers_modified_time = 0;
  +static time_t jk_workers_access_time = 0;
   
   #if defined (WIN32) || defined(NETWARE)
   
  @@ -366,6 +368,21 @@
   jk_shmem.hdr->modified = t;
   else
   jk_workers_modified_time = t;
  +jk_workers_access_time = t;
  +}
  +
  +int jk_shm_is_modified()
  +{
  +time_t m = jk_shm_get_workers_time();
  +if (m != jk_workers_access_time)
  +return 1;
  +else
  +return 0;
  +}
  +
  +void jk_shm_sync_access_time()
  +{
  +jk_workers_access_time = jk_shm_get_workers_time();
   }
   
   int jk_shm_lock()
  
  
  
  1.14  +15 -5 jakarta-tomcat-connectors/jk/native/common/jk_shm.h
  
  Index: jk_shm.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jk_shm.h  19 Feb 2005 08:12:29 -  1.13
  +++ jk_shm.h  20 Feb 2005 12:21:10 -  1.14
  @@ -92,11 +92,8 @@
   struct jk_shm_urimap
   {
   int  id;
  +int  worker_id;
   unsigned int match_type;
  -size_t   ctxt_len;
  -char context[JK_SHM_URI_SIZ+1];
  -char worker[JK_SHM_STR_SIZ+1];
  -char suffix[JK_SHM_STR_SIZ+1];
   };
   typedef struct jk_shm_urimap jk_shm_urimap_t;
   
  @@ -138,6 +135,19 @@
*/
   void jk_shm_set_workers_time(time_t t);
   
  +/* Check if the shared memory has been modified
  + * by some other process.
  + */
  +int jk_shm_is_modified();
  +
  +/* Synchronize access and modification time.
  + * This function should be called when the shared memory
  + * is modified and after we update the config acording
  + * to the current shared memory data.
  + */
  +void jk_shm_sync_access_time();
  +
  +
   /* Lock shared memory for thread safe access */
   int jk_shm_lock();
   
  
  
  
  1.46  +72 -120   
jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c
  
  Index: jk_uri_worker_map.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- jk_uri_worker_map.c   12 Feb 2005 19:29:08 -  1.45
  +++ jk_uri_worker_map.c   20 Feb 2005 12:21:10 -  1.46
  @@ -26,15 +26,6 @@
   #include "jk_util.h"
   #include "jk_uri_worker_map.h"
   
  -#define MATCH_TYPE_EXACT(0)
  -#define MATCH_TYPE_CONTEXT  (1)
  -#define MATCH_TYPE_SUFFIX   (2)
  -#define MATCH_TYPE_GENERAL_SUFFIX (3)   /* match all URIs of the form *ext */
  -/* match all context path URIs with a path component suffix */
  -#define MATCH_TYPE_CONTEXT_PATH (4)
  -/* match multiple wild characters (*) and (?) */
  -#define MATCH_TYPE_WILDCHAR_PATH (5)
  -
   #ifdef WIN32
   #define JK_STRCMP   strcasecmp
   #define JK_STRNCMP  strnicmp
  @@ -43,59 +34,11 @@
   #define JK_STRNCMP  strncmp
   #endif
   
  -struct uri_worker_record
  -{
  -/* Original uri for logging */
  -char *uri;
  -
  -/* Name of worker mapped */
  -const char *worker_name;
  -
  -/* Suffix of uri */
  -char *suffix;
  -
  -/* Base context */
  -char *context;
  -
  -/* char length of the context */
  -unsigned ctxt_len;
  -
  -int match_type;
  -
  -/* no map directive */
  -int no_match;
  -};
  -
  -typedef struct uri_worker_record uri_worker_record_t;
  -
  -struct jk_uri_worker_

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c jk_map.h

[mturk]

mturk   2005/02/20 04:19:17

  Modified:jk/native/common jk_map.c jk_map.h
  Log:
  Add map id function. Returns the map slot number.
  
  Revision  ChangesPath
  1.29  +19 -1 jakarta-tomcat-connectors/jk/native/common/jk_map.c
  
  Index: jk_map.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- jk_map.c  12 Feb 2005 19:24:08 -  1.28
  +++ jk_map.c  20 Feb 2005 12:19:17 -  1.29
  @@ -156,6 +156,24 @@
   return (void *)rc;  /* DIRTY */
   }
   
  +int jk_map_get_id(jk_map_t *m, const char *name)
  +{
  +int rc = -1;
  +if (m && name) {
  +unsigned int i;
  +unsigned int key;
  +COMPUTE_KEY_CHECKSUM(name, key)
  +for (i = 0; i < m->size; i++) {
  +if (m->keys[i] == key && strcasecmp(m->names[i], name) == 0) {
  +rc = i;
  +break;
  +}
  +}
  +}
  +
  +return rc;
  +}
  +
   const char *jk_map_get_string(jk_map_t *m, const char *name, const char *def)
   {
   const char *rc = def;
  
  
  
  1.15  +3 -1  jakarta-tomcat-connectors/jk/native/common/jk_map.h
  
  Index: jk_map.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_map.h  6 Feb 2005 13:30:34 -   1.14
  +++ jk_map.h  20 Feb 2005 12:19:17 -  1.15
  @@ -43,6 +43,8 @@
   
   void *jk_map_get(jk_map_t *m, const char *name, const void *def);
   
  +int jk_map_get_id(jk_map_t *m, const char *name);
  +
   int jk_map_get_int(jk_map_t *m, const char *name, int def);
   
   double jk_map_get_double(jk_map_t *m, const char *name, double def);
  
  
  

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

[GUMP@brutus]: Project jakarta-tomcat-jk-native (in module jakarta-tomcat-connectors) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at [EMAIL PROTECTED]

Project jakarta-tomcat-jk-native has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 27 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- jakarta-tomcat-jk-native :  Connectors to various web servers


Full details are available at:

http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/gump_work/build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native.html
Work Name: build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native (Type: 
Build)
Work ended in a state of : Failed
Elapsed: 
Command Line: make 
[Working Directory: 
/usr/local/gump/public/workspace/jakarta-tomcat-connectors/jk/native]
-
Making all in common
make[1]: Entering directory 
`/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common'
/bin/sh 
/usr/local/gump/public/workspace/apache-httpd/dest-20022005/build/libtool 
--silent --mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-20022005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR 
-I/usr/local/gump/public/workspace/apr/dest-20022005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE 
-I/home/gump/workspaces2/public/workspace/apache-httpd/srclib/pcre -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp12_worker.c 
/usr/local/gump/public/workspace/apache-httpd/dest-20022005/build/libtool: 
/usr/local/gump/public/workspace/apache-httpd/dest-20022005/build/libtool: No 
such file or directory
make[1]: *** [jk_ajp12_worker.lo] Error 127
make[1]: Leaving directory 
`/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common'
make: *** [all-recursive] Error 1
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/rss.xml
- Atom: 
http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/atom.xml

== Gump Tracking Only ===
Produced by Gump version 2.2.
Gump Run 1920022005, brutus:brutus-public:1920022005
Gump E-mail Identifier (unique within run) #16.

--
Apache Gump
http://gump.apache.org/ [Instance: brutus]

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

JK1.2 source files 404

[Jonathan Lim]

Hi,

On several (I didn't test them all) mirrors I'm getting 404s for the
links to the JK 1.2 source files.

eg. 
ftp://ftp.mirrorservice.org/sites/ftp.apache.org/jakarta/tomcat-connectors/jk/jakarta-tomcat-connectors-jk-1.2-src-current.tar.gz

I eventually found this link which did work:
http://www.mirrorservice.org/sites/ftp.apache.org/jakarta/tomcat-connectors/jk/source/jakarta-tomcat-connectors-current-src.tar.gz

The webmaster suggested I mail here.

Thanks.
Jon
-- 
http://www.snowblink.co.uk/

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.c

[mturk]

mturk   2005/02/20 00:15:33

  Modified:jk/native/common jk_connect.c
  Log:
  Disable lingering on socket. This way the socket will be hard closed without
  waiting for delivery of remaining data.
  
  Revision  ChangesPath
  1.44  +19 -3 jakarta-tomcat-connectors/jk/native/common/jk_connect.c
  
  Index: jk_connect.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- jk_connect.c  19 Feb 2005 09:13:35 -  1.43
  +++ jk_connect.c  20 Feb 2005 08:15:33 -  1.44
  @@ -126,7 +126,10 @@
   char buf[32];
   int sock;
   int set = 1;
  -int ret;
  +int ret = 0;
  +#ifdef SO_LINGER
  +struct linger li;
  +#endif
   
   JK_TRACE_ENTER(l);
   
  @@ -215,7 +218,7 @@
* systems?
   */
   set = 1;
  -if (setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, (const char *)&set,
  +if (setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, (const char *)&set,
  sizeof(int))) {
   JK_GET_SOCKET_ERRNO();
   jk_log(l, JK_LOG_ERROR,
  @@ -225,6 +228,19 @@
   return -1;
   }
   #endif
  +#ifdef SO_LINGER
  +/* Make hard closesocket by disabling lingering */
  +li.l_linger = li.l_onoff = 0;
  +if (setsockopt(sock, SOL_SOCKET, SO_LINGER, (const char *)&li,
  +   sizeof(li))) {
  +JK_GET_SOCKET_ERRNO();
  +jk_log(l, JK_LOG_ERROR,
  +"failed setting SO_LINGER with errno=%d", errno);
  +jk_close_socket(sock);
  +JK_TRACE_EXIT(l);
  +return -1;
  +}
  +#endif
   /* Tries to connect to Tomcat (continues trying while error is EINTR) */
   do {
   if (JK_IS_DEBUG_LEVEL(l))
  
  
  

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