Re: MinTC, "terrible rudeness", persistence

2002-04-18 Thread Christopher K. St. John

"Craig R. McClanahan" wrote:
> 
> a discussion of whether you'd want
> to propose contributing MinTC to the standard distribution (so that it
> could be built from the same source repository, and probably packaged
> separately) -- either now or when you get a little further along at
> complete success in passing all the tests.
> 

 I was planning to bring it up after version 1.0 was out. That
makes it easier to judge the code. And, to be honest, until a
couple days ago I wasn't really sure MinTC could be made fully
spec compliant. Multiple classloaders hitting the same jar is
kind of funky around the edges (especially on bleeping PJAE,
which has the crazy 1.1 "classloaders will not expose .class files
through getResource()" restriction. They'll give you .clazz files,
though )

 I was thinking something like a "contrib" directory might be
neat, but that's getting a little ahead of things.


-- 
Christopher St. John [EMAIL PROTECTED]
DistribuTopia http://www.distributopia.com

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Pandora's box / can of worms etc.

2002-04-18 Thread Christopher K. St. John


 Sh*t. That was supposed to be private, I wasn't trying
to be cute. Apologies.

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: MinTC, "terrible rudeness", persistence

2002-04-18 Thread Bill Barker

Personally, I've rather enjoyed following MinTC's progress (OK, not really
following, since I haven't actually looked at the code :).  I could see how
someone might think it rude to post the announcement on tomcat-user (since
many people there are easily confused :), but IMHO MinTC is something that
we should see more of on tomcat-dev, not less.

MinTC is certainly not a competitor with Tomcat 4.x.  According to Costin,
Tomcat 3.3 almost runs under J2ME (I haven't tried it), but MinTC is a
different servlet spec than 3.3, so again, not a competitor.  I can't see
any good reason to block MinTC announcements given that they certainly
aren't abusing bandwidth.
- Original Message -
From: "Christopher K. St. John" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Thursday, April 18, 2002 7:58 PM
Subject: MinTC, "terrible rudeness", persistence


>
>  I've been informed by private email that I am "terribly
> rude" for making announcements of MinTC releases on the
> tomcat-dev list, and that I should not make any futher
> announcements.
>
>  So that's it then? I've been kicked off tomcat-dev (how
> does that work on an open source project!?) because I've
> offended someone by writing code they don't like!?!?
>
>  This is a bit of a problem for me, as MinTC is, technically,
> a version of Catalina, and should be a perfectly appropriate
> topic for tomcat-dev. Especially when it's one message every
> few weeks.
>
>  MinTC is certainly not a mainline version of Tomcat 4, but
> it shares a significant amount of (unforked) code, and that
> makes it important to seek a close relationship with the
> people maintaining the codebase. It's a bit like sharing a
> telephone booth with an 800 lb gorilla: it's a bit much to
> hope to have any influence over what phone calls are made,
> but at least you can hope to make your presence know so that
> you don't get sat on.
>
>  It's a dilemma: there's no point in having an antagonistic
> relationship with the core Tomcat developers, that's worse
> than nothing. But good grief! This is an opensource project!
> MinTC is a version of Catalina, where the heck else am I
> going to discuss it? I'm contributing bug fixes and code back
> to the core implementation, I'm helping to clean up the core
> interfaces, I'm using the Catalina code, I'm doing documentation
> work, but I'm not welcome? That seems so strange, and so sad.
>
>  I'd like to get some feedback from someone other than the
> person who wrote me privately. Craig? Could you give me an
> opinion please? You seem to have the moral leadership role
> here. Anybody else, please chime in. I'm horrified that I might
> have been being unknowingly rude, but I'm at a loss to explain
> how exactly I've caused such awful offense. I honestly don't
> get it.
>
>  Thanks, and please, as you think about your response, keep in
> mind that the Catalina proposal docs specifically talk about
> people doing exactly what MinTC does under the Catalina umbrella.
>
>  Thanks, and sorry for any inadvertant rudeness,
>
> -cks
>
> --
> To unsubscribe, e-mail:

> For additional commands, e-mail:

>


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Pandora's box / can of worms etc.

2002-04-18 Thread Christopher K. St. John

Paul Wallace wrote:
> 
> What is MinTC? Where can I get information on it?
> 

 So as not to add flames to the fire, I'm replying privately :-)

 http://www.distributopia.com/

 It's sort of a bizarro world Tomcat. It takes the Catalina
interfaces (Container,Connector,Valve,all the stuff in
the org.apache.catalina package) and reimplements it for use
in embedded (as in embedded-in-your-application, not embedded
in-your-toaster) environments. It's substantially smaller,
but it gets that by having substantially fewer features than
Tomcat 4.

 It's in alpha. And I mean serious, dirt-under-your-fingernails
after-you-compile-it-if-it-even-compiles alpha. But it's a lot
of fun, and you should check it out (it's got an Apache-style
license, Open Source, etc, etc)


-- 
Christopher St. John [EMAIL PROTECTED]
DistribuTopia http://www.distributopia.com

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Pandora's box / can of worms etc.

2002-04-18 Thread Paul Wallace

What is MinTC? Where can I get information on it?


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: MinTC, "terrible rudeness", persistence

2002-04-18 Thread Craig R. McClanahan

Personally, I don't have any problem with occasional announcements of
interesting things related to Tomcat on this list, and MinTC certainly
qualifies as "interesting" in my book!

As for the community as a whole, consensus usually forms rapidly when the
issue is aired publicly on the mailing list (instead of directly to the
poster).  That way, we'd quickly find out whether the person complaining
was really voicing a common sentiment, or out smoking something.  Does
whoever was concerned about this want to fess up and start that
discussion?

Even if the consensus is that these things were off topic, one way to
certainly make them on topic would be a discussion of whether you'd want
to propose contributing MinTC to the standard distribution (so that it
could be built from the same source repository, and probably packaged
separately) -- either now or when you get a little further along at
complete success in passing all the tests.

I'd also like to take the opportunity to thank you publicly for your many
contributions and suggestions -- one of the best things about my
experience with Tomcat has always been seeing the people who care deeply
enough about it to help improve its quality, instead of just whining and
complaining.

Craig


On Thu, 18 Apr 2002, Christopher K.  St.  John wrote:

> Date: Thu, 18 Apr 2002 19:58:26 -0700 (PDT)
> From: Christopher K.  St.  John <[EMAIL PROTECTED]>
> Reply-To: Tomcat Developers List <[EMAIL PROTECTED]>
> To: [EMAIL PROTECTED]
> Subject: MinTC, "terrible rudeness", persistence
>
>
>  I've been informed by private email that I am "terribly
> rude" for making announcements of MinTC releases on the
> tomcat-dev list, and that I should not make any futher
> announcements.
>
>  So that's it then? I've been kicked off tomcat-dev (how
> does that work on an open source project!?) because I've
> offended someone by writing code they don't like!?!?
>
>  This is a bit of a problem for me, as MinTC is, technically,
> a version of Catalina, and should be a perfectly appropriate
> topic for tomcat-dev. Especially when it's one message every
> few weeks.
>
>  MinTC is certainly not a mainline version of Tomcat 4, but
> it shares a significant amount of (unforked) code, and that
> makes it important to seek a close relationship with the
> people maintaining the codebase. It's a bit like sharing a
> telephone booth with an 800 lb gorilla: it's a bit much to
> hope to have any influence over what phone calls are made,
> but at least you can hope to make your presence know so that
> you don't get sat on.
>
>  It's a dilemma: there's no point in having an antagonistic
> relationship with the core Tomcat developers, that's worse
> than nothing. But good grief! This is an opensource project!
> MinTC is a version of Catalina, where the heck else am I
> going to discuss it? I'm contributing bug fixes and code back
> to the core implementation, I'm helping to clean up the core
> interfaces, I'm using the Catalina code, I'm doing documentation
> work, but I'm not welcome? That seems so strange, and so sad.
>
>  I'd like to get some feedback from someone other than the
> person who wrote me privately. Craig? Could you give me an
> opinion please? You seem to have the moral leadership role
> here. Anybody else, please chime in. I'm horrified that I might
> have been being unknowingly rude, but I'm at a loss to explain
> how exactly I've caused such awful offense. I honestly don't
> get it.
>
>  Thanks, and please, as you think about your response, keep in
> mind that the Catalina proposal docs specifically talk about
> people doing exactly what MinTC does under the Catalina umbrella.
>
>  Thanks, and sorry for any inadvertant rudeness,
>
> -cks
>
> --
> To unsubscribe, e-mail:   
> For additional commands, e-mail: 
>
>


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c

2002-04-18 Thread costin

costin  02/04/18 20:31:05

  Modified:jk/native2/server/isapi jk_isapi_plugin.c
  Log:
  Few more changes.
  
  I would brake the FilterProc in fewer smaller methods - and maybe move
  some code into jk_uriMap.c ( if it's general-purpose ) or remove it
  ( if it's already done in jk_uriMap.c.
  
  In the end, FilterProc should only call the uriMap - everything else
  should be shared.
  
  Revision  ChangesPath
  1.4   +75 -78
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_isapi_plugin.c 19 Apr 2002 00:23:45 -  1.3
  +++ jk_isapi_plugin.c 19 Apr 2002 03:31:05 -  1.4
  @@ -60,7 +60,7 @@
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Author:  Larry Isaacs <[EMAIL PROTECTED]>   *
* Author:  Ignacio J. Ortega <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.3 $   *
  + * Version: $Revision: 1.4 $   *
***/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -91,7 +91,6 @@
   static int   iis5 = -1;
   
   static jk_workerEnv_t *workerEnv;
  -static jk_logger_t *logger = NULL; 
   
   
   static char extension_uri[INTERNET_MAX_URL_LENGTH] = 
"/jakarta/isapi_redirector2.dll";
  @@ -185,6 +184,8 @@
   DWORD dwNotificationType, 
   LPVOID pvNotification)
   {
  +jk_env_t *env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
  +
   /* Initialise jk */
   if (is_inited && !is_mapread) {
   char serverName[MAX_SERVERNAME];
  @@ -207,9 +208,9 @@
   if (pfc->GetServerVariable(pfc,SERVER_SOFTWARE, serverSoftware, &dwLen)){
iis5=(atof(serverSoftware + 14) >= 5.0);
if (iis5) {
  - jk_log(logger, JK_LOG_INFO,"Detected IIS >= 5.0\n");
  + env->l->jkLog(env, env->l,  JK_LOG_INFO,"Detected IIS 
>= 5.0\n");
} else {
  - jk_log(logger, JK_LOG_INFO,"Detected IIS < 5.0\n");
  + env->l->jkLog(env, env->l,  JK_LOG_INFO,"Detected IIS 
< 5.0\n");
}
   }
   }
  @@ -246,7 +247,7 @@
}
   
   
  -jk_log(logger, JK_LOG_DEBUG, 
  +env->l->jkLog(env, env->l,  JK_LOG_DEBUG, 
  "HttpFilterProc started\n");
   
   
  @@ -259,7 +260,7 @@
   SetHeader(pfc, TOMCAT_TRANSLATE_HEADER_NAME, NULL);
   
   if (!GetHeader(pfc, "url", (LPVOID)uri, (LPDWORD)&sz)) {
  -jk_log(logger, JK_LOG_ERROR, 
  +env->l->jkLog(env, env->l,  JK_LOG_ERROR, 
  "HttpFilterProc error while getting the url\n");
   return SF_STATUS_REQ_ERROR;
   }
  @@ -274,7 +275,7 @@
   
   rc = unescape_url(uri);
   if (rc == BAD_REQUEST) {
  -jk_log(logger, JK_LOG_ERROR, 
  +env->l->jkLog(env, env->l,  JK_LOG_ERROR, 
  "HttpFilterProc [%s] contains one or more invalid escape 
sequences.\n", 
  uri);
   write_error_response(pfc,"400 Bad Request",
  @@ -282,7 +283,7 @@
   return SF_STATUS_REQ_FINISHED;
   }
   else if(rc == BAD_PATH) {
  -jk_log(logger, JK_LOG_EMERG, 
  +env->l->jkLog(env, env->l,  JK_LOG_EMERG, 
  "HttpFilterProc [%s] contains forbidden escape 
sequences.\n", 
  uri);
   write_error_response(pfc,"403 Forbidden",
  @@ -294,13 +295,13 @@
   if(GetHeader(pfc, "Host:", (LPVOID)Host, (LPDWORD)&szHost)) {
   strcat(snuri,Host);
   strcat(snuri,uri);
  -jk_log(logger, JK_LOG_DEBUG, 
  +env->l->jkLog(env, env->l,  JK_LOG_DEBUG, 
  "In HttpFilterProc Virtual Host redirection of %s\n", 
  snuri);
   //worker = map_uri_to_worker(uw_map, snuri, logger);
   }
   if (!worker) {
  -jk_log(logger, JK_LOG_DEBUG, 
  +env->l->jkLog(env, env->l,  JK_LOG_DEBUG, 
  "In HttpFilterProc test Default redirection of %s\n", 
  uri);
   //worker = map_uri_to_worker(uw_map, uri, logger);
  @@ -310,7 +311,7 @@

cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_iis.h

2002-04-18 Thread costin

costin  02/04/18 20:14:22

  Modified:jk/native2/server/isapi jk_iis.h
  Log:
  request_started duplicates ws_service->response_started
  Same for content_read.
  
  The only thing that is specific to iis is the lpEcp - and we
  can store it directly in ws_private.
  
  Revision  ChangesPath
  1.2   +0 -11 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h
  
  Index: jk_iis.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_iis.h  19 Apr 2002 00:23:45 -  1.1
  +++ jk_iis.h  19 Apr 2002 03:14:22 -  1.2
  @@ -73,17 +73,6 @@
   #endif /* __cplusplus */
   
   
  -
  -struct isapi_private_data {
  -jk_pool_t p;
  -int request_started;
  -unsigned bytes_read_so_far;
  -LPEXTENSION_CONTROL_BLOCK  lpEcb;
  -};
  -typedef struct isapi_private_data isapi_private_data_t;
  -
  -
  -
   #define VERSION_STRING "Jakarta/ISAPI/1.2Dev"
   
   #define DEFAULT_WORKER_NAME ("ajp13")
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




MinTC, "terrible rudeness", persistence

2002-04-18 Thread Christopher K. St. John


 I've been informed by private email that I am "terribly
rude" for making announcements of MinTC releases on the
tomcat-dev list, and that I should not make any futher
announcements. 

 So that's it then? I've been kicked off tomcat-dev (how
does that work on an open source project!?) because I've
offended someone by writing code they don't like!?!?

 This is a bit of a problem for me, as MinTC is, technically,
a version of Catalina, and should be a perfectly appropriate
topic for tomcat-dev. Especially when it's one message every
few weeks.

 MinTC is certainly not a mainline version of Tomcat 4, but
it shares a significant amount of (unforked) code, and that
makes it important to seek a close relationship with the
people maintaining the codebase. It's a bit like sharing a
telephone booth with an 800 lb gorilla: it's a bit much to
hope to have any influence over what phone calls are made,
but at least you can hope to make your presence know so that
you don't get sat on.

 It's a dilemma: there's no point in having an antagonistic
relationship with the core Tomcat developers, that's worse
than nothing. But good grief! This is an opensource project!
MinTC is a version of Catalina, where the heck else am I 
going to discuss it? I'm contributing bug fixes and code back
to the core implementation, I'm helping to clean up the core
interfaces, I'm using the Catalina code, I'm doing documentation
work, but I'm not welcome? That seems so strange, and so sad.

 I'd like to get some feedback from someone other than the
person who wrote me privately. Craig? Could you give me an
opinion please? You seem to have the moral leadership role
here. Anybody else, please chime in. I'm horrified that I might
have been being unknowingly rude, but I'm at a loss to explain
how exactly I've caused such awful offense. I honestly don't
get it.

 Thanks, and please, as you think about your response, keep in
mind that the Catalina proposal docs specifically talk about 
people doing exactly what MinTC does under the Catalina umbrella.

 Thanks, and sorry for any inadvertant rudeness,

-cks

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_requtil.c

2002-04-18 Thread costin

costin  02/04/18 19:36:48

  Modified:jk/native2/common jk_requtil.c
  Log:
  Moved code from the isapi connector.
  
  Common code in common/ dir :-)
  
  Revision  ChangesPath
  1.11  +256 -0jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c
  
  Index: jk_requtil.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jk_requtil.c  20 Mar 2002 23:41:32 -  1.10
  +++ jk_requtil.c  19 Apr 2002 02:36:48 -  1.11
  @@ -730,6 +730,262 @@
   return JK_FALSE; 
   }
   
  +/*  Request encoding  */
  +/* Moved from IIS adapter */
  +
  +#define T_OS_ESCAPE_PATH (4)
  +
  +static const unsigned char test_char_table[256] = {
  +0,14,14,14,14,14,14,14,14,14,15,14,14,14,14,14,14,14,14,14,
  +14,14,14,14,14,14,14,14,14,14,14,14,14,0,7,6,1,6,1,1,
  +9,9,1,0,8,0,0,10,0,0,0,0,0,0,0,0,0,0,8,15,
  +15,8,15,15,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
  +0,0,0,0,0,0,0,0,0,0,0,15,15,15,7,0,7,0,0,0,
  +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
  +0,0,0,15,7,15,1,14,6,6,6,6,6,6,6,6,6,6,6,6,
  +6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
  +6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
  +6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
  +6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
  +6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
  +6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6 
  +};
  +
  +#define TEST_CHAR(c, f)  (test_char_table[(unsigned)(c)] & (f))
  +
  +static const char c2x_table[] = "0123456789abcdef";
  +
  +static unsigned char *c2x(unsigned what, unsigned char *where)
  +{
  +*where++ = '%';
  +*where++ = c2x_table[what >> 4];
  +*where++ = c2x_table[what & 0xf];
  +return where;
  +}
  +
  +int jk_requtil_escapeUrl(const char *path, char *dest, int destsize)
  +{
  +const unsigned char *s = (const unsigned char *)path;
  +unsigned char *d = (unsigned char *)dest;
  +unsigned char *e = dest + destsize - 1;
  +unsigned char *ee = dest + destsize - 3;
  +unsigned c;
  +
  +while ((c = *s)) {
  + if (TEST_CHAR(c, T_OS_ESCAPE_PATH)) {
  +if (d >= ee )
  +return JK_FALSE;
  + d = c2x(c, d);
  + }
  + else {
  +if (d >= e )
  +return JK_FALSE;
  + *d++ = c;
  + }
  + ++s;
  +}
  +*d = '\0';
  +return JK_TRUE;
  +}
  +
  +/* XXX Make it a default checking in uri worker map
  + */
  +int jk_requtil_uriIsWebInf(char *uri)
  +{
  +char *c = uri;
  +while(*c) {
  +*c = tolower(*c);
  +c++;
  +}
  +if(strstr(uri, "web-inf")) {
  +return JK_TRUE;
  +}
  +if(strstr(uri, "meta-inf")) {
  +return JK_TRUE;
  +}
  +
  +return JK_FALSE;
  +}
  +
  +static char x2c(const char *what)
  +{
  +register char digit;
  +
  +digit = ((what[0] >= 'A') ? ((what[0] & 0xdf) - 'A') + 10 : (what[0] - '0'));
  +digit *= 16;
  +digit += (what[1] >= 'A' ? ((what[1] & 0xdf) - 'A') + 10 : (what[1] - '0'));
  +return (digit);
  +}
  +
  +int jk_requtil_unescapeUrl(char *url)
  +{
  +register int x, y, badesc, badpath;
  +
  +badesc = 0;
  +badpath = 0;
  +for (x = 0, y = 0; url[y]; ++x, ++y) {
  +if (url[y] != '%')
  +url[x] = url[y];
  +else {
  +if (!isxdigit(url[y + 1]) || !isxdigit(url[y + 2])) {
  +badesc = 1;
  +url[x] = '%';
  +}
  +else {
  +url[x] = x2c(&url[y + 1]);
  +y += 2;
  +if (url[x] == '/' || url[x] == '\0')
  +badpath = 1;
  +}
  +}
  +}
  +url[x] = '\0';
  +if (badesc)
  +return -1;
  +else if (badpath)
  +return -2;
  +else
  +return 0;
  +}
  +
  +void jk_requtil_getParents(char *name)
  +{
  +int l, w;
  +
  +/* Four paseses, as per RFC 1808 */
  +/* a) remove ./ path segments */
  +
  +for (l = 0, w = 0; name[l] != '\0';) {
  +if (name[l] == '.' && name[l + 1] == '/' && (l == 0 || name[l - 1] == '/'))
  +l += 2;
  +else
  +name[w++] = name[l++];
  +}
  +
  +/* b) remove trailing . path, segment */
  +if (w == 1 && name[0] == '.')
  +w--;
  +else if (w > 1 && name[w - 1] == '.' && name[w - 2] == '/')
  +w--;
  +name[w] = '\0';
  +
  +/* c) remove all xx/../ segments. (including leading ../ and /../) */
  +l = 0;
  +
  +while (name[l] != '\0') {
  +if (name[l] == '.' && name[l + 1] == '.' && name[l + 2] == '/' &&
  +(l == 0 || name[l - 1] == '/')) {
  +register int m = l + 3, n;
  +
  +l = l - 2;
  +if (l

cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_requtil.h

2002-04-18 Thread costin

costin  02/04/18 19:36:23

  Modified:jk/native2/include jk_requtil.h
  Log:
  Moved some of the utils that were in iis to common.
  
  This will avoid future duplication. And will allow more servers to
  use more common code.
  
  In particular checking for web-inf and meta-inf MUST be integrated
  into the main mapper and changed ( so it doesn't alter the original uri ).
  
  Few other things will likely be usefull in other components.
  
  Revision  ChangesPath
  1.6   +15 -0 jakarta-tomcat-connectors/jk/native2/include/jk_requtil.h
  
  Index: jk_requtil.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_requtil.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jk_requtil.h  20 Mar 2002 23:44:00 -  1.5
  +++ jk_requtil.h  19 Apr 2002 02:36:23 -  1.6
  @@ -174,6 +174,21 @@
unsigned char   *buf,
unsigned len);
   
  +int jk_requtil_escapeUrl(const char *path, char *dest, int destsize);
  +
  +int jk_requtil_unescapeUrl(char *url);
  +
  +int jk_requtil_uriIsWebInf(char *uri);
  +
  +void jk_requtil_getParents(char *name);
  +
  +/** return the size of the encoding of a certificate */
  +int jk_requtil_base64CertLen(int len);
  +
  +/** Do a base-64 encoding of the certificate */
  +int jk_requtil_base64EncodeCert(char *encoded,
  +const unsigned char *string, int len);
  +
   #ifdef __cplusplus
   }
   #endif /* __cplusplus */
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c

2002-04-18 Thread costin

costin  02/04/18 19:34:38

  Modified:jk/native2/server/isapi jk_service_iis.c
  Log:
  Update, after merging few dozens cvs conflicts :-)
  
  Nacho already did most of the changes - I moved some stuff that is
  not iis-specific in common and tried to reduce it to the essential.
  
  Revision  ChangesPath
  1.4   +227 -454  
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
  
  Index: jk_service_iis.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_service_iis.c  19 Apr 2002 00:23:45 -  1.3
  +++ jk_service_iis.c  19 Apr 2002 02:34:38 -  1.4
  @@ -59,8 +59,7 @@
* Description: IIS Jk2 Service 
* Author:  Gal Shachor <[EMAIL PROTECTED]>   
*  Henri Gomez <[EMAIL PROTECTED]> 
  - *   Ignacio J. Ortega <[EMAIL PROTECTED]>
  - * Version: $Revision: 1.3 $   
  + *   Ignacio J. Ortega <[EMAIL PROTECTED]>
*/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -71,7 +70,7 @@
   #include 
   
   #include "jk_global.h"
  -//#include "jk_util.h"
  +#include "jk_requtil.h"
   #include "jk_map.h"
   #include "jk_pool.h"
   #include "jk_env.h"
  @@ -79,387 +78,134 @@
   #include "jk_worker.h"
   
   #include "jk_iis.h"
  -//#include "jk_uri_worker_map.h"
   
   
   static char *SERVER_NAME = "SERVER_NAME";
   static char *SERVER_SOFTWARE = "SERVER_SOFTWARE";
   
  -static const char begin_cert [] = 
  - "-BEGIN CERTIFICATE-\r\n";
   
  -static const char end_cert [] = 
  - "-END CERTIFICATE-\r\n";
  -
  -static const char basis_64[] =
  -"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
  -
  -static int base64_encode_cert_len(int len)
  -{
  - int n = ((len + 2) / 3 * 4) + 1; // base64 encoded size
  - n += (n + 63 / 64) * 2; // add CRLF's
  - n += sizeof(begin_cert) + sizeof(end_cert) - 2;  // add enclosing strings.
  -return n;
  -}
  -
  -static int base64_encode_cert(char *encoded,
  -  const unsigned char *string, int len)
  -{
  -int i,c;
  -char *p;
  - const char *t;
  -
  -p = encoded;
  -
  - t = begin_cert;
  - while (*t != '\0')
  - *p++ = *t++;
  -
  -c = 0;
  -for (i = 0; i < len - 2; i += 3) {
  -*p++ = basis_64[(string[i] >> 2) & 0x3F];
  -*p++ = basis_64[((string[i] & 0x3) << 4) |
  -((int) (string[i + 1] & 0xF0) >> 4)];
  -*p++ = basis_64[((string[i + 1] & 0xF) << 2) |
  -((int) (string[i + 2] & 0xC0) >> 6)];
  -*p++ = basis_64[string[i + 2] & 0x3F];
  -c += 4;
  -if ( c >= 64 ) {
  -*p++ = '\r';
  -*p++ = '\n';
  -c = 0;
  - }
  -}
  -if (i < len) {
  -*p++ = basis_64[(string[i] >> 2) & 0x3F];
  -if (i == (len - 1)) {
  -*p++ = basis_64[((string[i] & 0x3) << 4)];
  -*p++ = '=';
  -}
  -else {
  -*p++ = basis_64[((string[i] & 0x3) << 4) |
  -((int) (string[i + 1] & 0xF0) >> 4)];
  -*p++ = basis_64[((string[i + 1] & 0xF) << 2)];
  -}
  -*p++ = '=';
  -c++;
  -}
  -if ( c != 0 ) {
  -*p++ = '\r';
  -*p++ = '\n';
  -}
  -
  - t = end_cert;
  - while (*t != '\0')
  - *p++ = *t++;
  -
  -*p++ = '\0';
  -return p - encoded;
  -}
  -
  -
  -static char x2c(const char *what)
  -{
  -register char digit;
  -
  -digit = ((what[0] >= 'A') ? ((what[0] & 0xdf) - 'A') + 10 : (what[0] - '0'));
  -digit *= 16;
  -digit += (what[1] >= 'A' ? ((what[1] & 0xdf) - 'A') + 10 : (what[1] - '0'));
  -return (digit);
  -}
  -
  -static int unescape_url(char *url)
  -{
  -register int x, y, badesc, badpath;
  -
  -badesc = 0;
  -badpath = 0;
  -for (x = 0, y = 0; url[y]; ++x, ++y) {
  -if (url[y] != '%')
  -url[x] = url[y];
  -else {
  -if (!isxdigit(url[y + 1]) || !isxdigit(url[y + 2])) {
  -badesc = 1;
  -url[x] = '%';
  -}
  -else {
  -url[x] = x2c(&url[y + 1]);
  -y += 2;
  -if (url[x] == '/' || url[x] == '\0')
  -badpath = 1;
  -}
  -}
  -}
  -url[x] = '\0';
  -if (badesc)
  -return BAD_REQUEST;
  -else if (badpath)
  -return BAD_PATH;
  -else
  -return 0;
  -}
  -
  -static void getparents(char *name)
  -{
  -int l, w;
  -
  -/* Four paseses, as per RFC 1808 */
  -

DO NOT REPLY [Bug 8290] New: - Problem in the code generated by jasper 2

2002-04-18 Thread 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://nagoya.apache.org/bugzilla/show_bug.cgi?id=8290

Problem in the code generated by jasper 2

   Summary: Problem in the code generated by jasper 2
   Product: Tomcat 4
   Version: Nightly Build
  Platform: All
OS/Version: All
Status: NEW
  Severity: Major
  Priority: Other
 Component: Jasper 2
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


There is a big performance penalty incured by the way the code is generated 
with taglibs in both Jasper and Jasper 2.  Both version use a lot of nested 
try/finally block, and these constructs triggers a bug in the JVM.  This 
bug is documented there:

http://developer.java.sun.com/developer/bugParade/bugs/4414162.html

It was closed as "not fixed" for the JDK 1.3, but it is still present at 
least in the 1.4 Linux's implementation, and probably others too:
java version "1.4.0"
Java(TM) 2 Runtime Environment, Standard Edition (build 1.4.0-b92)
Java HotSpot(TM) Client VM (build 1.4.0-b92, mixed mode)

We did some light load test and if a page has 100 tags, a 256M JVM can not 
sustain the load.  The GC would periodically freeze the JVM from 10s. to 
45s. on a PIII 800 with 512M.  The load is a 5 thread JMeter test of 
accessing the "large" JSP (100 tags), with a small JSP (only links), and a 
500ms timer sleep.  No other access are done on the PC, JMeter is run from 
a remote PC.

In our tests, we have shown that by far the worst performance penalty are 
due to this bug.  If we only put a global "try/finally" in the java code 
generated from the JSP and recompile by hand the java code, then the 
performance are very much comparable to other servlet servers.

Thanks.

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




[PATCH/COMMENTS] Automatic Application Deployment and Host.liveDeploy

2002-04-18 Thread Daniel Rall

Added missing closing paren.

Index: host.xml
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml,v
retrieving revision 1.12
diff -u -u -r1.12 host.xml
--- host.xml20 Mar 2002 12:33:01 -  1.12
+++ host.xml19 Apr 2002 00:11:30 -
@@ -245,7 +245,7 @@
 If you are using the standard Host implementation,
 the following actions take place automatically when Catalina is first
 started, if the autoDeploy property is set to
-true (which is the default value:
+true (which is the default value):
 
 Any XML file in this directory is assumed to contain a
 Context element (and its associated

This "Automatic Application Deployment" section should also mention
the new liveDeploy flag.  This flag must be used in conjunction with
autoDeploy if the name of your web application directory differs from
the name of the Context where you mount your web app (when you want
_only_ the Context entries defined in server.xml to be deployed).

Consider the following layout:

$CATALINA_BASE/
  webapps/
secretapp/

...with a server.xml like:

  
...

  

The initial startup occurs, and secretapp is mounted at "/mycontext".
After the initial startup, if I haven't included liveDeploy="false" in
my  entry, Catalina's live deployment thread wanders over, spots
the "secretapp" directory under my Host's appBase, and decides to load
it as another web app (even though it has already been loaded and
mounted at "/mycontext").  Wasted resources aside, this can be painful
(example: consider the case where your web app's servlets open TCP
listener sockets).

Definitely worth mentioning in the doc, and perhaps protecting against
in some fashion in the code (if possible).

- Dan

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_iis.h jk_isapi_plugin.c jk_service_iis.c iis.h

2002-04-18 Thread nacho

nacho   02/04/18 17:23:45

  Modified:jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
  Added:   jk/native2/server/isapi jk_iis.h
  Removed: jk/native2/server/isapi iis.h
  Log:
  iis.h -> jk_iis.h
  
  Revision  ChangesPath
  1.3   +2 -2  
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_isapi_plugin.c 19 Apr 2002 00:20:13 -  1.2
  +++ jk_isapi_plugin.c 19 Apr 2002 00:23:45 -  1.3
  @@ -60,7 +60,7 @@
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Author:  Larry Isaacs <[EMAIL PROTECTED]>   *
* Author:  Ignacio J. Ortega <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.2 $   *
  + * Version: $Revision: 1.3 $   *
***/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -78,7 +78,7 @@
   #include "jk_service.h"
   #include "jk_worker.h"
   
  -#include "iis.h"
  +#include "jk_iis.h"
   //#include "jk_uri_worker_map.h"
   
   #define jk_log(a,b,c)
  
  
  
  1.3   +2 -2  
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
  
  Index: jk_service_iis.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_service_iis.c  19 Apr 2002 00:20:13 -  1.2
  +++ jk_service_iis.c  19 Apr 2002 00:23:45 -  1.3
  @@ -60,7 +60,7 @@
* Author:  Gal Shachor <[EMAIL PROTECTED]>   
*  Henri Gomez <[EMAIL PROTECTED]> 
*   Ignacio J. Ortega <[EMAIL PROTECTED]>
  - * Version: $Revision: 1.2 $   
  + * Version: $Revision: 1.3 $   
*/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -78,7 +78,7 @@
   #include "jk_service.h"
   #include "jk_worker.h"
   
  -#include "iis.h"
  +#include "jk_iis.h"
   //#include "jk_uri_worker_map.h"
   
   
  
  
  
  1.1  jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h
  
  Index: jk_iis.h
  ===
  /* = *
   *   *
   * The Apache Software License,  Version 1.1 *
   *   *
   *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
   *   All rights reserved.*
   *   *
   * = *
   *   *
   * Redistribution and use in source and binary forms,  with or without modi- *
   * fication, are permitted provided that the following conditions are met:   *
   *   *
   * 1. Redistributions of source code  must retain the above copyright notice *
   *notice, this list of conditions and the following disclaimer.  *
   *   *
   * 2. Redistributions  in binary  form  must  reproduce the  above copyright *
   *notice,  this list of conditions  and the following  disclaimer in the *
   *documentation and/or other materials provided with the distribution.   *
   *   *
   * 3. The end-user documentation  included with the redistribution,  if any, *
   *must include the following acknowlegement: *
   *   *
   *   "This product includes  software developed  by the Apache  Software *
   *Foundation ."  *
   *   *
   *Alternately, this acknowlegement may appear in the software itself, if *
   *and wherever such third-party acknowlegements normally appear.   

cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi iis.h jk_isapi_plugin.c jk_service_iis.c

2002-04-18 Thread nacho

nacho   02/04/18 17:20:14

  Modified:jk/native2/server/isapi iis.h jk_isapi_plugin.c
jk_service_iis.c
  Log:
  * Work in progess..
  
  jk_service_iis..c compiles.. i think it's almost done..
  
  Revision  ChangesPath
  1.2   +145 -6jakarta-tomcat-connectors/jk/native2/server/isapi/iis.h
  
  Index: iis.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/iis.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- iis.h 18 Apr 2002 15:03:32 -  1.1
  +++ iis.h 19 Apr 2002 00:20:13 -  1.2
  @@ -1,4 +1,63 @@
  -//static jk_worker_env_t worker_env;
  +/* = *
  + *   *
  + * The Apache Software License,  Version 1.1 *
  + *   *
  + *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
  + *   All rights reserved.*
  + *   *
  + * = *
  + *   *
  + * Redistribution and use in source and binary forms,  with or without modi- *
  + * fication, are permitted provided that the following conditions are met:   *
  + *   *
  + * 1. Redistributions of source code  must retain the above copyright notice *
  + *notice, this list of conditions and the following disclaimer.  *
  + *   *
  + * 2. Redistributions  in binary  form  must  reproduce the  above copyright *
  + *notice,  this list of conditions  and the following  disclaimer in the *
  + *documentation and/or other materials provided with the distribution.   *
  + *   *
  + * 3. The end-user documentation  included with the redistribution,  if any, *
  + *must include the following acknowlegement: *
  + *   *
  + *   "This product includes  software developed  by the Apache  Software *
  + *Foundation ."  *
  + *   *
  + *Alternately, this acknowlegement may appear in the software itself, if *
  + *and wherever such third-party acknowlegements normally appear. *
  + *   *
  + * 4. The names  "The  Jakarta  Project",  "Jk",  and  "Apache  Software *
  + *Foundation"  must not be used  to endorse or promote  products derived *
  + *from this  software without  prior  written  permission.  For  written *
  + *permission, please contact <[EMAIL PROTECTED]>.*
  + *   *
  + * 5. Products derived from this software may not be called "Apache" nor may *
  + *"Apache" appear in their names without prior written permission of the *
  + *Apache Software Foundation.*
  + *   *
  + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
  + * INCLUDING, BUT NOT LIMITED TO,  THE IMPLIED WARRANTIES OF MERCHANTABILITY *
  + * AND FITNESS FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT SHALL *
  + * THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY *
  + * DIRECT,  INDIRECT,   INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL *
  + * DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS *
  + * OR SERVICES;  LOSS OF USE,  DATA,  OR PROFITS;  OR BUSINESS INTERRUPTION) *
  + * HOWEVER CAUSED AND  ON ANY  THEORY  OF  LIABILITY,  WHETHER IN  CONTRACT, *
  + * STRICT LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
  + * ANY  WAY  OUT OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF  ADVISED  OF THE *
  + * POSSIBILITY OF SUCH DAMAGE.   *
  + *   *
  + * = *
  + *   *
  + * This software  consists of voluntary  contributions made  by many indi

DO NOT REPLY [Bug 8275] - ContextConfig.start() attempts to create a $CATALINA_BASE/temp/ directory

2002-04-18 Thread 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://nagoya.apache.org/bugzilla/show_bug.cgi?id=8275

ContextConfig.start() attempts to create a $CATALINA_BASE/temp/ directory

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|VERIFIED



--- Additional Comments From [EMAIL PROTECTED]  2002-04-18 23:53 ---
I see, so that's where it was hiding.  ;-)

I can't guess why this issue wasn't encountered with our snapshot from
2002/01/24, but Glenn's CVS log for revision 1.4 of RUNNING.txt (2001/12/26)
provides a reasonable explanation:

JVM Temporary Directory (java.io.tmpdir property) security patch


The java.io.File.createTempFile() methods use the property
java.io.tmpdir for the location of the directory where the JVM
places temporary files.  If this property doesn't exist,
/tmp or /var/tmp gets used on unix systems or c:\\temp on WIN32 systems.

This default directory is the same directory that all applications
can use for temporary files.  Sharing the same system temporary
directory between Tomcat and other applications could be a security
risk if sensitive data is stored there by other applications.

If you run Tomcat with the SecurityManager enabled you would have to
grant Tomcat a FilePermission with read, write, and delete for the
temporary directory.

This series of patches enables the use of a temporary directory
located at $CATALINA_BASE/temp so that Tomcat's use of the temporary
directory is isolated from the rest of the system.

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: [GUMP] Build Failure - jakarta-tomcat-4.0

2002-04-18 Thread Sam Ruby

Costin Manolache wrote:
>
> O k, that's crazy... All other step found tomcat.util - except this one.

Note that this step is after the following line:

> [jar] Building jar: 
>/home/rubys/jakarta/jakarta-tomcat-connectors/util/build/lib/tomcat-util.jar


 As a general rule, the JDK gets confused when jars in the classpath are
 modified.  And, if I haven't mentioned it before, I highly recommend that  
 the practice of updating other projects be discouraged.



> I got gump running - and it works just fine on my machine.

>From a clean build?

> Is the gump workspace updated ?

http://jakarta.apache.org/builds/gump/2002-04-18/gen.html

Looks OK to me.

- Sam Ruby


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




DO NOT REPLY [Bug 8275] - ContextConfig.start() attempts to create a $CATALINA_BASE/temp/ directory

2002-04-18 Thread 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://nagoya.apache.org/bugzilla/show_bug.cgi?id=8275

ContextConfig.start() attempts to create a $CATALINA_BASE/temp/ directory

[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|Major   |Minor
 Status|REOPENED|RESOLVED
 Resolution||WORKSFORME



--- Additional Comments From [EMAIL PROTECTED]  2002-04-18 23:38 ---
Actually, the need for the 'temp' directory is already mentioned in 
the 'RUNNING.txt' document. So unless there's some stale information somewhere 
else, it looks good to me.
(worksforme since the documentation looks ok)

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Coyote b8 ?

2002-04-18 Thread Remy Maucherat

> On Thu, 18 Apr 2002, Remy Maucherat wrote:
>
> > If someone can confirm that the incompatibility between 4.0-HEAD and JK
2 is
> > now fixed, I'd like to put out a new Coyote beta release.
> >
> > It also fixes some SSL configuration problems with Tomcat 4.x, and a few
> > cosmetic fixes.
>
> I got jk2/java working with 4.0 head and 4.1. I'll do another test.

Good.

> If possible, please copy jk2.properties to conf/ and tomcat-jni.jar to
> bin/ ( if you do a full build of tomcat4.0 ).

Done. If some other things are needed, let me know (or feel free to do the
change).

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-4.0/catalina build.xml

2002-04-18 Thread remm

remm02/04/18 16:30:18

  Modified:catalina build.xml
  Log:
  - Copy tomcat-jni.jar to 'bin'.
  - Copy the JK 2 properties to 'conf'.
  
  Revision  ChangesPath
  1.112 +9 -1  jakarta-tomcat-4.0/catalina/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- build.xml 10 Apr 2002 03:26:01 -  1.111
  +++ build.xml 18 Apr 2002 23:30:18 -  1.112
  @@ -26,7 +26,7 @@
 
 
   
  -  
  +  
 
 
 
  +  
  +  
 
 
   
  +
  +
   
 
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: [GUMP] Build Failure - jakarta-tomcat-4.0

2002-04-18 Thread costinm

> 
> jkjava:
>  [echo] Logging: 
>/home/rubys/jakarta/jakarta-commons/logging/dist/commons-logging.jar
> [javac] Compiling 39 source files to 
>/home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/classes
> [javac] 
>/home/rubys/jakarta/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java:71:
> Class org.apache.tomcat.util.IntrospectionUtils not found in import.
> [javac] import org.apache.tomcat.util.IntrospectionUtils;
> [javac]^
> [javac] Note: 6 files use or override a deprecated API.  Recompile with 
>"-deprecation" for details.
> [javac] 1 error, 1 warning

Ok, that's crazy... All other step found tomcat.util - except this one. I 
got gump running - and it works just fine on my machine. 

Is the gump workspace updated ? Something is strange here. 

Costin


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Coyote b8 ?

2002-04-18 Thread costinm

On Thu, 18 Apr 2002, Remy Maucherat wrote:

> If someone can confirm that the incompatibility between 4.0-HEAD and JK 2 is
> now fixed, I'd like to put out a new Coyote beta release.
> 
> It also fixes some SSL configuration problems with Tomcat 4.x, and a few
> cosmetic fixes.

I got jk2/java working with 4.0 head and 4.1. I'll do another test.

If possible, please copy jk2.properties to conf/ and tomcat-jni.jar to 
bin/ ( if you do a full build of tomcat4.0 ). 



Costin


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




DO NOT REPLY [Bug 8285] New: - PageContextImpl breaks spec; include() explicitly sets autoflush==true

2002-04-18 Thread 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://nagoya.apache.org/bugzilla/show_bug.cgi?id=8285

PageContextImpl breaks spec; include() explicitly sets autoflush==true

   Summary: PageContextImpl breaks spec; include() explicitly sets
autoflush==true
   Product: Tomcat 4
   Version: Nightly Build
  Platform: All
OS/Version: All
Status: NEW
  Severity: Major
  Priority: Other
 Component: Jasper 2
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


The implementation of PageContextImpl.include, which is used by the jsp
directive 'include', completely breaks the spec.  According to the specification
(section 4.4), the default of the 'autoflush' attribute should be 'false'.  Not
only is the default set to 'true', but it's hard-coded in.. there's no way to
switch it.

This is also the case for the jasper codebase in Tomcat.

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr TomcatStarter.java

2002-04-18 Thread costin

costin  02/04/18 16:13:59

  Modified:jk/java/org/apache/jk/apr TomcatStarter.java
  Log:
  Just redirect out to stderr - that's saved.
  
  Revision  ChangesPath
  1.4   +3 -8  
jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java
  
  Index: TomcatStarter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TomcatStarter.java18 Apr 2002 23:00:04 -  1.3
  +++ TomcatStarter.java18 Apr 2002 23:13:59 -  1.4
  @@ -26,14 +26,9 @@
   System.err.println("TomcatStarter: main()");
   
   try {
  -// Destroy out, it is lost since the server is detached
  -// err goes to error.log
  -String out="/tmp/out";
  -String err="/tmp/err";
  -PrintStream outS=new PrintStream(new FileOutputStream(out));
  -System.setOut(outS);
  -PrintStream errS=new PrintStream(new FileOutputStream(err));
  -System.setErr(errS);
  +System.setOut( System.err );
  +System.err.println("TomcatStarter: err");
  +System.out.println("TomcatStarter: out");
   
   // Find the class
   Class c=null;
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr TomcatStarter.java

2002-04-18 Thread costin

costin  02/04/18 16:00:04

  Modified:jk/java/org/apache/jk/apr TomcatStarter.java
  Log:
  Use CatalinaService, thanks Remy :-)
  
  Temporarily redirect out/err in some hardcoded paths, need
  to do real config ( apache detaches from out ).
  
  Revision  ChangesPath
  1.3   +8 -3  
jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java
  
  Index: TomcatStarter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TomcatStarter.java18 Apr 2002 19:07:49 -  1.2
  +++ TomcatStarter.java18 Apr 2002 23:00:04 -  1.3
  @@ -17,7 +17,7 @@
   String args[];
   
   public static String mainClasses[]={ "org.apache.tomcat.startup.Main",
  - "org.apache.catalina.startup.Bootstrap" };
  + 
"org.apache.catalina.startup.BootstrapService" };
   
   // If someone has time - we can also guess the classpath and do other
   // fancy guessings.
  @@ -28,8 +28,13 @@
   try {
   // Destroy out, it is lost since the server is detached
   // err goes to error.log
  -System.setOut(System.err);
  -
  +String out="/tmp/out";
  +String err="/tmp/err";
  +PrintStream outS=new PrintStream(new FileOutputStream(out));
  +System.setOut(outS);
  +PrintStream errS=new PrintStream(new FileOutputStream(err));
  +System.setErr(errS);
  +
   // Find the class
   Class c=null;
   for( int i=0; imailto:[EMAIL PROTECTED]>
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common Shm.java

2002-04-18 Thread costin

costin  02/04/18 15:59:20

  Modified:jk/java/org/apache/jk/apr AprImpl.java
   jk/java/org/apache/jk/common Shm.java
  Log:
  The java side of the changes.
  
  For now it's just a "Hello World" sent between Apache and tomcat,
  but it works fine - and that was the hard part.
  
  Now follows the hard part, implementing a protocol that is flexible enough
  to support both worker status but also config updates and other status
  and config info.
  
  Luckily there is a backup plan - to use the exact same format as in jserv
  ( at least to get things started )
  
  Revision  ChangesPath
  1.11  +25 -0 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java
  
  Index: AprImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- AprImpl.java  18 Apr 2002 17:42:26 -  1.10
  +++ AprImpl.java  18 Apr 2002 22:59:20 -  1.11
  @@ -94,10 +94,35 @@
   
   public native long shmAttach( long pool, String file );
   
  +public native long shmCreate( long pool, long size, String file );
  +
  +public native long shmBaseaddrGet( long pool, long shmP );
  +
  +public native long shmSizeGet( long pool, long shmP );
  +
   public native long shmDetach( long pool, long shmP );
   
   public native long shmDestroy( long pool, long shmP );
   
  +public native int shmRead( long pool, long mP, 
  +   byte buf[], int off, int len );
  +
  +public native int shmWrite( long pool, long mP, 
  +byte buf[], int off, int len );
  +
  +
  +//  Mutexes 
  +
  +public native long mutexCreate( long pool, String file, int type );
  +
  +public native long mutexLock( long pool, long mutexP );
  +
  +public native long mutexUnLock( long pool, long mutexP );
  +
  +public native long mutexTryLock( long pool, long mutexP );
  +
  +public native long mutexDestroy( long pool, long mutexP );
  +
   //   java to C 
   
   // Temp - interface will evolve
  
  
  
  1.3   +22 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java
  
  Index: Shm.java
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Shm.java  18 Apr 2002 17:44:49 -  1.2
  +++ Shm.java  18 Apr 2002 22:59:20 -  1.3
  @@ -121,9 +121,30 @@
   if( aprShmP== 0 ) {
   // no shared mem. This is normal result, but create should throw
   log.info("Can't attach, try to create " + file );
  +aprShmP= apr.shmCreate( aprShmPoolP, 8196, file );
  +
   }
  +if( aprShmP== 0 ) {
  +// no shared mem. This is normal result, but create should throw
  +log.info("Can't create " + file );
  +return;
  +}
  +
  +long base=apr.shmBaseaddrGet( aprShmPoolP, aprShmP );
  +long size=apr.shmSizeGet( aprShmPoolP, aprShmP );
  +
  +log.info("Got shared memory at " + base + " " + size );
  +
  +byte b1[]=new byte[16];
  +
  +apr.shmRead( aprShmPoolP, base, b1, 0, b1.length );
  +
  +System.out.println("Read: " + new String( b1 ));
  +
  +byte helloW[]="hello World".getBytes();
  +
  +apr.shmWrite( aprShmPoolP, base, helloW, 0, helloW.length );
   
  -//XXX not implemented.
   } catch( Throwable ex ) {
   log.error( "Can't initialize shared memory " + ex.toString() );
   apr=null;
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c

2002-04-18 Thread costin

costin  02/04/18 15:56:13

  Modified:jk/native2/server/apache2 mod_jk2.c
  Log:
  Call init in child_init, post config is not the right point.
  
  Revision  ChangesPath
  1.11  +27 -22jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
  
  Index: mod_jk2.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_jk2.c 15 Apr 2002 23:57:42 -  1.10
  +++ mod_jk2.c 18 Apr 2002 22:56:13 -  1.11
  @@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Henri Gomez <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.10 $   *
  + * Version: $Revision: 1.11 $   *
***/
   
   /*
  @@ -357,26 +357,6 @@
   }
   
   
  -/** Standard apache callback, initialize jk.
  - */
  -static void jk2_child_init(apr_pool_t *pconf, 
  -   server_rec *s)
  -{
  -jk_uriEnv_t *serverEnv=(jk_uriEnv_t *)
  -ap_get_module_config(s->module_config, &jk2_module);
  -jk_env_t *env;
  -
  -if( workerEnv==NULL )
  -workerEnv = serverEnv->workerEnv;
  -
  -env=workerEnv->globalEnv;
  -
  -env->l->jkLog(env, env->l, JK_LOG_INFO, "mod_jk child init\n" );
  -
  -/* jk2_init( pconf, conf, s );
  -   do we need jk2_child_init? For ajp14? */
  -}
  -
   /** Initialize jk, using worker.properties. 
   We also use apache commands ( JkWorker, etc), but this use is 
   deprecated, as we'll try to concentrate all config in
  @@ -458,14 +438,39 @@
   
   env->l->jkLog(env, env->l, JK_LOG_ERROR,
 "mod_jk.post_config() second invocation\n" ); 
  +
  +
  +/* if(!workerEnv->was_initialized) { */
  +/* workerEnv->was_initialized = JK_TRUE; */
  +
  +/* jk2_init( env, pconf, workerEnv, s ); */
  +/* } */
  +return OK;
  +}
  +
  +/** Standard apache callback, initialize jk.
  + */
  +static void jk2_child_init(apr_pool_t *pconf, 
  +   server_rec *s)
  +{
  +jk_uriEnv_t *serverEnv=(jk_uriEnv_t *)
  +ap_get_module_config(s->module_config, &jk2_module);
  +jk_env_t *env;
  +
  +if( workerEnv==NULL )
  +workerEnv = serverEnv->workerEnv;
  +
  +env=workerEnv->globalEnv;
  +
  +env->l->jkLog(env, env->l, JK_LOG_INFO, "mod_jk child init %d\n", 
workerEnv->was_initialized );
   
   if(!workerEnv->was_initialized) {
   workerEnv->was_initialized = JK_TRUE;
   
   jk2_init( env, pconf, workerEnv, s );
   }
  -return OK;
   }
  +
   
   /* = */
   /* The JK module handlers*/
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h

2002-04-18 Thread costin

costin  02/04/18 15:55:36

  Modified:jk/native2/include jk_global.h
  Log:
  Added JK_ERR.
  
  Probably a better solution is to just use APR_SUCCESS, etc ( and
  define them if apr is not used )
  
  Revision  ChangesPath
  1.7   +2 -1  jakarta-tomcat-connectors/jk/native2/include/jk_global.h
  
  Index: jk_global.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jk_global.h   17 Apr 2002 22:46:35 -  1.6
  +++ jk_global.h   18 Apr 2002 22:55:36 -  1.7
  @@ -59,7 +59,7 @@
* Description: Global definitions and include files that should exist *
*  anywhere   *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.6 $   *
  + * Version: $Revision: 1.7 $   *
***/
   
   #ifndef JK_GLOBAL_H
  @@ -157,6 +157,7 @@
   #define JK_LOG_LEVEL_DEF("emerg")
   
   #define JK_OK (0)
  +#define JK_ERR (1)
   
   #define JK_TRUE  (1)
   #define JK_FALSE (0)
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/native2/jni jk_jni_aprImpl.c

2002-04-18 Thread costin

costin  02/04/18 15:52:33

  Modified:jk/native2/jni jk_jni_aprImpl.c
  Log:
  Few fixes. Now the scoreboard works from the java side as well.
  
  Started work on the mutexes.
  
  Revision  ChangesPath
  1.12  +128 -3jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
  
  Index: jk_jni_aprImpl.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_jni_aprImpl.c  17 Apr 2002 22:51:02 -  1.11
  +++ jk_jni_aprImpl.c  18 Apr 2002 22:52:33 -  1.12
  @@ -199,9 +199,28 @@
   apr_status_t rv;
   apr_shm_t *aprShm;
   
  +rv = apr_shm_attach(&aprShm, fname, pool);
  +
  +(*jniEnv)->ReleaseStringUTFChars(jniEnv, fileJ, fname);
  +
  +if (rv != APR_SUCCESS) {
  +return (jlong)NULL;
  +}
  +return (jlong)(long)(void *)aprShm;
  +}
  +
  +JNIEXPORT jlong JNICALL 
  +Java_org_apache_jk_apr_AprImpl_shmCreate(JNIEnv *jniEnv, jobject _jthis, jlong 
poolJ,
  + jlong size, jstring fileJ)
  +{
  +char *fname=(char *)(*jniEnv)->GetStringUTFChars(jniEnv, fileJ, 0);
  +apr_pool_t *pool=(apr_pool_t *)(void *)(long)poolJ;
  +apr_status_t rv;
  +apr_shm_t *aprShm;
  +
   apr_file_remove(fname, pool); /* ignore errors */
   
  -rv = apr_shm_attach(&aprShm, fname, pool);
  +rv = apr_shm_create(&aprShm, size, fname, pool);
   
   (*jniEnv)->ReleaseStringUTFChars(jniEnv, fileJ, fname);
   
  @@ -218,8 +237,10 @@
   {
   apr_shm_t *shm=(apr_shm_t *)(void *)(long)shmP;
   void *sb_shared;
  -
  +
  +fprintf(stderr, "GET BASE ADDR %p", shmP ); 
   sb_shared = apr_shm_baseaddr_get(shm);
  +fprintf(stderr, "GOt BASE ADDR %p", sb_shared ); 
   return (jlong)(long)(void *)sb_shared;
   }

  @@ -251,6 +272,56 @@
   return apr_shm_destroy(shm);
   }
   
  +
  +JNIEXPORT jint JNICALL 
  +Java_org_apache_jk_apr_AprImpl_shmRead(JNIEnv *jniEnv, jobject _jthis, 
  +   jlong poolJ, jlong mP, 
  +   jbyteArray bufJ, jint from, jint cnt)
  +{
  +apr_pool_t *pool=(apr_pool_t *)(void *)(long)poolJ;
  +char *mem=(char *)(void *)(long)mP;
  +jbyte *nbuf;
  +int rd;
  +jboolean iscommit;
  +
  +nbuf = (*jniEnv)->GetByteArrayElements(jniEnv, bufJ, &iscommit);
  +if( ! nbuf ) {
  +return -1;
  +}
  +
  +memcpy( nbuf + from, mem, cnt ); 
  +
  +(*jniEnv)->ReleaseByteArrayElements(jniEnv, bufJ, nbuf, 0);
  +return (jint)cnt;
  +}
  +
  +JNIEXPORT jint JNICALL 
  +Java_org_apache_jk_apr_AprImpl_shmWrite(JNIEnv *jniEnv, jobject _jthis, 
  +   jlong poolJ, jlong mP, 
  +   jbyteArray bufJ, jint from, jint cnt)
  +{
  +apr_status_t status;
  +apr_pool_t *pool=(apr_pool_t *)(void *)(long)poolJ;
  +jbyte *nbuf;
  +char *mem=(char *)(void *)(long)mP;
  +int rd;
  +jboolean iscommit;
  +
  +nbuf = (*jniEnv)->GetByteArrayElements(jniEnv, bufJ, &iscommit);
  +if( ! nbuf ) {
  +return -1;
  +}
  +
  +/* write */
  +memcpy( mem, nbuf + from,  cnt ); 
  +
  +(*jniEnv)->ReleaseByteArrayElements(jniEnv, bufJ, nbuf, 0);
  +return (jint)rd;
  +}
  +
  +
  +
  +
   #else
   
   
  @@ -261,6 +332,12 @@
   return (jlong)0;
   }
   
  +JNIEXPORT jlong JNICALL 
  +Java_org_apache_jk_apr_AprImpl_shmCreate(JNIEnv *jniEnv, jobject _jthis, jlong 
poolJ,
  + jstring fileJ)
  +{
  +return (jlong)0;
  +}
   
   JNIEXPORT jlong JNICALL 
   Java_org_apache_jk_apr_AprImpl_shmBaseaddrGet(JNIEnv *jniEnv, jobject _jthis, jlong 
pool,
  @@ -296,7 +373,7 @@
   /*  interprocess mutexes  */
   
   JNIEXPORT jlong JNICALL 
  -Java_org_apache_jk_apr_AprImpl_mutexCreate(JNIEnv *jniEnv, jobject _jthis, jlong 
pool,
  +Java_org_apache_jk_apr_AprImpl_mutexCreate(JNIEnv *jniEnv, jobject _jthis, jlong 
poolP,
  jstring fileJ,
  jint mechJ )
   {
  @@ -309,6 +386,54 @@
   st=apr_proc_mutex_create( &mutex, fname, mech, pool );
   
   return (jlong)(long)(void *)mutex;
  +}
  +
  +JNIEXPORT jlong JNICALL 
  +Java_org_apache_jk_apr_AprImpl_mutexLock(JNIEnv *jniEnv, jobject _jthis, jlong 
poolP,
  + jlong mutexP )
  +{
  +apr_proc_mutex_t *mutex=(apr_proc_mutex_t *)(void *)(long)mutexP;
  +apr_status_t  st;
  +
  +st=apr_proc_mutex_lock( mutex );
  +
  +return (jlong)(long)st;
  +}
  +
  +JNIEXPORT jlong JNICALL 
  +Java_org_apache_jk_apr_AprImpl_mutexTryLock(JNIEnv *jniEnv, jobject _jthis, jlong 
poolP,
  +  

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_shm.c

2002-04-18 Thread costin

costin  02/04/18 15:47:18

  Modified:jk/native2/common jk_shm.c
  Log:
  Fix few silly errors.
  
  Now jk scoreboard is loaded ok from apache side.
  
  Revision  ChangesPath
  1.5   +39 -6 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
  
  Index: jk_shm.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jk_shm.c  17 Apr 2002 22:52:14 -  1.4
  +++ jk_shm.c  18 Apr 2002 22:47:18 -  1.5
  @@ -154,7 +154,7 @@
   /* Create or reinit an existing scoreboard. The MPM can control whether
* the scoreboard is shared across multiple processes or not
*/
  -static int jk2_shm_create(jk_env_t *env, jk_shm_t *shm)
  +int jk2_shm_create(jk_env_t *env, jk_shm_t *shm)
   {
   apr_status_t rv;
   jk_shm_private_t *shmP=shm->privateData;
  @@ -163,15 +163,42 @@
   if ( shm->fname == NULL ) {
   env->l->jkLog(env, env->l, JK_LOG_ERROR, 
 "No name for jk_shm\n");
  -return JK_FALSE;
  +return JK_ERR;
   }
   
  +rv=apr_shm_attach(&shmP->aprShm, shm->fname, globalShmPool );
  +if( rv ) {
  +char error[256];
  +apr_strerror( rv, error, 256 );
  +
  +env->l->jkLog(env, env->l, JK_LOG_ERROR, 
  +  "shm.create(): error attaching shm, will create %s %d %p 
%s\n",
  +  shm->fname, rv, globalShmPool, error );
  +shmP->aprShm=NULL;
  +} else {
  +return JK_OK;
  +}
  +
   /* make sure it's an absolute pathname */
   /*  fname = ap_server_root_relative(pconf, ap_scoreboard_fname); */
   
   /* The shared memory file must not exist before we create the
* segment. */
  -apr_file_remove(shm->fname, globalShmPool ); /* ignore errors */
  +rv = apr_file_remove(shm->fname, globalShmPool ); /* ignore errors */
  +if (rv) {
  +char error[256];
  +apr_strerror( rv, error, 256 );
  +
  +env->l->jkLog(env, env->l, JK_LOG_ERROR, 
  +  "shm.create(): error removing shm %s %d %s\n",
  +  shm->fname, rv, error );
  +shmP->aprShm=NULL;
  +return rv;
  +} else {
  +env->l->jkLog(env, env->l, JK_LOG_ERROR, 
  +  "shm.create(): file removed ok\n");
  +}
  +
   
   rv = apr_shm_create(&shmP->aprShm, shmP->size, shm->fname, globalShmPool);
   
  @@ -180,7 +207,8 @@
   apr_strerror( rv, error, 256 );
   
   env->l->jkLog(env, env->l, JK_LOG_ERROR, 
  -  "shm.create(): error creating named scoreboard %s %d %s\n",
  +  "shm.create(): error creating shm %d %s %d %s\n",
  +  shmP->size, 
 shm->fname, rv, error );
   shmP->aprShm=NULL;
   return rv;
  @@ -225,14 +253,14 @@
   char error[256];
   apr_strerror( rv, error, 256 );
   env->l->jkLog(env, env->l, JK_LOG_ERROR, 
  -  "Unable to attach to %s %d %s\n", shm->fname, rv, error);
  +  "Unable to attach  %s %d %s\n", shm->fname, rv, error);
   }
   
   rv=jk2_shm_create( env, shm );
   
   if( rv || shmP->aprShm==NULL ) {
   env->l->jkLog(env, env->l, JK_LOG_ERROR, 
  -  "Unable to create to %s %d\n", shm->fname, rv);
  +  "Unable to create %s %d\n", shm->fname, rv);
   return JK_FALSE;
   }
   
  @@ -246,6 +274,11 @@
   }
   
   memset(shmP->image, 0, shmP->size);
  +strcpy(shmP->image, "Hello From Apache");
  +
  +env->l->jkLog(env, env->l, JK_LOG_INFO, 
  +  "shm.init() Initalized %s %p\n",
  +  shm->fname, shmP->image);
   
   return JK_TRUE;
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




DO NOT REPLY [Bug 8275] - ContextConfig.start() attempts to create a $CATALINA_BASE/temp/ directory

2002-04-18 Thread 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://nagoya.apache.org/bugzilla/show_bug.cgi?id=8275

ContextConfig.start() attempts to create a $CATALINA_BASE/temp/ directory





--- Additional Comments From [EMAIL PROTECTED]  2002-04-18 22:10 ---
It doesn't look like a bad feature to me overall. I agree it should be 
documented somewhere (don't remember where, though).

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




DO NOT REPLY [Bug 8275] - ContextConfig.start() attempts to create a $CATALINA_BASE/temp/ directory

2002-04-18 Thread 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://nagoya.apache.org/bugzilla/show_bug.cgi?id=8275

ContextConfig.start() attempts to create a $CATALINA_BASE/temp/ directory

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WONTFIX |



--- Additional Comments From [EMAIL PROTECTED]  2002-04-18 21:58 ---
Hi Remy, enjoyed your WebDav talk at JavaOne.

a) If CATALINA_BASE != CATALINA_HOME, there is no guarantee that a temp
directory is pre-existing.  Since you mention that it _should_ exist, is it
required by the servlet spec, or created by Catalina at run-time?  It is not a
reasonable expectation that the user which the Catalina process runs as has
permission to create sub-directories in the root of the CATALINA_BASE directory.
 If this is just the Way Things Are, please suggest a place for me to document
this requirement to avoid future confusion.

b) Bummer, que sera.

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve EditValveAction.java SaveSingleSignOnValveAction.java ValveUtil.java

2002-04-18 Thread manveen

manveen 02/04/18 14:39:45

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
EditValveAction.java
SaveSingleSignOnValveAction.java ValveUtil.java
  Log:
  fix for create valve
  
  Revision  ChangesPath
  1.3   +5 -5  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java
  
  Index: EditValveAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EditValveAction.java  16 Apr 2002 17:04:19 -  1.2
  +++ EditValveAction.java  18 Apr 2002 21:39:45 -  1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java,v
 1.2 2002/04/16 17:04:19 manveen Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/04/16 17:04:19 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java,v
 1.3 2002/04/18 21:39:45 manveen Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/18 21:39:45 $
*
* 
*
  @@ -92,7 +92,7 @@
* Valve  transactions, based on the type of Valve.
*
* @author Manveen Kaur
  - * @version $Revision: 1.2 $ $Date: 2002/04/16 17:04:19 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/18 21:39:45 $
*/
   
   public class EditValveAction extends Action {
  @@ -168,7 +168,7 @@
  parent = request.getParameter("parent");
  String valveType = null;
  String attribute = null;
  -
  +   
  // Find what type of Valve this is
  try {
   attribute = "className";
  
  
  
  1.4   +5 -5  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java
  
  Index: SaveSingleSignOnValveAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SaveSingleSignOnValveAction.java  12 Apr 2002 22:06:30 -  1.3
  +++ SaveSingleSignOnValveAction.java  18 Apr 2002 21:39:45 -  1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java,v
 1.3 2002/04/12 22:06:30 manveen Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/04/12 22:06:30 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java,v
 1.4 2002/04/18 21:39:45 manveen Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/04/18 21:39:45 $
*
* 
*
  @@ -89,7 +89,7 @@
* Edit Valve transactions for Single Sign On valve.
*
* @author Manveen Kaur
  - * @version $Revision: 1.3 $ $Date: 2002/04/12 22:06:30 $
  + * @version $Revision: 1.4 $ $Date: 2002/04/18 21:39:45 $
*/
   
   public final class SaveSingleSignOnValveAction extends Action {
  @@ -159,7 +159,7 @@
  return ValveUtil.
 createValve(parent, valveType, response, request, mapping,
 (ApplicationServlet) getServlet());
  -   
  +  
   }
   
   // Perform attribute updates as requested
  
  
  
  1.5   +10 -8 
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java
  
  Index: ValveUtil.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ValveUtil.java18 Apr 2002 07:39:28 -  1.4
  +++ ValveUtil.java18 Apr 2002 21:39:45 -  1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
 1.4 2002/04/18 07:39:28 manveen Exp $
  - * $Revision: 1.4 $
  - * $Date: 2002/04/18 07:39:28 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
 1.5 2002/04/18 21:39:45 manveen Exp $
  + * $Revision: 1.5 $
  + * $Date: 2002/04/18 21:39:45 $
*
* 
*
  @@ -94,7 +94,7 @@
* A utility class that contains methods common across valves.
*
* @author Manveen Kaur
  - * 

DO NOT REPLY [Bug 8275] - ContextConfig.start() attempts to create a $CATALINA_BASE/temp/ directory

2002-04-18 Thread 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://nagoya.apache.org/bugzilla/show_bug.cgi?id=8275

ContextConfig.start() attempts to create a $CATALINA_BASE/temp/ directory

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX



--- Additional Comments From [EMAIL PROTECTED]  2002-04-18 20:59 ---
a) The temp directory does exist by default.
b) The TLDs can declare listeners, so Catalina has to parse them (of course, I 
wish this particular feature in the spec wouldn't exist).

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




DO NOT REPLY [Bug 8217] - Documentation references "workers." prefix

2002-04-18 Thread 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://nagoya.apache.org/bugzilla/show_bug.cgi?id=8217

Documentation references "workers." prefix





--- Additional Comments From [EMAIL PROTECTED]  2002-04-18 20:52 ---
This is against the nightly from 20020415.

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




DO NOT REPLY [Bug 8275] New: - ContextConfig.start() attempts to create a $CATALINA_BASE/temp/ directory

2002-04-18 Thread 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://nagoya.apache.org/bugzilla/show_bug.cgi?id=8275

ContextConfig.start() attempts to create a $CATALINA_BASE/temp/ directory

   Summary: ContextConfig.start() attempts to create a
$CATALINA_BASE/temp/ directory
   Product: Tomcat 4
   Version: Nightly Build
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Major
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


The snapshot is from 2002-04-15.  While reading JAR files, Catalina's
ContextConfig.start() method calls the tldScan() method, which is attempting to
create files within a temporary directory at $CATALINA_BASE/temp/ (a directory
which AFAIK does not exist by default).  In a secure configuration, the unix
user which Catalina runs at has no permission to write directly to
$CATALINA_BASE directory, and thus cannot create the temporary directory.  This
hoses the web application bound to that context.

IMHO, Catalina shouldn't reference tag library descriptors -- I was under the
impression that those were JSP-specific, in which case wouldn't they be the
domain of Jasper?  Perhaps the Servlet spec. makes this impossible...

I'm also a bit curious as to where the directory name "temp" is coming from.  I
took my last snapshot on 2002-01-24, and didn't see any reference to it while
looking through the delta.

Here's the associated stack trace from Catalina's log file:

2002-04-18 12:47:14 ContextConfig[/scarab] Exception processing JAR at resource
path /WEB-INF/lib/commons-fileupload-0.1-dev.jar
javax.servlet.ServletException: Exception processing JAR at resource path
/WEB-INF/lib/commons-fileupload-0.1-dev.jar
at
org.apache.catalina.startup.ContextConfig.tldScanJar(ContextConfig.java,
Compiled Code)
at org.apache.catalina.startup.ContextConfig.tldScan(ContextConfig.java,
Compiled Code)
at org.apache.catalina.startup.ContextConfig.start(ContextConfig.java,
Compiled Code)
at
org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java,
Compiled Code)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java,
Compiled Code)
at org.apache.catalina.core.StandardContext.start(StandardContext.java,
Compiled Code)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java,
Compiled Code)
at org.apache.catalina.core.StandardHost.start(StandardHost.java,
Compiled Code)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java,
Compiled Code)
at org.apache.catalina.core.StandardEngine.start(StandardEngine.java,
Compiled Code)
at org.apache.catalina.core.StandardService.start(StandardService.java,
Compiled Code)
at org.apache.catalina.core.StandardServer.start(StandardServer.java,
Compiled Code)
at org.apache.catalina.startup.Catalina.start(Catalina.java, Compiled Code)
at org.apache.catalina.startup.Catalina.execute(Catalina.java, Compiled
Code)
at org.apache.catalina.startup.Catalina.process(Catalina.java, Compiled
Code)
at java.lang.reflect.Method.invoke(Native Method)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java, Compiled Code)
- Root Cause -
java.io.IOException: No such file or directory
at java.io.UnixFileSystem.createFileExclusively(Native Method)
at java.io.File.checkAndCreate(File.java, Compiled Code)
at java.io.File.createTempFile(File.java, Compiled Code)
at java.io.File.createTempFile(File.java, Compiled Code)
at sun.net.www.protocol.jar.URLJarFile$1.run(URLJarFile.java, Compiled Code)
at java.security.AccessController.doPrivileged(Native Method)
at sun.net.www.protocol.jar.URLJarFile.retrieve(URLJarFile.java,
Compiled Code)
at sun.net.www.protocol.jar.URLJarFile.getJarFile(URLJarFile.java,
Compiled Code)
at sun.net.www.protocol.jar.JarFileFactory.get(JarFileFactory.java,
Compiled Code)
at
sun.net.www.protocol.jar.JarURLConnection.connect(JarURLConnection.java,
Compiled Code)
at
sun.net.www.protocol.jar.JarURLConnection.getJarFile(JarURLConnection.java,
Compiled Code)
at
org.apache.catalina.startup.ContextConfig.tldScanJar(ContextConfig.java,
Compiled Code)
at org.apache.catalina.startup.ContextConfig.tldScan(ContextConfig.java,
Compiled Code)
at org.apache.catalina.startup.ContextConfig.start(ContextConfig.java,
Compiled Code)
at
org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java,
Compiled Code)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(Lif

RE: AUTHORIZATION HEADER MISSING

2002-04-18 Thread Robert Priest

Ignacio,

Everthing works on my box locally, but I cannot access my site (with
authentication) from a remote machine.
Neither Webfolders, nor IE, nor WebDrive will work remotely.

Any Ideas.

Is there any updated iis/tomcat configuration info I should have. Could that
be the culprit?

-Original Message-
From: Ignacio J. Ortega [mailto:[EMAIL PROTECTED]]
Sent: Thursday, April 18, 2002 11:55 AM
To: 'Robert Priest'
Cc: 'tomcat-dev'
Subject: RE: AUTHORIZATION HEADER MISSING


> c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(6
> 18) : error
> C2065: 'SF_NOTIFY_AUTH_COMPLETE' : undeclared identifier

You need to download and install the latest "Microsoft Platform SDK"

Saludos ,
Ignacio J. Ortega

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c

2002-04-18 Thread nacho

nacho   02/04/18 12:46:31

  Added:   jk/native2/server/isapi jk_isapi_plugin.c
  Log:
  * Work in progess.. doesnt compile
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===
  /* = *
   *   *
   * The Apache Software License,  Version 1.1 *
   *   *
   *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
   *   All rights reserved.*
   *   *
   * = *
   *   *
   * Redistribution and use in source and binary forms,  with or without modi- *
   * fication, are permitted provided that the following conditions are met:   *
   *   *
   * 1. Redistributions of source code  must retain the above copyright notice *
   *notice, this list of conditions and the following disclaimer.  *
   *   *
   * 2. Redistributions  in binary  form  must  reproduce the  above copyright *
   *notice,  this list of conditions  and the following  disclaimer in the *
   *documentation and/or other materials provided with the distribution.   *
   *   *
   * 3. The end-user documentation  included with the redistribution,  if any, *
   *must include the following acknowlegement: *
   *   *
   *   "This product includes  software developed  by the Apache  Software *
   *Foundation ."  *
   *   *
   *Alternately, this acknowlegement may appear in the software itself, if *
   *and wherever such third-party acknowlegements normally appear. *
   *   *
   * 4. The names  "The  Jakarta  Project",  "Jk",  and  "Apache  Software *
   *Foundation"  must not be used  to endorse or promote  products derived *
   *from this  software without  prior  written  permission.  For  written *
   *permission, please contact <[EMAIL PROTECTED]>.*
   *   *
   * 5. Products derived from this software may not be called "Apache" nor may *
   *"Apache" appear in their names without prior written permission of the *
   *Apache Software Foundation.*
   *   *
   * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
   * INCLUDING, BUT NOT LIMITED TO,  THE IMPLIED WARRANTIES OF MERCHANTABILITY *
   * AND FITNESS FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT SHALL *
   * THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY *
   * DIRECT,  INDIRECT,   INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL *
   * DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS *
   * OR SERVICES;  LOSS OF USE,  DATA,  OR PROFITS;  OR BUSINESS INTERRUPTION) *
   * HOWEVER CAUSED AND  ON ANY  THEORY  OF  LIABILITY,  WHETHER IN  CONTRACT, *
   * STRICT LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
   * ANY  WAY  OUT OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF  ADVISED  OF THE *
   * POSSIBILITY OF SUCH DAMAGE.   *
   *   *
   * = *
   *   *
   * This software  consists of voluntary  contributions made  by many indivi- *
   * duals on behalf of the  Apache Software Foundation.  For more information *
   * on the Apache Software Foundation, please see .   *
   *   *
   * = */
  
  /***
   * Description: ISAPI 

cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk2_isapi_plugin.c

2002-04-18 Thread nacho

nacho   02/04/18 12:38:50

  Removed: jk/native2/server/isapi jk2_isapi_plugin.c
  Log:
  Wrong file!!

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Coyote/jk2 - interaction explanations please

2002-04-18 Thread costinm

On Thu, 18 Apr 2002, Remy Maucherat wrote:

> Instead of using the Bootstrap class, use the BoostrapService class. It does
> exactly the same but it doesn't listen on a socket for shutdown (instead,
> you have to call stop on the same instance), and it does return (instead of
> blocking on an await).
> 
> That's the class I use when running as a NT service (I ran into the same
> problem, obviously), and it works really well.

Thanks.

Costin


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_jni.c

2002-04-18 Thread costin

costin  02/04/18 12:29:08

  Modified:jk/native2/common jk_worker_jni.c
  Log:
  Change the main class.
  
  Revision  ChangesPath
  1.10  +1 -1  jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c
  
  Index: jk_worker_jni.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jk_worker_jni.c   18 Apr 2002 00:12:00 -  1.9
  +++ jk_worker_jni.c   18 Apr 2002 19:29:08 -  1.10
  @@ -69,7 +69,7 @@
   #include "jni.h"
   
   /* default only, will be  configurable  */
  -#define JAVA_BRIDGE_CLASS_NAME ("org/apache/jk/apr/AprImpl")
  +#define JAVA_BRIDGE_CLASS_NAME ("org/apache/jk/apr/TomcatStarter")
   
   struct jni_worker_data {
   jclass  jk_java_bridge_class;
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk build.xml

2002-04-18 Thread costin

costin  02/04/18 12:26:52

  Modified:jk   build.xml
  Log:
  Put the manifest in tomcat-jni.jar
  
  Note that tomcat-jni.jar must sit in TOMCAT_HOME/bin ( to keep both
  33 and 40 happy and avoid searching for it in lib/container and server/lib )
  
  Revision  ChangesPath
  1.36  +4 -3  jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- build.xml 16 Apr 2002 00:10:52 -  1.35
  +++ build.xml 18 Apr 2002 19:26:52 -  1.36
  @@ -159,15 +159,16 @@
   


  +  basedir="${jk.build}/classes" >
   
   
   


  +  basedir="${jk.build}/classes" 
  + manifest="conf/jk2.manifest" >
   
  +
   

   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/conf workers2.properties

2002-04-18 Thread costin

costin  02/04/18 12:22:54

  Modified:jk/conf  workers2.properties
  Log:
  Update the C-side config file.
  
  Again, for things to work you _must_ set TOMCAT_HOME, JAVA_HOME and
  LD_LIBRARY_PATH before starting apache ( for the JNI worker ).
  
  Things will degrade gracefully - if some operation is not possible
  a message will be displayed and the worker disabled.
  
  Revision  ChangesPath
  1.8   +5 -11 jakarta-tomcat-connectors/jk/conf/workers2.properties
  
  Index: workers2.properties
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/workers2.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- workers2.properties   18 Apr 2002 00:32:33 -  1.7
  +++ workers2.properties   18 Apr 2002 19:22:54 -  1.8
  @@ -4,10 +4,8 @@
   
   # Global options ( in addition to the pre-defined fs, ps, java_home
   [config]
  -#TOMCAT_HOME=/opt/tomcat
  -TOMCAT_HOME=/opt/jakarta-tomcat-4.1-dev
  -#TOMCAT_HOME=/opt/40
  -JAVA_HOME=/usr/java/ibm1.3
  +## TOMCAT_HOME, CATALINA_HOME, JAVA_HOME and LD_LIBRARY_PATH 
  +# must be set for the jni worker to operate.
   
   
   # Logger options. For apache2 only level can be set ( it logs to apache's error.log 
)
  @@ -19,8 +17,7 @@
   # file=logs/mod_jk.log
   
   [shm]
  -#file=${TOMCAT_HOME}/work/jk2.shm
  -file=/tmp/jk2.shm
  +file=${TOMCAT_HOME}/work/jk2.shm
   size=100
   
   
  @@ -77,17 +74,14 @@
   # JAVA_HOME and TOMCAT_HOME can be set as environment variables
   [vm]
   # That will work with both 3.x and 4.x. 
  
-OPT=-Djava.class.path=${TOMCAT_HOME}/lib/tomcat.jar${ps}${TOMCAT_HOME}/lib/container/tomcat-jni.jar${ps}${TOMCAT_HOME}/lib/common/commons-logging.jar${ps}${TOMCAT_HOME}/bin/bootstrap.jar${ps}${TOMCAT_HOME}/server/lib/tomcat-jni.jar${ps}${TOMCAT_HOME}/common/lib/commons-logging.jar
  +OPT=-Djava.class.path=${TOMCAT_HOME}/bin/tomcat-jni.jar
   OPT=-Dtomcat.home=${TOMCAT_HOME}
   OPT=-Dcatalina.home=${TOMCAT_HOME}
  -#OPT=-Xmx128M
  +OPT=-Xmx128M
   #OPT=-Djava.compiler=NONE
   
   
   [worker.jni:jniCmd1]
  -ARG=org.apache.tomcat.startup.Main
  -ARG=org.apache.catalina.startup.Bootstrap
  -ARG=-
   ARG=start
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/conf jk2.properties

2002-04-18 Thread costin

costin  02/04/18 12:19:02

  Modified:jk/conf  jk2.properties
  Log:
  Update the config file - most of the stuff has been removed, it was
  just un-needed pain for the users, we knew already what was there.
  
  The config file should be used only to override defaults, if you
  have a good reason to. In addition added a ( I hope clear ) message
  that the config file may be overrideni by config tools.
  That will happen after I get to implement the Mbean for jk
  or if another tools set properties via JkMain.
  
  Revision  ChangesPath
  1.6   +10 -59jakarta-tomcat-connectors/jk/conf/jk2.properties
  
  Index: jk2.properties
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/jk2.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jk2.properties17 Apr 2002 22:22:54 -  1.5
  +++ jk2.properties18 Apr 2002 19:19:02 -  1.6
  @@ -1,63 +1,14 @@
  -# Workers.properties like file for the java side.
  -# It should be easy to read from C as well, to avoid duplication
  -# There are many ways to configure jk2 - including 'native' interceptor
  -# conf in server.xml, servlet and web.xml, properties file. For the first,
  -# version we'll use the file. If/when xml is used ( any form ), we'll
  -# generate this file automatically.
  +## THIS FILE MAY BE OVERRIDEN AT RUNTIME. MAKE SURE TOMCAT IS STOPED
  +## WHEN YOU EDIT THE FILE.
   
  +## COMMENTS WILL BE _LOST_
   
  -# Pattern ( similar with server.xml, but for properties ) : 
  -#
  -# handler.NAME.className=[class name to be loaded]
  -# handler.NAME.property=value : a setter will be called, with int,boolean
  -# conversions if needed.  
  +## DOCUMENTATION OF THE FORMAT IN JkMain javadoc.
   
  +# Override the default port for the socketChannel
  +# channelSocket.port=8019
  +# Default: 
  +# channelUnix.file=${jkHome}/work/jk2.socket
  +# Just to check if the the config  is working
  +shm.file=/tmp/jk2.shm
   
  -# Handlers that will be loaded by jk2:
  -# Default:
  -handler.list=channel,apr,shm,unixChannel,channel8019,channelJni,request,container
  -
  -# Transport handler. 
  -# Default:
  -handler.channel.className=org.apache.jk.common.ChannelSocket
  -handler.channel.debug=0
  -handler.channel.port=8009
  -
  -handler.channel8019.className=org.apache.jk.common.ChannelSocket
  -handler.channel8019.port=8019
  -
  -# Other options:
  -#handler.channel.className=org.apache.jk.common.ChannelUn
  -#handler.channel.file=${jkHome}/work/jk2.socket
  -
  -handler.unixChannel.className=org.apache.jk.common.ChannelUn
  -handler.unixChannel.file=${jkHome}/work/jk2.socket
  -handler.unixChannel.next=request
  -
  -handler.channelJni.className=org.apache.jk.common.ChannelJni
  -handler.channelJni.next=request
  -
  -handler.apr.className=org.apache.jk.apr.AprImpl
  -# handler.apr.aprHome=/usr/lib
  -
  -handler.shm.className=org.apache.jk.common.Shm
  -handler.shm.file=/tmp/jk2.shm
  -
  -
  -# Optional - right now request handles all messages
  -# handler.dispatch.className=org.apache.jk.common.HandlerDispatch
  -# handler.dispatch.debug=0
  -
  -
  -# The only request handler we have right now, for ajp13 requests.
  -# Default:
  -#handler.request.className=org.apache.jk.common.HandlerRequest
  -#handler.request.debug=0
  -
  -
  -#handler.container.className=org.apache.jk.common.WorkerDummy
  -
  -# This will be added automatically by the server adapter. Only dummy
  -# needs to be added for testing purpose
  -# handler.container.className=org.apache.jk.server.tomcat33.Worker33
  -# handler.container.className=org.apache.jk.server.tomcat40.Worker40
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/conf jk2.manifest

2002-04-18 Thread costin

costin  02/04/18 12:16:45

  Modified:jk/conf  jk2.manifest
  Log:
  Change the manifest so we don't have to setup the classpath. JDK1.2 is required
  for the manifest to work.
  
  Revision  ChangesPath
  1.4   +2 -2  jakarta-tomcat-connectors/jk/conf/jk2.manifest
  
  Index: jk2.manifest
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/jk2.manifest,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk2.manifest  20 Feb 2002 23:28:33 -  1.3
  +++ jk2.manifest  18 Apr 2002 19:16:45 -  1.4
  @@ -1,2 +1,2 @@
  -Main-Class: org.apache.jk.server.JkMain
  -Class-Path: tomcat-util.jar workers.jar ../classes/ commons-logging.jar log4j.jar 
log4j-core.jar
  +Main-Class: org.apache.jk.apr.TomcatStarter
  +Class-Path: ../lib/tomcat.jar bootstrap.jar 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Coyote/jk2 - interaction explanations please

2002-04-18 Thread Remy Maucherat

> On Thu, 18 Apr 2002, Remy Maucherat wrote:
>
> >
> > I don't know any differences in the thread handling between 4.0 and 4.1.
> > What is the problem ?
>
> You're right, my mistake.
>
> There are 2 problems.
>
> The first was that when you call main(), the method will never return.
> In 3.x main() starts some deamon threads and initialize everything, then
> it returns. That serves as an indication that the server was started ( for
> things like ant or other tools embeding it ).
>
> That's easy to solve, I call main in a separate thread now.
>
> The hard problem - and I really need help on this one - the 8005
> and shutdown protocol.
>
> First, if jk and ajp13 is used - people may want to use the shutdown
> command in ajp13 and keep a single port open. If JNI is used, the shutdown
> is tied to the apache ( or IIS, etc) process shutdown.
>
> More important - in multi-process apache there is a 'natural' load
> balancing - each apache process will run a tomcat VM and those will
> be load balanced. That's the tricky part and the main obstacle in getting
> JNI working.
>
> What I need is a way to disable the 8005. For example if I set the value
> to 0 in server.xml, catalina should not open the port ( if you really
> want the main thread blocked as long as catalin runs you can do a simple
> while( running ) this.wait() ).

Instead of using the Bootstrap class, use the BoostrapService class. It does
exactly the same but it doesn't listen on a socket for shutdown (instead,
you have to call stop on the same instance), and it does return (instead of
blocking on an await).

That's the class I use when running as a NT service (I ran into the same
problem, obviously), and it works really well.

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkMain.java

2002-04-18 Thread costin

costin  02/04/18 12:13:02

  Modified:jk/java/org/apache/jk/core WorkerEnv.java
   jk/java/org/apache/jk/server JkMain.java
  Log:
  Add the localId.
  
  Revision  ChangesPath
  1.7   +9 -0  
jakarta-tomcat-connectors/jk/java/org/apache/jk/core/WorkerEnv.java
  
  Index: WorkerEnv.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/WorkerEnv.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WorkerEnv.java18 Apr 2002 17:57:53 -  1.6
  +++ WorkerEnv.java18 Apr 2002 19:13:01 -  1.7
  @@ -92,12 +92,21 @@
   
   // base dir for the jk webapp
   String home;
  +int localId=0;
   
   public WorkerEnv() {
   for( int i=0; imailto:[EMAIL PROTECTED]>
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelSocket.java ChannelUn.java

2002-04-18 Thread costin

costin  02/04/18 12:12:36

  Modified:jk/java/org/apache/jk/common ChannelSocket.java
ChannelUn.java
  Log:
  Allow a 'range' of ports to be used.
  
  This allows multiple tomcats to be started on the same machine with the
  same configuration - and get consecutive sockets ( tcp and unix ) automatically.
  Needed for jni, it also simplify the configuration of lb workers - no need
  to use separate config files for each worker ( on a machine ).
  
  The port will also determine the local part of the instance ID ( the hostname
  or address should form the other part - and we need a way to push this up
  into the coyote and container ).
  
  If Shm is detected it'll set the instance id based on the shared memory
  protocol ( i.e. each worker will get a unique id based on the position
  of the worker def in the shared mem ) .
  
  Revision  ChangesPath
  1.9   +49 -3 
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
  
  Index: ChannelSocket.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ChannelSocket.java17 Apr 2002 22:38:16 -  1.8
  +++ ChannelSocket.java18 Apr 2002 19:12:36 -  1.9
  @@ -98,7 +98,9 @@
   private static org.apache.commons.logging.Log log=
   org.apache.commons.logging.LogFactory.getLog( ChannelSocket.class );
   
  -int port=8009;
  +int startPort=8009;
  +int maxPort=8019; // 0 for backward compat.
  +int port=startPort;
   InetAddress inet;
   int serverTimeout;
   boolean tcpNoDelay;
  @@ -112,9 +114,18 @@
   public ThreadPool getThreadPool() {
   return tp;
   }
  -
  +
  +/** Set the port for the ajp13 channel.
  + *  To support seemless load balancing and jni, we treat this
  + *  as the 'base' port - we'll try up until we find one that is not
  + *  used. We'll also provide the 'difference' to the main coyote
  + *  handler - that will be our 'sessionID' and the position in
  + *  the scoreboard and the suffix for the unix domain socket.
  + */
   public void setPort( int port ) {
  +this.startPort=port;
   this.port=port;
  +this.maxPort=port+10;
   }
   
   public void setAddress(InetAddress inet) {
  @@ -153,6 +164,14 @@
socketTimeout=i;
   }
   
  +public void setMaxPort( int i ) {
  +maxPort=i;
  +}
  +
  +public int getInstanceId() {
  +return port-startPort;
  +}
  +
   /*   */
   ServerSocket sSocket;
   int socketNote=1;
  @@ -160,6 +179,7 @@
   int osNote=3;
   
   public void accept( MsgContext ep ) throws IOException {
  +if( sSocket==null ) return;
   Socket s=sSocket.accept();
   ep.setNote( socketNote, s );
   if(log.isDebugEnabled() )
  @@ -176,7 +196,33 @@
   }
   
   public void init() throws IOException {
  -sSocket=new ServerSocket( port );
  +// Find a port.
  +if( maxPort 0 )
   sSocket.setSoTimeout( serverTimeout );
   
  
  
  
  1.14  +4 -0  
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
  
  Index: ChannelUn.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ChannelUn.java18 Apr 2002 17:44:49 -  1.13
  +++ ChannelUn.java18 Apr 2002 19:12:36 -  1.14
  @@ -136,6 +136,10 @@
   log.error("No file, disabling unix channel");
   return;
   }
  +if( wEnv.getLocalId() != 0 ) {
  +file=file+ wEnv.getLocalId();
  +}
  +
   if( next==null ) {
   if( nextName!=null ) 
   setNext( wEnv.getHandler( nextName ) );
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr TomcatStarter.java

2002-04-18 Thread costin

costin  02/04/18 12:07:49

  Modified:jk/java/org/apache/jk/apr TomcatStarter.java
  Log:
  Redirect stdout for JNI mode.
  
  Err goes to error.log, but out is lost.
  
  Revision  ChangesPath
  1.2   +5 -0  
jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java
  
  Index: TomcatStarter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TomcatStarter.java18 Apr 2002 17:41:51 -  1.1
  +++ TomcatStarter.java18 Apr 2002 19:07:49 -  1.2
  @@ -26,6 +26,10 @@
   System.err.println("TomcatStarter: main()");
   
   try {
  +// Destroy out, it is lost since the server is detached
  +// err goes to error.log
  +System.setOut(System.err);
  +
   // Find the class
   Class c=null;
   for( int i=0; imailto:[EMAIL PROTECTED]>
For additional commands, e-mail: 




Re: Coyote/jk2 - interaction explanations please

2002-04-18 Thread costinm

On Thu, 18 Apr 2002, Remy Maucherat wrote:

> 
> I don't know any differences in the thread handling between 4.0 and 4.1.
> What is the problem ?

You're right, my mistake. 

There are 2 problems.

The first was that when you call main(), the method will never return.
In 3.x main() starts some deamon threads and initialize everything, then
it returns. That serves as an indication that the server was started ( for
things like ant or other tools embeding it ).

That's easy to solve, I call main in a separate thread now.

The hard problem - and I really need help on this one - the 8005
and shutdown protocol. 

First, if jk and ajp13 is used - people may want to use the shutdown 
command in ajp13 and keep a single port open. If JNI is used, the shutdown
is tied to the apache ( or IIS, etc) process shutdown.

More important - in multi-process apache there is a 'natural' load 
balancing - each apache process will run a tomcat VM and those will
be load balanced. That's the tricky part and the main obstacle in getting
JNI working. 

What I need is a way to disable the 8005. For example if I set the value 
to 0 in server.xml, catalina should not open the port ( if you really
want the main thread blocked as long as catalin runs you can do a simple
while( running ) this.wait() ). 

Costin 


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi iis.h isapi.dsp jk2_isapi_plugin.c jk_service_iis.c

2002-04-18 Thread Ignacio J. Ortega

Doh sorry, but the jk2_isapi_plugin.c file is only a copy of mod_jk2..,
I'm about to remove it, and commit the correct one.. that does not work
at all nor compile, but it's really the work in progress i've
mentioned.. 


Saludos ,
Ignacio J. Ortega


> -Mensaje original-
> De: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> Enviado el: jueves 18 de abril de 2002 17:04
> Para: [EMAIL PROTECTED]
> Asunto: cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi
> iis.h isapi.dsp jk2_isapi_plugin.c jk_service_iis.c
> 
> 
> nacho   02/04/18 08:03:32
> 
>   Added:   jk/native2/server/isapi iis.h isapi.dsp 
> jk2_isapi_plugin.c
> jk_service_iis.c
>   Log:
>   * Initial commit for jk2 isapi plugin, mostly broken and 
> doesnt compile.
>   
>   Revision  ChangesPath
>   1.1  
> jakarta-tomcat-connectors/jk/native2/server/isapi/iis.h
>   
>   Index: iis.h
>   ===
>   //static jk_worker_env_t worker_env;
>   #define _WIN32_WINNT 0x0400
>   
>   #include 
>   #include 
>   #include 
>   
>   #include "jk_global.h"
>   //#include "jk_util.h"
>   #include "jk_pool.h"
>   
>   struct isapi_private_data {
>   jk_pool_t p;
>   
>   int request_started;
>   unsigned bytes_read_so_far;
>   LPEXTENSION_CONTROL_BLOCK  lpEcb;
>   };
>   typedef struct isapi_private_data isapi_private_data_t;
>   
>   
>   
>   static int JK_METHOD start_response(jk_env_t *env, 
> jk_ws_service_t *s );
>   
>   static int JK_METHOD read(jk_env_t *env, jk_ws_service_t *s,
> void *b, unsigned len,
> unsigned *actually_read);
>   
>   static int JK_METHOD write(jk_env_t *env,jk_ws_service_t *s,
>  const void *b,
>  unsigned l);
>   
>   
>   
>   1.1  
> jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp
>   
>   Index: isapi.dsp
>   ===
>   # Microsoft Developer Studio Project File - Name="isapi" - 
> Package Owner=<4>
>   # Microsoft Developer Studio Generated Build File, Format 
> Version 6.00
>   # ** DO NOT EDIT **
>   
>   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
>   
>   CFG=isapi - Win32 Debug
>   !MESSAGE This is not a valid makefile. To build this 
> project using NMAKE,
>   !MESSAGE use the Export Makefile command and run
>   !MESSAGE 
>   !MESSAGE NMAKE /f "isapi.mak".
>   !MESSAGE 
>   !MESSAGE You can specify a configuration when running NMAKE
>   !MESSAGE by defining the macro CFG on the command line. For example:
>   !MESSAGE 
>   !MESSAGE NMAKE /f "isapi.mak" CFG="isapi - Win32 Debug"
>   !MESSAGE 
>   !MESSAGE Possible choices for configuration are:
>   !MESSAGE 
>   !MESSAGE "isapi - Win32 Release" (based on "Win32 (x86) 
> Dynamic-Link Library")
>   !MESSAGE "isapi - Win32 Debug" (based on "Win32 (x86) 
> Dynamic-Link Library")
>   !MESSAGE 
>   
>   # Begin Project
>   # PROP AllowPerConfigDependencies 0
>   # PROP Scc_ProjName ""
>   # PROP Scc_LocalPath ""
>   CPP=cl.exe
>   MTL=midl.exe
>   RSC=rc.exe
>   
>   !IF  "$(CFG)" == "isapi - Win32 Release"
>   
>   # PROP BASE Use_MFC 0
>   # PROP BASE Use_Debug_Libraries 0
>   # PROP BASE Output_Dir "Release"
>   # PROP BASE Intermediate_Dir "Release"
>   # PROP BASE Target_Dir ""
>   # PROP Use_MFC 0
>   # PROP Use_Debug_Libraries 0
>   # PROP Output_Dir "Release"
>   # PROP Intermediate_Dir "Release"
>   # PROP Ignore_Export_Lib 0
>   # PROP Target_Dir ""
>   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D 
> "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D 
> "ISAPI_EXPORTS" /YX /FD /c
>   # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D 
> "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c
>   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
>   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
>   # ADD BASE RSC /l 0xc0a /d "NDEBUG"
>   # ADD RSC /l 0xc0a /d "NDEBUG"
>   BSC32=bscmake.exe
>   # ADD BASE BSC32 /nologo
>   # ADD BSC32 /nologo
>   LINK32=link.exe
>   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib 
> winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib 
> oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll 
> /machine:I386
>   # ADD LINK32 libapr.lib libaprutil.lib kernel32.lib 
> user32.lib advapi32.lib wsock32.lib /nologo /dll 
> /machine:I386 /out:"Release/isapi_redirector2.dll"
>   
>   !ELSEIF  "$(CFG)" == "isapi - Win32 Debug"
>   
>   # PROP BASE Use_MFC 0
>   # PROP BASE Use_Debug_Libraries 1
>   # PROP BASE Output_Dir "Debug"
>   # PROP BASE Intermediate_Dir "Debug"
>   # PROP BASE Target_Dir ""
>   # PROP Use_MFC 0
>   # PROP Use_Debug_Libraries 1
>   # PROP Output_Dir "Debug"
>   # PROP Intermediate_Dir "Debug"
>   # PROP Ignore_Export_Lib 0
>   # PROP Target_Dir ""
>   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" 
> /D "_DEB

cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 LocalStrings.properties

2002-04-18 Thread remm

remm02/04/18 11:16:01

  Modified:http11/src/java/org/apache/coyote/http11
LocalStrings.properties
  Log:
  - Remove unused strings.
  
  Revision  ChangesPath
  1.2   +11 -25
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/LocalStrings.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocalStrings.properties   17 Sep 2001 06:04:00 -  1.1
  +++ LocalStrings.properties   18 Apr 2002 18:16:01 -  1.2
  @@ -1,34 +1,20 @@
  -# $Id: LocalStrings.properties,v 1.1 2001/09/17 06:04:00 remm Exp $
  +# $Id: LocalStrings.properties,v 1.2 2002/04/18 18:16:01 remm Exp $
   
   # language 
   
   # package org.apache.catalina.connector.http
   
  +#
  +# Http11Protocol
  +#
   
  -httpConnector.alreadyInitialized=HTTP connector has already been initialized
  -httpConnector.alreadyStarted=HTTP connector has already been started
  -httpConnector.allAddresses=Opening server socket on all host IP addresses
  -httpConnector.failedSocketFactoryLoading=Failed to load socket factory
  -httpConnector.failedToCreateSocket=Socket factory failed to create socket
  -httpConnector.anAddress=Opening server socket on host IP address {0}
  -httpConnector.noAddress=No host IP address matching {0}, opening on all addresses
  -httpConnector.noProcessor=No processor available, rejecting this connection
  -httpConnector.notStarted=HTTP connector has not yet been started
  -httpConnector.starting=Starting background thread
  -httpConnector.stopping=Stopping background thread
  -httpProcessor.alreadyStarted=HTTP processor has already been started
  -httpProcessor.notStarted=HTTP processor has not yet been started
  -httpProcessor.parseHeaders.contentLength=Invalid 'Content-Length' header
  -httpProcessor.parseHeaders.colon=Invalid HTTP header format
  -httpProcessor.parseHeaders.portNumber=Invalid TCP/IP port number in 'Host' header
  -httpProcessor.parseRequest.decode=Cannot decode HTTP request URI
  -httpProcessor.parseRequest.method=Missing HTTP request method
  -httpProcessor.parseRequest.read=Missing HTTP request line
  -httpProcessor.parseRequest.uri=Missing HTTP request URI
  -httpProcessor.parseHeaders.unknownExpectation=Unknown Expect header field
  -httpProcessor.start=HTTP processor has already been started
  -httpProcessor.starting=Starting background thread
  -httpProcessor.stopping=Stopping background thread
  +#
  +# Http11Processor
  +#
  +
  +#
  +# InternalInputBuffer
  +#
   
   iib.eof.error=Unexpected EOF read on the socket
   iib.requestheadertoolarge.error=Request header is too large
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java CoyoteConnector.java CoyoteRequest.java LocalStrings.properties

2002-04-18 Thread remm

remm02/04/18 11:12:47

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
CoyoteConnector.java CoyoteRequest.java
LocalStrings.properties
  Log:
  - Spring cleaning of the message strings used by the Coyote adapter for
Tomcat 4.
  
  Revision  ChangesPath
  1.6   +15 -14
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
  
  Index: CoyoteAdapter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CoyoteAdapter.java18 Apr 2002 09:12:52 -  1.5
  +++ CoyoteAdapter.java18 Apr 2002 18:12:46 -  1.6
  @@ -1,6 +1,6 @@
  -/* * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
 1.5 2002/04/18 09:12:52 remm Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/04/18 09:12:52 $
  +/* * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
 1.6 2002/04/18 18:12:46 remm Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/04/18 18:12:46 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.5 $ $Date: 2002/04/18 09:12:52 $
  + * @version $Revision: 1.6 $ $Date: 2002/04/18 18:12:46 $
*/
   
   final class CoyoteAdapter
  @@ -225,7 +225,7 @@
   } catch (IOException e) {
   ;
   } catch (Throwable t) {
  -log(sm.getString("coyoteProcessor.service"), t);
  +log(sm.getString("coyoteAdapter.service"), t);
   } finally {
   // Recycle the wrapper request and response
   request.recycle();
  @@ -251,25 +251,22 @@
   request.setAuthorization
   (req.getHeader(Constants.AUTHORIZATION_HEADER));
   
  -// At this point the Host header has been processed.
  -// Override if the proxyPort/proxyHost are set 
  -
   // Replace the default port if we are in secure mode
   if (req.getServerPort() == 80 
   && connector.getScheme().equals("https")) {
   req.setServerPort(443);
   }
   
  +// At this point the Host header has been processed.
  +// Override if the proxyPort/proxyHost are set 
   String proxyName = connector.getProxyName();
   int proxyPort = connector.getProxyPort();
  -
   if (proxyPort != 0) {
   request.setServerPort(proxyPort);
  -req.setServerPort( proxyPort );
  +req.setServerPort(proxyPort);
   } else {
   request.setServerPort(req.getServerPort());
   }
  -
   if (proxyName != null) {
   request.setServerName(proxyName);
   req.serverName().setString(proxyName);
  @@ -308,6 +305,7 @@
   }
   }
   
  +// Parse cookies
   parseCookies(req, request);
   
   }
  @@ -404,6 +402,7 @@
* are resolved out.  If the specified path attempts to go outside the
* boundaries of the current context (i.e. too many ".." path elements
* are present), return null instead.
  + * This code is not optimized, and is only needed for Tomcat 4.0.x.
*
* @param path Path to be validated
*/
  @@ -485,9 +484,11 @@
   /**
* Normalize URI.
* 
  - * This method normalizes '/./' and '/../'.
  + * This method normalizes "\", "//", "/./" and "/../". This method will
  + * return false when trying to go above the root, or if the URI contains
  + * a null byte.
* 
  - * @param uri URI to be normalized
  + * @param uriMB URI to be normalized
*/
   public static boolean normalize(MessageBytes uriMB) {
   
  @@ -518,7 +519,7 @@
   
   // If the URI ends with "/." or "/..", then we append an extra "/"
   // Note: It is possible to extend the URI by 1 without any side effect
  -// as the next character in a non-significant WS.
  +// as the next character is a non-significant WS.
   if (((end - start) > 2) && (b[end - 1] == (byte) '.')) {
   if ((b[end - 2] == (byte) '/') 
   || ((b[end - 2] == (byte) '.') 
  
  
  
  1.10  +7 -7  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -

cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkMain.java

2002-04-18 Thread costin

costin  02/04/18 10:57:53

  Modified:jk/java/org/apache/jk/core WorkerEnv.java
   jk/java/org/apache/jk/server JkMain.java
  Log:
  Move the start method from WorkerEnv to JkMain, eliminate all the unused
  code from WorkerEnv.
  
  WorkerEnv is just a store for the components and a 'note manager'.
  
  Revision  ChangesPath
  1.6   +3 -36 
jakarta-tomcat-connectors/jk/java/org/apache/jk/core/WorkerEnv.java
  
  Index: WorkerEnv.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/WorkerEnv.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WorkerEnv.java20 Feb 2002 23:39:02 -  1.5
  +++ WorkerEnv.java18 Apr 2002 17:57:53 -  1.6
  @@ -63,6 +63,7 @@
   import java.security.*;
   
   import org.apache.jk.common.*;
  +import org.apache.jk.apr.*;
   
   /**
* The controller object. It manages all other jk objects, acting as the root of
  @@ -79,9 +80,6 @@
   
   Hashtable properties;
   
  -Object webapps[]=new Object[20];
  -int webappCnt=0;
  -
   public static final int ENDPOINT_NOTE=0;
   public static final int REQUEST_NOTE=1;
   int noteId[]=new int[4];
  @@ -102,16 +100,6 @@
   }
   }
   
  -public int addWebapp( Object wa ) {
  -if( webappCnt >= webapps.length ) {
  -Object newWebapps[]=new Object[ webapps.length + 20 ];
  -System.arraycopy( webapps, 0, newWebapps, 0, webapps.length);
  -webapps=newWebapps;
  -}
  -webapps[webappCnt]=wa;
  -return webappCnt++;
  -}
  -
   public void setJkHome( String s ) {
   home=s;
   }
  @@ -120,14 +108,6 @@
   return home;
   }
   
  -public Object getWebapp( int i ) {
  -return webapps[i];
  -}
  -
  -public int getWebappCount() {
  -return webappCnt;
  -}
  -
   public final Object getNote(int i ) {
   return notes[i];
   }
  @@ -168,21 +148,8 @@
   return handlersTable[id];
   }
   
  -public void start() throws IOException {
  -for( int i=0; imailto:[EMAIL PROTECTED]>
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JniMain.java

2002-04-18 Thread costin

costin  02/04/18 10:48:58

  Removed: jk/java/org/apache/jk/server JniMain.java
  Log:
  Remove the old jni starter. Replaced with a simpler main() .

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkMain.java

2002-04-18 Thread costin

costin  02/04/18 10:48:00

  Modified:jk/java/org/apache/jk/server JkMain.java
  Log:
  Added comments on the format used for properties.
  
  Added method to save the properties file ( for now in a separate location ) whenever
  a property is changed after startup ( by JMX or another admin application ).
  
  Removed the need to specify the class name for the known components ( we
  do know them, no need for the user to do that ). Try to load all components -
  if they don't have the needed resources ( native libs, etc ) they'll just
  report so and do nothing.
  
  Made the format closer to what's used in mod_jk ( except ':' can't be used
  since it's a delimiter, etc ). It seems implementing the ini format in java is
  not much easier than C ...
  
  Revision  ChangesPath
  1.18  +163 -50   
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java
  
  Index: JkMain.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- JkMain.java   13 Apr 2002 05:53:30 -  1.17
  +++ JkMain.java   18 Apr 2002 17:48:00 -  1.18
  @@ -70,9 +70,38 @@
   import org.apache.tomcat.util.http.*;
   import org.apache.tomcat.util.IntrospectionUtils;
   
  -/** Main class used to startup jk. 
  +/** Main class used to startup and configure jk. It manages the conf/jk2.properties 
file
  + *  and is the target of JMX proxy.
*
  - * It is also useable standalone for testing or as a minimal socket server.
  + *  It implements a policy of save-on-change - whenever a property is changed at
  + *  runtime the jk2.properties file will be overriden. 
  + *
  + *  You can edit the config file when tomcat is stoped ( or if you don't use JMX or
  + *  other admin tools ).
  + *
  + *  The format of jk2.properties:
  + *  
  + *   TYPE[.LOCALNAME].PROPERTY_NAME=VALUE
  + *   Set a property on the associated component. TYPE will be used to
  + *   find the class name and instantiate the component. LOCALNAME allows
  + *   multiple instances. In JMX mode, TYPE and LOCALNAME will form the
  + *   JMX name ( eventually combined with a 'jk2' component )
  + *
  + *   NAME=VALUE
  + *   Define global properties to be used in ${} substitutions
  + *
  + *   class.COMPONENT_TYPE=JAVA_CLASS_NAME
  + *   Adds a new 'type' of component. We predefine all known types.
  + * 
  + *
  + * Instances are created the first time a component name is found. In addition,
  + * 'handler.list' property will override the list of 'default' components that are
  + * loaded automatically.
  + *
  + *  Note that the properties file is just one (simplistic) way to configure jk. We 
hope
  + *  to see configs based on registry, LDAP, db, etc. ( XML is not necesarily better 
)
  + * 
  + * @author Costin Manolache
*/
   public class JkMain
   {
  @@ -80,8 +109,19 @@
   String propFile;
   Properties props=new Properties();
   
  +Properties modules=new Properties();
  +boolean modified=false;
  +boolean started=false;
  +
   public JkMain()
   {
  +modules.put("channelSocket", "org.apache.jk.common.ChannelSocket");
  +modules.put("channelUnix", "org.apache.jk.common.ChannelUn");
  +modules.put("channelJni", "org.apache.jk.common.ChannelJni");
  +modules.put("apr", "org.apache.jk.apr.AprImpl");
  +modules.put("shm", "org.apache.jk.common.Shm");
  +modules.put("request","org.apache.jk.common.HandlerRequest");
  +modules.put("container","org.apache.jk.common.HandlerRequest");
   }
   //  Setting 
   
  @@ -104,6 +144,10 @@
   setJkHome( v );
   } 
   props.put( n, v );
  +if( started ) {
  +processProperty( n, v );
  +saveProperties();
  +}
   }
   
   /**
  @@ -182,49 +226,45 @@
   }
   }
   
  +static String defaultHandlers[]= { "apr",
  +   "shm",
  +   "request",
  +   "container" };
   
   public void start() throws IOException
   {
  -if( props.get( "handler.request.className" )==null )
  -props.put( "handler.request.className",
  -   "org.apache.jk.common.HandlerRequest" );
  -
  -if( props.get( "handler.channel.className" )==null )
  -props.put( "handler.channel.className",
  -   "org.apache.jk.common.ChannelSocket" );
  -
   // We must have at least 3 handlers:
   // channel is the 'transport'
   // request is the request processor or 'global' chain
   // container is the 'provider'
   // Additional handlers may exist and be used internally
   

cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelJni.java ChannelUn.java Shm.java

2002-04-18 Thread costin

costin  02/04/18 10:44:49

  Modified:jk/java/org/apache/jk/common ChannelJni.java ChannelUn.java
Shm.java
  Log:
  Deal with APR not available gracefully ( with a simple message ).
  
  If libapr.so and libjkjni.so are not in LD_LIBRARY_PATH, all native
  functions will be disabled.
  
  If it is - we'll use them. No configuration required ( except if you want
  to change the defaults - which should be reasonable )
  
  Revision  ChangesPath
  1.7   +1 -2  
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java
  
  Index: ChannelJni.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ChannelJni.java   17 Apr 2002 22:37:50 -  1.6
  +++ ChannelJni.java   18 Apr 2002 17:44:49 -  1.7
  @@ -84,13 +84,12 @@
   public ChannelJni() {
   // we use static for now, it's easier on the C side.
   // Easy to change after we get everything working
  -log.info("Created channel jni ");
   }
   
   public void init() throws IOException {
   // static field init, temp
   apr=(AprImpl)wEnv.getHandler("apr");
  -if( apr==null ) { 
  +if( apr==null || ! apr.isLoaded() ) { 
   log.error("No apr, disabling jni channel ");
   return;
   }
  
  
  
  1.13  +6 -1  
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
  
  Index: ChannelUn.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ChannelUn.java17 Apr 2002 22:38:16 -  1.12
  +++ ChannelUn.java18 Apr 2002 17:44:49 -  1.13
  @@ -127,8 +127,13 @@
   
   public void init() throws IOException {
   apr=(AprImpl)wEnv.getHandler("apr");
  -if( apr==null ) {
  +if( apr==null || ! apr.isLoaded() ) {
   log.error("Apr is not available, disabling unix channel ");
  +apr=null;
  +return;
  +}
  +if( file==null ) {
  +log.error("No file, disabling unix channel");
   return;
   }
   if( next==null ) {
  
  
  
  1.2   +3 -2  jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java
  
  Index: Shm.java
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Shm.java  17 Apr 2002 22:36:04 -  1.1
  +++ Shm.java  18 Apr 2002 17:44:49 -  1.2
  @@ -108,8 +108,9 @@
   }
   try {
   apr=(AprImpl)wEnv.getHandler("apr");
  -if( apr==null ) {
  +if( apr==null || ! apr.isLoaded() ) {
   log.error( "Apr unavailable, disabling shared memory " );
  +apr=null;
   return;
   }
   
  @@ -119,7 +120,7 @@
   
   if( aprShmP== 0 ) {
   // no shared mem. This is normal result, but create should throw
  -log.info("Can't attach, try to create ");
  +log.info("Can't attach, try to create " + file );
   }
   
   //XXX not implemented.
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr AprImpl.java

2002-04-18 Thread costin

costin  02/04/18 10:42:26

  Modified:jk/java/org/apache/jk/apr AprImpl.java
  Log:
  Removed the startup hack.
  
  Added a property to check if apr is loaded.
  
  Revision  ChangesPath
  1.10  +6 -75 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java
  
  Index: AprImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AprImpl.java  18 Apr 2002 00:14:34 -  1.9
  +++ AprImpl.java  18 Apr 2002 17:42:26 -  1.10
  @@ -155,11 +155,15 @@
   
   initialize();
   } catch( Throwable t ) {
  -log.error("Native code not initialized, disabling UnixSocket and JNI 
channels: " + t.toString());
  -return;
  +throw new IOException( t.getMessage() );
   }
  +ok=true;
   }
   
  +public boolean isLoaded() {
  +return ok;
  +}
  +
   /** This method of loading the libs doesn't require setting
*   LD_LIBRARY_PATH. Assuming a 'right' binary distribution,
*   or a correct build all files will be in their right place.
  @@ -206,77 +210,4 @@
   ex.printStackTrace();
   }
   }
  -
  -// Hack for Catalina who hungs the calling thread.
  -public static void main( String args[] ) {
  -System.err.println("Main");
  -try {
  -// Find the class
  -Class c=null;
  -int i=0;
  -
  -for( i=0; i= i ) {
  -String newArgs[]=new String[ args.length - i  ];
  -System.out.println("Replacing args: " + i + " " + args.length);
  -for( int j=0; jmailto:[EMAIL PROTECTED]>
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr TomcatStarter.java

2002-04-18 Thread costin

costin  02/04/18 10:41:51

  Added:   jk/java/org/apache/jk/apr TomcatStarter.java
  Log:
  Moved the starter hack, cleaned it up.
  
  Added auto-detection of tomcat to simplify the C code and the config.
  
  The only problem is that if you set both TOMCAT_HOME and CATALINA_HOME,
  the jni worker will start both. That's ok if you have different ports
  and mappings :-)
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java
  
  Index: TomcatStarter.java
  ===
  package org.apache.jk.apr;
  
  import java.io.*;
  import java.lang.reflect.*;
  import java.util.*;
  import org.apache.jk.core.*;
  
  // Hack for Catalina 4.1 who hungs the calling thread.
  // Also avoids delays in apache initialization ( tomcat can take a while )
  
  /** 
   * Start some tomcat.
   * 
   */
  public class TomcatStarter implements Runnable {
  Class c;
  String args[];
  
  public static String mainClasses[]={ "org.apache.tomcat.startup.Main",
   "org.apache.catalina.startup.Bootstrap" };
  
  // If someone has time - we can also guess the classpath and do other
  // fancy guessings.
  
  public static void main( String args[] ) {
  System.err.println("TomcatStarter: main()");
  
  try {
  // Find the class
  Class c=null;
  for( int i=0; imailto:[EMAIL PROTECTED]>
For additional commands, e-mail: 




DO NOT REPLY [Bug 8263] New: - url-pattern easyly to circumvent

2002-04-18 Thread 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://nagoya.apache.org/bugzilla/show_bug.cgi?id=8263

url-pattern easyly to circumvent

   Summary: url-pattern easyly to circumvent
   Product: Tomcat 3
   Version: 3.2.1 Final
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: Critical
  Priority: Other
 Component: Webapps
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Its seems easy to circumvent the security-constraint set in a web.xml file.
If the url-pattern e.g. is /notaccessable/* then typing the url in a browser
like the following provides a listing were you can click and view every file.
http://domain:port/.//notaccessable/

If you know the name, you can type it just behind the last slash and you get the
file imediately.

Am I something missing ??
Can this somehow be fixed?

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Missing files in Tomcat 4.03

2002-04-18 Thread Alexander Höglind

Hi,
Just wanted you to know that it seems like that are some class-files missing in Tomcat 
4.03

1. org.apache.catalina.loader.Reloader
2. org.apache.naming.JndiPermission
3. org.apache.catalina.loader.Extension

I found this when I was trying to debug Servlets using Visual Café 4.1 and Tomcat 4.03.
The solution (offcourse ;-) was to recompile those files and put it into belonging jar 
files. I put org.apache.catalina.loader.Reloader and 
org.apache.catalina.loader.Extension int tomcat4/server/lib/catalina.jar and 
org.apache.naming.JndiPermission into tomcat4/common/lib/naming-common.jar.

Alexander Höglind
[EMAIL PROTECTED]



RE: AUTHORIZATION HEADER MISSING

2002-04-18 Thread Ignacio J. Ortega

> c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(6
> 18) : error
> C2065: 'SF_NOTIFY_AUTH_COMPLETE' : undeclared identifier

You need to download and install the latest "Microsoft Platform SDK"

Saludos ,
Ignacio J. Ortega


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




RE: AUTHORIZATION HEADER MISSING

2002-04-18 Thread Robert Priest

Trying to build the dll from "jakart-tomcat-connectors"

Using:

Windows 2000 SP2
Visual C++ 6.0

Any Ideas about the following error:

Deleting intermediate files and output files for project 'isapi - Win32
Debug'.
Configuration: isapi - Win32 Debug
Compiling...
jk_ajp12_worker.c
jk_ajp13.c
jk_ajp13_worker.c
jk_ajp14.c
jk_ajp14_worker.c
jk_ajp_common.c
jk_connect.c
jk_context.c
jk_isapi_plugin.c
c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(618) : error
C2065: 'SF_NOTIFY_AUTH_COMPLETE' : undeclared identifier
c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(664) : warning
C4018: '==' : signed/unsigned mismatch
c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(698) : error
C2065: 'PHTTP_FILTER_AUTH_COMPLETE_INFO' : undeclared identifier
c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(698) : error
C2146: syntax error : missing ')' before identifier 'pvNotification'
c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(698) : warning
C4047: '=' : 'int (__stdcall *)(struct _HTTP_FILTER_CONTEXT *,char *,void
*,unsigned long *)' differs in levels of indirection from 'int '
c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(698) : error
C2059: syntax error : ')'
c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(699) : error
C2146: syntax error : missing ')' before identifier 'pvNotification'
c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(699) : warning
C4047: '=' : 'int (__stdcall *)(struct _HTTP_FILTER_CONTEXT *,char *,char
*)' differs in levels of indirection from 'int '
c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(699) : error
C2059: syntax error : ')'
c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(700) : error
C2146: syntax error : missing ')' before identifier 'pvNotification'
c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(700) : warning
C4047: '=' : 'int (__stdcall *)(struct _HTTP_FILTER_CONTEXT *,char *,char
*)' differs in levels of indirection from 'int '
c:\jakarta-tomcat-connectors\jk\native\iis\jk_isapi_plugin.c(700) : error
C2059: syntax error : ')'
jk_jni_worker.c
jk_lb_worker.c
jk_map.c
jk_md5.c
jk_msg_buff.c
jk_nwmain.c
jk_pool.c
jk_sockbuf.c
jk_uri_worker_map.c
jk_util.c
c:\jakarta-tomcat-connectors\jk\native\common\jk_util.c(294) : warning
C4101: 'secret_file' : unreferenced local variable
jk_worker.c
Error executing cl.exe.

-Original Message-
From: Ignacio J. Ortega [mailto:[EMAIL PROTECTED]]
Sent: Thursday, April 18, 2002 11:23 AM
To: 'Robert Priest'
Cc: 'tomcat-dev'
Subject: RE: AUTHORIZATION HEADER MISSING


> De: Robert Priest [mailto:[EMAIL PROTECTED]]
> Enviado el: jueves 18 de abril de 2002 17:09

It was private but should be public.. :)

> Thanks Ignacio,
> 
> That is working! 
> 
> There seems to be an issue when I first set up a webfolder of 
> continously
> being asked to log in (I was prompted about four times
> when I set up the webfolder), but eventually I was able to 
> get in and see my
> files and folders.


I have no idea what happens.. 

> What version was this fixed, in the 4.0.3 of jk_isapi_plugin.c? 
> Because I the version of the dll I was using, was build from 
> the tomcat 3.3
> tree.
> This is what was specified in the tomcat ajp configuration 
> document for
> configuring tomcat 4
> with IIS (I have attached the document). I built it from the
> "jakarta-tomcat" tree.
> 

Well things are lttle confuse right now, i know, was confusing for me
also :) , jk from tomcat 3.3 is mostly freezed, so everything goes to
j-t-c/jk/native that should be more or less the same that j-t/native
has, from my test i know jni is not working on j-t-c, but that is really
minor, code is there, we need to have time to fix it.. :)

> If I build the one under "jakarta-tomcat-connectors", I 
> should get these
> changes, correct?

Correct

> Which one under "jakarta-tomcat-connectors" do I want to build:
> "jk/native/iis" or "jk/native/isapi"?

iis 

(Below are some explanations of what we are talking about )

Saludos ,
Ignacio J. Ortega


> -Original Message-
> From: Ignacio J. Ortega [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, April 18, 2002 9:31 AM
> To: 'Robert Priest'
> Subject: RE: AUTHORIZATION HEADER MISSING
> 
> 
> Hola Robert:
> 
> Well the problem with auth in iis are actually 2:
> 
> 1) 2342 which implies that you can not use IIS native auth 
> wiht tomcat,
> and to have any auth eworking in this env your need to put
> tomcatAuthentication="true", this is the one i've think i've solved..
> that is you will be capable of use native auth in IIs by changing the
> above ajp13 attribute to false, binarie attached.. change the name of
> the dll to fit your configs.
> 
> 
> 2) 5647 related to above, and caused by not implementing
> tomcatAuthentication, tomcatAuthentication="true" was working from the
> time the bug was fixed..
> 
> Saludos ,
> Ignacio J. Ortega
> 
> 
> > -Mensaje original-

RE: AUTHORIZATION HEADER MISSING

2002-04-18 Thread Ignacio J. Ortega

> De: Robert Priest [mailto:[EMAIL PROTECTED]]
> Enviado el: jueves 18 de abril de 2002 17:09

It was private but should be public.. :)

> Thanks Ignacio,
> 
> That is working! 
> 
> There seems to be an issue when I first set up a webfolder of 
> continously
> being asked to log in (I was prompted about four times
> when I set up the webfolder), but eventually I was able to 
> get in and see my
> files and folders.


I have no idea what happens.. 

> What version was this fixed, in the 4.0.3 of jk_isapi_plugin.c? 
> Because I the version of the dll I was using, was build from 
> the tomcat 3.3
> tree.
> This is what was specified in the tomcat ajp configuration 
> document for
> configuring tomcat 4
> with IIS (I have attached the document). I built it from the
> "jakarta-tomcat" tree.
> 

Well things are lttle confuse right now, i know, was confusing for me
also :) , jk from tomcat 3.3 is mostly freezed, so everything goes to
j-t-c/jk/native that should be more or less the same that j-t/native
has, from my test i know jni is not working on j-t-c, but that is really
minor, code is there, we need to have time to fix it.. :)

> If I build the one under "jakarta-tomcat-connectors", I 
> should get these
> changes, correct?

Correct

> Which one under "jakarta-tomcat-connectors" do I want to build:
> "jk/native/iis" or "jk/native/isapi"?

iis 

(Below are some explanations of what we are talking about )

Saludos ,
Ignacio J. Ortega


> -Original Message-
> From: Ignacio J. Ortega [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, April 18, 2002 9:31 AM
> To: 'Robert Priest'
> Subject: RE: AUTHORIZATION HEADER MISSING
> 
> 
> Hola Robert:
> 
> Well the problem with auth in iis are actually 2:
> 
> 1) 2342 which implies that you can not use IIS native auth 
> wiht tomcat,
> and to have any auth eworking in this env your need to put
> tomcatAuthentication="true", this is the one i've think i've solved..
> that is you will be capable of use native auth in IIs by changing the
> above ajp13 attribute to false, binarie attached.. change the name of
> the dll to fit your configs.
> 
> 
> 2) 5647 related to above, and caused by not implementing
> tomcatAuthentication, tomcatAuthentication="true" was working from the
> time the bug was fixed..
> 
> Saludos ,
> Ignacio J. Ortega
> 
> 
> > -Mensaje original-
> > De: Robert Priest [mailto:[EMAIL PROTECTED]]
> > Enviado el: jueves 18 de abril de 2002 15:24
> > Para: Ignacio J. Ortega
> > Asunto: RE: AUTHORIZATION HEADER MISSING
> > 
> > 
> > Thanks Ignacio.
> > 
> > I will try the changes marked in that Bug Report. 
> > Right now, I have a few other things going on, but I should 
> > be able to try
> > it 
> > in the next couple of days.
> > 
> > If you do have binaries I could use, I would appreciate them. 
> > It may help me
> > move to test
> > faster. 
> > 
> > Also, did you read my comment on bug 5647. It is the last 
> > one. Just wanted
> > to know
> > if you were aware of were I last left off.
> > 
> > http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5647
> > 
> > 
> > -Original Message-
> > From: Ignacio J. Ortega [mailto:[EMAIL PROTECTED]]
> > Sent: Wednesday, April 17, 2002 9:23 AM
> > To: 'Robert Priest'
> > Subject: RE: AUTHORIZATION HEADER MISSING
> > 
> > 
> > Typo!!
> > 
> > I would say 2342, sorry
> > 
> > Saludos ,
> > Ignacio J. Ortega
> > 
> > 
> > > -Mensaje original-
> > > De: Robert Priest [mailto:[EMAIL PROTECTED]]
> > > Enviado el: miércoles 17 de abril de 2002 15:22
> > > Para: Ignacio J. Ortega
> > > Asunto: RE: AUTHORIZATION HEADER MISSING
> > > 
> > > 
> > > Ignacio,
> > > 
> > > You are speaking of the xerces parser issue (2432) being 
> > > fixed, right? Not
> > > the 
> > > ISAPI Filter problem (5647), correct?
> > > 
> > > If you are speaking of the isapi problem, I would like to see 
> > > your binaries.
> > > 
> > > Thank you.
> > > 
> > > -Original Message-
> > > From: Ignacio J. Ortega [mailto:[EMAIL PROTECTED]]
> > > Sent: Tuesday, April 16, 2002 9:57 AM
> > > To: 'Tomcat Users List'
> > > Subject: RE: AUTHORIZATION HEADER MISSING
> > > 
> > > 
> > > > De: Robert Priest [mailto:[EMAIL PROTECTED]]
> > > > Enviado el: martes 16 de abril de 2002 15:50
> > > 
> > > J-T-C jk from CVS HEAD has that problem solved,  i can 
> > > provide binaries
> > > to test this new feature... send me a private mail if you 
> want it..
> > > 
> > > Apropos i'm talking about Bug#2432 ;)
> > > 
> > > Saludos ,
> > > Ignacio J. Ortega
> > > 
> > > 
> > > 
> > > --
> > > To unsubscribe:   
> 
> > For additional commands: 
> 
> > Troubles with the list: 
> 
> > 
> 
> 

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apach e2 mod_jk.dsp

2002-04-18 Thread Ignacio J. Ortega

> De: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> Enviado el: jueves 18 de abril de 2002 16:46

> 
> IMHO you should commit - even if it doesn't work ( or brakes the 
> builds :-). 
> 
> 

Done 

> 
> After you commit the jk_service_isapi, I don't want to duplicate
> that.
> 

I called it jk2_service_iis.c , ISAPI is not exclusive for IIS, but
jk_service_iis it is, so called it after the server, i think we will end
( or at least with should try to have ) a unique isapi_plugin.c that can
use one of many adapters to especific webserver, i reacll domino uses
isapi too.. im right ?


Saludos ,
Ignacio J. Ortega


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Coyote/jk2 - interaction explanations please

2002-04-18 Thread Remy Maucherat

> On Thu, 18 Apr 2002, GOMEZ Henri wrote:
>
> > Happy to see how jk and coyote fit well together ;)
>
> Well, it certainly saved me a lot of time. Plus the joy of
> breaking Gump.
>
> It works amazingly well - I expected some pain in getting
> the JNI worker for tomcat4.x ( especially 4.1 ) - it turned
> out all I had to do is change TOMCAT_HOME and few paths.
> ( and hack the startup - 4.1 seems to hung the main thread,
> but that's easy to work around, plus the decodeURL ).

I don't know any differences in the thread handling between 4.0 and 4.1.
What is the problem ?
Also I don't understand why you seem to think that 4.1 would be harder to
work with. It should be the same.

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi iis.h isapi.dsp jk2_isapi_plugin.c jk_service_iis.c

2002-04-18 Thread nacho

nacho   02/04/18 08:03:32

  Added:   jk/native2/server/isapi iis.h isapi.dsp jk2_isapi_plugin.c
jk_service_iis.c
  Log:
  * Initial commit for jk2 isapi plugin, mostly broken and doesnt compile.
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-connectors/jk/native2/server/isapi/iis.h
  
  Index: iis.h
  ===
  //static jk_worker_env_t worker_env;
  #define _WIN32_WINNT 0x0400
  
  #include 
  #include 
  #include 
  
  #include "jk_global.h"
  //#include "jk_util.h"
  #include "jk_pool.h"
  
  struct isapi_private_data {
  jk_pool_t p;
  
  int request_started;
  unsigned bytes_read_so_far;
  LPEXTENSION_CONTROL_BLOCK  lpEcb;
  };
  typedef struct isapi_private_data isapi_private_data_t;
  
  
  
  static int JK_METHOD start_response(jk_env_t *env, jk_ws_service_t *s );
  
  static int JK_METHOD read(jk_env_t *env, jk_ws_service_t *s,
void *b, unsigned len,
unsigned *actually_read);
  
  static int JK_METHOD write(jk_env_t *env,jk_ws_service_t *s,
 const void *b,
 unsigned l);
  
  
  
  1.1  jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp
  
  Index: isapi.dsp
  ===
  # Microsoft Developer Studio Project File - Name="isapi" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
  CFG=isapi - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "isapi.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "isapi.mak" CFG="isapi - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "isapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "isapi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
  # Begin Project
  # PROP AllowPerConfigDependencies 0
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "isapi - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D 
"_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c
  # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D 
"_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0xc0a /d "NDEBUG"
  # ADD RSC /l 0xc0a /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /machine:I386
  # ADD LINK32 libapr.lib libaprutil.lib kernel32.lib user32.lib advapi32.lib 
wsock32.lib /nologo /dll /machine:I386 /out:"Release/isapi_redirector2.dll"
  
  !ELSEIF  "$(CFG)" == "isapi - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" 
/D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /GZ /c
  # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I 
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE20_HOME)\include" 
/I "$(APR_HOME)\apr\include" /I "$(APR_HOME)\apr-util\include" /I 
"$(APACHE20_HOME)\os\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D 
"_USRDLL" /D "ISAPI_EXPORTS" /FR /YX /FD /GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0xc0a /d "_DEBUG"
  # ADD RSC /l 0xc0a /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib

RE: Coyote/jk2 - interaction explanations please

2002-04-18 Thread costinm

On Thu, 18 Apr 2002, GOMEZ Henri wrote:

> Happy to see how jk and coyote fit well together ;)

Well, it certainly saved me a lot of time. Plus the joy of 
breaking Gump.

It works amazingly well - I expected some pain in getting
the JNI worker for tomcat4.x ( especially 4.1 ) - it turned 
out all I had to do is change TOMCAT_HOME and few paths.
( and hack the startup - 4.1 seems to hung the main thread,
but that's easy to work around, plus the decodeURL ).

Costin



--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apach e2 mod_jk.dsp

2002-04-18 Thread costinm

On Thu, 18 Apr 2002, Ignacio J. Ortega wrote:

> > What you can do is start with jk_service_iis.c ( based on 
> > jk_service_apache13 ) - and move the few methods related with 
> > request.
> > 
> 
> Mind Reading?? this is done already :) not committed but done, mainly
> refactoring existing ISAPI code, that does not change in between jk
> versions.. 

IMHO you should commit - even if it doesn't work ( or brakes the 
builds :-). 



> Well one can run tomcat without service, i'm in favor of the alternative
> method we have now, that is just another properties file near the
> extension DLL, it makes installation much more manageable and easy than
> registry.. but im open to evrything..

Sure - it's not exclusive. 

What I'm saying is that we should try to minimize the the ammount of user
interaction, if a certain info is available then use it. 

In this case - we have code to read the registry, and in some cases
we may find the location of tomcat and apache (for mod_jk _ from the 
service key. It doesn't cost too much to do the test. 

If not found - we can use other means, like a jk-specific key. What I 
would like to do is implement jk_config interface for the registry,
and expose it from both jk and java. 


> Well the problem, is that having the Filter and the extesion together,
> we can not use the automatic thread handling code that IIS has for
> extensions, because the extension code is loaded by the filter that
> executes in the main IIs threads, spliting it, you can leave IIS to
> manage the service threads for the extension automatically..  

You're the expert :-)


> > Let me know if you need help - I will try to do some refactoring to
> > extract the code dealing with the registry ( into 
> > common/jk_config_registry ) and let both tomcat and mod_jk2 use it.
> > If you want I can do a quick refactoring and put the new stuff 
> > in - to get it started.
> > 
> 
> Please do it.. This way i can better use my very limited apache time..

After you commit the jk_service_isapi, I don't want to duplicate
that.

Costin


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




RE: Coyote/jk2 - interaction explanations please

2002-04-18 Thread GOMEZ Henri

Happy to see how jk and coyote fit well together ;)

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



>-Original Message-
>From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
>Sent: Thursday, April 18, 2002 4:38 PM
>To: Tomcat Developers List
>Subject: RE: Coyote/jk2 - interaction explanations please
>
>
>On Thu, 18 Apr 2002, GOMEZ Henri wrote:
>
>> >In Coyote, there's:
>> >- the container adapters (for 3.3, 4.0, 4.0-HEAD)
>> >- the external API (request, response, and a couple other things)
>> >
>> >JK 2 and HTTP/1.1 are protocol handlers for Coyote.
>> 
>> Thanks for that.
>> 
>> Coyote + HTTP/1.1 proto handler in coyote cvs
>> jk2 proto handler in jtc cvs 
>
>
>All are in j-t-c - coyote is separated from http/1.1.
>
>Coyote is the 'connector' - or 'adapter' between the servlet
>container and various protocols.
>
>We removed most of the duplicated code, the only remaining problem
>is to merge the various 'hooks'/actions/etc - but in a later 
>release, now the focus is to get things working.
>
>Costin
>
>
>--
>To unsubscribe, e-mail:   
>
>For additional commands, e-mail: 
>
>
>

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




RE: Coyote/jk2 - interaction explanations please

2002-04-18 Thread costinm

On Thu, 18 Apr 2002, GOMEZ Henri wrote:

> >In Coyote, there's:
> >- the container adapters (for 3.3, 4.0, 4.0-HEAD)
> >- the external API (request, response, and a couple other things)
> >
> >JK 2 and HTTP/1.1 are protocol handlers for Coyote.
> 
> Thanks for that.
> 
> Coyote + HTTP/1.1 proto handler in coyote cvs
> jk2 proto handler in jtc cvs 


All are in j-t-c - coyote is separated from http/1.1.

Coyote is the 'connector' - or 'adapter' between the servlet
container and various protocols.

We removed most of the duplicated code, the only remaining problem
is to merge the various 'hooks'/actions/etc - but in a later 
release, now the focus is to get things working.

Costin


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Coyote/jk2 - interaction explanations please

2002-04-18 Thread Remy Maucherat

> Thanks for that.
> 
> Coyote + HTTP/1.1 proto handler in coyote cvs

Coyote is in jtc/coyote
HTTP/1.1 is in jtc/http11

> jk2 proto handler in jtc cvs 

jtc/jk and the package is org.apache.jk.*.

> Right ?

Almost.

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Test build for Tomcat 4.next available

2002-04-18 Thread Remy Maucherat

> On Thu, 18 Apr 2002, Remy Maucherat wrote:
>
> > What is the problem with "4.1" ? The differences with 4.0 should be
minimal.
> > If it's a mapping bug, one difference is that the protocol handler has
to
> > fill out the decodedURI field of the request. Since it's part of the
HTTP
> > and URI specs, I moved it in the protocol handler.
> > If it's a problem for you, I can move the code back in the adapter.
>
> Well, it's not a problem if I know about it :-)
> Thanks, I'll change that and see if it works.

I already moved the decoding code back in the adapter. It doesn't make any
difference and there's no reason to force the protocol handler to do that.

Try it and let me know if it works.

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Test build for Tomcat 4.next available

2002-04-18 Thread costinm

On Thu, 18 Apr 2002, Remy Maucherat wrote:

> What is the problem with "4.1" ? The differences with 4.0 should be minimal.
> If it's a mapping bug, one difference is that the protocol handler has to
> fill out the decodedURI field of the request. Since it's part of the HTTP
> and URI specs, I moved it in the protocol handler.
> If it's a problem for you, I can move the code back in the adapter.

Well, it's not a problem if I know about it :-)
Thanks, I'll change that and see if it works.



Costin


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




DO NOT REPLY [Bug 6990] - Catalina 4.0.2 hangs after a few days

2002-04-18 Thread 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://nagoya.apache.org/bugzilla/show_bug.cgi?id=6990

Catalina 4.0.2 hangs after a few days

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|CLOSED

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




DO NOT REPLY [Bug 6990] - Catalina 4.0.2 hangs after a few days

2002-04-18 Thread 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://nagoya.apache.org/bugzilla/show_bug.cgi?id=6990

Catalina 4.0.2 hangs after a few days

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2002-04-18 14:02 ---
There is a bug that can be triggered rarely when an HTTP POST is performed
using mod_jk which causes the HTTP POST Request content sent to be < the
ContentLength.  A fix has been found and committed to CVS. The bug fix will be
available in the next 4.0.x release.

As a work around you can do an Apache reload, this will tear down the socket
from the Apache side which will cause Tomcat to break out of that infinite
loop.

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




RE: cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

2002-04-18 Thread Keith Wannamaker

I haven't heard from any 4.0 folks -- any interest
in me doing something similar for that tree?

Keith

| -Original Message-
| From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
| Sent: Thursday, April 18, 2002 8:58 AM
| To: [EMAIL PROTECTED]
| Subject: cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF
| test-tomcat.xml
| 
|   Log:
|   Remove '.sh' extensions from shell scripts (in the build).
|   Update references.
|   


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

2002-04-18 Thread keith

keith   02/04/18 06:58:01

  Modified:.README RELEASE-NOTES-3.3.2.txt build.xml
   src/admin index.html
   src/build/nightly start_tomcat.sh stop_tomcat.sh
   src/build/pkg prototype tomcat.spec
   src/doc  readme serverxml.html tomcat-security.html
tomcat-ssl-howto.html tomcat-ug.html
   src/doc/appdev processes.html
   src/native/mod_jk README
   src/shell jspc.sh shutdown.sh startup.sh tomcat.sh
   src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Remove '.sh' extensions from shell scripts (in the build).
  Update references.
  
  Revision  ChangesPath
  1.20  +10 -10jakarta-tomcat/README
  
  Index: README
  ===
  RCS file: /home/cvs/jakarta-tomcat/README,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- README24 Feb 2002 03:50:14 -  1.19
  +++ README18 Apr 2002 13:57:59 -  1.20
  @@ -60,13 +60,13 @@
 This version can be executed as follows:
   
cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat
  - ./bin/startup.sh<-- Unix
  + ./bin/startup   <-- Unix
bin\startup <-- Windows
   
 and it can be shut down as follows:
   
cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat
  - ./bin/shutdown.sh   <-- Unix
  + ./bin/shutdown  <-- Unix
bin\shutdown<-- Windows
   
   * You can also build a binary distribution version of Tomcat as follows:
  @@ -95,7 +95,7 @@
   * To start Tomcat, execute the following commands:
   
cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat
  - ./bin/startup.sh<-- Unix
  + ./bin/startup   <-- Unix
bin\startup <-- Windows
   
   * You can now access the default web pages from a web browser at URL:
  @@ -105,7 +105,7 @@
   * To stop Tomcat, execute the following commands:
   
cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat
  - ./bin/shutdown.sh   <-- Unix
  + ./bin/shutdown  <-- Unix
bin\shutdown<-- Windows
   
   You can run the "distribution" version of Tomcat as follows:
  @@ -113,7 +113,7 @@
   * To start Tomcat, execute the following commands:
   
cd $JAKARTA_HOME/jakarta-tomcat/dist/tomcat
  - ./bin/startup.sh<-- Unix
  + ./bin/startup   <-- Unix
bin\startup <-- Windows
   
   * You can now access the default web pages from a web browser at URL:
  @@ -123,7 +123,7 @@
   * To stop Tomcat, execute the following commands:
   
cd $JAKARTA_HOME/jakarta-tomcat/dist/tomcat
  - ./bin/shutdown.sh   <-- Unix
  + ./bin/shutdown  <-- Unix
bin\shutdown<-- Windows
   
   Alternatively, you can run Tomcat without changing your current working
  @@ -133,12 +133,12 @@
   "$JAKARTA_HOME/jakarta-tomcat/dist/tomcat").  Now, you can start Tomcat
   as follows:
   
  - $TOMCAT_HOME/bin/startup.sh <-- Unix
  + $TOMCAT_HOME/bin/startup<-- Unix
%TOMCAT_HOME%\bin\startup   <-- Windows
   
   and shut it down likewise:
   
  - $TOMCAT_HOME/bin/shutdown.sh<-- Unix
  + $TOMCAT_HOME/bin/shutdown   <-- Unix
%TOMCAT_HOME%\bin\shutdown  <-- Windows
   
   Tomcat may be run with any XML parser that is compliant with the Java API for
  @@ -173,14 +173,14 @@
   "trusted". This can be accomplished by executing the following:
   
cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat<-- Unix
  - ./bin/tomcat.sh enableAdmin
  + ./bin/tomcat enableAdmin
   
cd %JAKARTA_HOME%\jakarta-tomcat\build\tomcat   <-- Windows
bin\tomcat enableAdmin
   
   Next, start Tomcat with: 
   
  - ./bin/startup.sh<-- Unix
  + ./bin/startup   <-- Unix
bin\startup <-- Windows
   
   To run the test, invoke the following URL in your browser:
  
  
  
  1.4   +2 -1  jakarta-tomcat/RELEASE-NOTES-3.3.2.txt
  
  Index: RELEASE-NOTES-3.3.2.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/RELEASE-NOTES-3.3.2.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RELEASE-NOTES-3.3.2.txt   17 Apr 2002 02:44:11 -  1.3
  +++ RELEASE-NOTES-3.3.2.txt   18 Apr 2002 13:57:59 -  1.4
  @@ -3,7 +3,7 @@
Release Notes
=
   
  -$Id: RELEASE-NOTES-3.3.2.txt,v 1.3 2002/04/17 02:44:11 billbarker Exp $
  +$Id: RELEASE-NOTES-3.3.2.txt,v 1.4 2002/04/18 13:57:59 keith Exp $
   
   
   This document describes the changes that have been made since the
  @@ -21,6 +21,7 @@
   
   8099 Preserve the query string when redirecting to the welcome page.
   
  + Removed '.sh' extension from

R: How can I install Tomcat 4.0 as a plug-in of IIS 5.1?

2002-04-18 Thread Luca Ventura

Thanks a lot Kevin :))

Now with "tomcat 4.0.4 beta 2" all works fine!

Great!

Luca

P.S: ...is it possible to release a version a Web Server without all the
libraries for running? :((

-Messaggio originale-
Da: Kevin Seguin [mailto:[EMAIL PROTECTED]]
Inviato: giovedì 18 aprile 2002 14.35
A: Tomcat Developers List; [EMAIL PROTECTED]
Oggetto: RE: How can I install Tomcat 4.0 as a plug-in of IIS 5.1?


at one point there was a tomcat-util.jar that was missing some resource
bundles (some LocalStrings.properties files) i can't remember exactly
what the error(s) looked like for this, but you might try the latest tomcat
4.0.4 beta 2 release.

-kevin.

> -Original Message-
> From: Luca Ventura [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, April 18, 2002 4:40 AM
> To: [EMAIL PROTECTED]; [EMAIL PROTECTED]
> Subject: How can I install Tomcat 4.0 as a plug-in of IIS 5.1?
>
>
>
> Hello!
>
> My name is Luca Ventura and I am an italian student.
> I have Microsoft IIS Web Server (5.1) on a PC with Win XP Professional
> installed and JDK 1.4. I would like
> to install Apache Tomcat 4.0 as a plug-in to support JSP and
> Servlets but
> until now all my tries have been unsuccessful.
>
> I have downloaded Tomcat 4.0 at URL:
>
> http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4
> .0.3/bin/
>
> I have downloaded the two versions of Tomacat:
>
> jakarta-tomcat-4.0.3-LE-jdk14.exe (for JDK 1.4)
> jakarta-tomcat-4.0.3.exe (for JDK 1.2+, it also contains other J2EE
> libraries).
>
> Then I have followed the instructions for installing Tomcat 4
> as a plug-in
> of ISS present at URL:
>
> http://members.ozemail.com.au/~lampante/howto/tomcat/iisnt/
>
> and at URL:
>
> http://jakarta.apache.org/tomcat/tomcat-3.2-doc/tomcat-iis-howto.html
>
>
> The problem is that when I start Tomcat and IIS and I try to
> access to a JSP
> page I obtain the error showed by picture "error_tomcat.jpg", that I
> inserted in attach.
>
> The class "org.apache.tomcat.util.http.BaseRequest" is present in
> "tomcat-util.jar" present in \server\lib
> but it seems that
> Tomcat doesn't find that package (and the method
> authorization() of the
> class "BaseRequest"), but I don't know why. What must I do?
> Is there some
> configuration file in Tomcat where must I set the .jar files
> to use? Or must
> I insert them in the environment variable CLASSPATH?
>
> Then I want to point out that I want to configure Tomcat not as an NT
> service but I want to start it when I need accessing to
> "start menu" of
> Windows.
>
> I tried to use the isapi filter "isapi_redirector.dll" I found at:
>
> http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4
.0.3/bin/win32
/

instead of "isapi_redirect.dll" present in "tc4ntiis.zip" (you can download
it at url: http://members.ozemail.com.au/~lampante/howto/tomcat/iisnt/ ),
but the result is the same.


What can I do? Is there some can suggest to me some link I can use to
configure IIS and Tomcat 4 correctly? I have seen that in Jakarta web site
there are instructions to set Tomcat 3 with IIS but Tomcat 4 is very
different.

I pray you to tell me how to set all environments and configuration files of
Tomcat too :)

Thanks a lot in advance.
   Luca

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apach e2 mod_jk.dsp

2002-04-18 Thread Ignacio J. Ortega

> De: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> Enviado el: jueves 18 de abril de 2002 4:34

> 
> What you can do is start with jk_service_iis.c ( based on 
> jk_service_apache13 ) - and move the few methods related with 
> request.
> 

Mind Reading?? this is done already :) not committed but done, mainly
refactoring existing ISAPI code, that does not change in between jk
versions.. 

> Then remove almost everything from isapi.c - all you need is to 
> get ( from registry ? or env ? ) the location of tomcat ( I would 
> try both - please note that you probably have it already in 
> the tomcat service key - reusing that is the best choice !).
> 

Well one can run tomcat without service, i'm in favor of the alternative
method we have now, that is just another properties file near the
extension DLL, it makes installation much more manageable and easy than
registry.. but im open to evrything..

> 
> I don't think you need 2 dlls. Just one big dll including everything
> should be fine. ( don't forget the jni/ directory ).
> 
> 2 files - yes, one with only initialization ( with the major goal
> of finding the conf/ dir ), one for service. 
> 
> ( unless there's a problem having a dll as both filter and handler )
> 

Well the problem, is that having the Filter and the extesion together,
we can not use the automatic thread handling code that IIS has for
extensions, because the extension code is loaded by the filter that
executes in the main IIs threads, spliting it, you can leave IIS to
manage the service threads for the extension automatically..  

> Let me know if you need help - I will try to do some refactoring to
> extract the code dealing with the registry ( into 
> common/jk_config_registry ) and let both tomcat and mod_jk2 use it.
> If you want I can do a quick refactoring and put the new stuff 
> in - to get it started.
> 

Please do it.. This way i can better use my very limited apache time..


Saludos ,
Ignacio J. Ortega


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




RE: Coyote/jk2 - interaction explanations please

2002-04-18 Thread GOMEZ Henri

>In Coyote, there's:
>- the container adapters (for 3.3, 4.0, 4.0-HEAD)
>- the external API (request, response, and a couple other things)
>
>JK 2 and HTTP/1.1 are protocol handlers for Coyote.

Thanks for that.

Coyote + HTTP/1.1 proto handler in coyote cvs
jk2 proto handler in jtc cvs 

Right ?

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




RE: How can I install Tomcat 4.0 as a plug-in of IIS 5.1?

2002-04-18 Thread Kevin Seguin

at one point there was a tomcat-util.jar that was missing some resource bundles (some 
LocalStrings.properties files) i can't remember exactly what the error(s) looked 
like for this, but you might try the latest tomcat 4.0.4 beta 2 release.

-kevin.

> -Original Message-
> From: Luca Ventura [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, April 18, 2002 4:40 AM
> To: [EMAIL PROTECTED]; [EMAIL PROTECTED]
> Subject: How can I install Tomcat 4.0 as a plug-in of IIS 5.1?
> 
> 
> 
> Hello!
> 
> My name is Luca Ventura and I am an italian student.
> I have Microsoft IIS Web Server (5.1) on a PC with Win XP Professional
> installed and JDK 1.4. I would like
> to install Apache Tomcat 4.0 as a plug-in to support JSP and 
> Servlets but
> until now all my tries have been unsuccessful.
> 
> I have downloaded Tomcat 4.0 at URL:
> 
> http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4
> .0.3/bin/
> 
> I have downloaded the two versions of Tomacat:
> 
> jakarta-tomcat-4.0.3-LE-jdk14.exe (for JDK 1.4)
> jakarta-tomcat-4.0.3.exe (for JDK 1.2+, it also contains other J2EE
> libraries).
> 
> Then I have followed the instructions for installing Tomcat 4 
> as a plug-in
> of ISS present at URL:
> 
> http://members.ozemail.com.au/~lampante/howto/tomcat/iisnt/
> 
> and at URL:
> 
> http://jakarta.apache.org/tomcat/tomcat-3.2-doc/tomcat-iis-howto.html
> 
> 
> The problem is that when I start Tomcat and IIS and I try to 
> access to a JSP
> page I obtain the error showed by picture "error_tomcat.jpg", that I
> inserted in attach.
> 
> The class "org.apache.tomcat.util.http.BaseRequest" is present in
> "tomcat-util.jar" present in \server\lib 
> but it seems that
> Tomcat doesn't find that package (and the method 
> authorization() of the
> class "BaseRequest"), but I don't know why. What must I do? 
> Is there some
> configuration file in Tomcat where must I set the .jar files 
> to use? Or must
> I insert them in the environment variable CLASSPATH?
> 
> Then I want to point out that I want to configure Tomcat not as an NT
> service but I want to start it when I need accessing to 
> "start menu" of
> Windows.
> 
> I tried to use the isapi filter "isapi_redirector.dll" I found at:
> 
> http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4
.0.3/bin/win32
/

instead of "isapi_redirect.dll" present in "tc4ntiis.zip" (you can download
it at url: http://members.ozemail.com.au/~lampante/howto/tomcat/iisnt/ ),
but the result is the same.


What can I do? Is there some can suggest to me some link I can use to
configure IIS and Tomcat 4 correctly? I have seen that in Jakarta web site
there are instructions to set Tomcat 3 with IIS but Tomcat 4 is very
different.

I pray you to tell me how to set all environments and configuration files of
Tomcat too :)

Thanks a lot in advance.
   Luca

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




[GUMP] Build Failure - jakarta-tomcat-4.0

2002-04-18 Thread Craig McClanahan


This email is autogenerated from the output from:



Buildfile: build.xml

deploy-prepare:

deploy-static:

deploy:
 [echo] Target: Catalina - Deploy ...

flags:

flags.display:
 [echo] --- Build environment for Catalina ---
 [echo] If ${property_name} is displayed, then the property is not set)
 [echo] --- Build options ---
 [echo] full.dist=${full.dist}
 [echo] build.sysclasspath=only
 [echo] compile.debug=${compile.debug}
 [echo] compile.deprecation=${compile.deprecation}
 [echo] compile.optimize=${compile.optimize}
 [echo] --- Ant Flags ---
 [echo] 

Coyote b8 ?

2002-04-18 Thread Remy Maucherat

If someone can confirm that the incompatibility between 4.0-HEAD and JK 2 is
now fixed, I'd like to put out a new Coyote beta release.

It also fixes some SSL configuration problems with Tomcat 4.x, and a few
cosmetic fixes.

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Coyote/jk2 - interaction explanations please

2002-04-18 Thread Remy Maucherat

> Remy and Costin, could you tell us now, 
> what's in coyote and what's in jk/jk2 ?
> 
> It's hard to follow/track the changes ...

In Coyote, there's:
- the container adapters (for 3.3, 4.0, 4.0-HEAD)
- the external API (request, response, and a couple other things)

JK 2 and HTTP/1.1 are protocol handlers for Coyote.

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




RE: Building modapp for Tomcat4.0 and apache1_3.23

2002-04-18 Thread GOMEZ Henri

>> JF is working on the same kind of exotics OS I do and even
>> worst our boxes speak EBCDIC ;)
>
>Guys, that's _your_ problem. Not mine... I want to solve my 
>problem which is
>to build like APR and Apache 2.0 do (so that all platforms 
>supported by that
>build system are supported in the same way by mod_webapp). For 
>the rest, I
>don't really care (actually, I don't even care about Win32)

And that's why mod_jk is more usefull and widely used.
It take care of everybody problems, not just yours

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Coyote/jk2 - interaction explanations please

2002-04-18 Thread GOMEZ Henri

Remy and Costin, could you tell us now, 
what's in coyote and what's in jk/jk2 ?

It's hard to follow/track the changes ...


-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



>-Original Message-
>From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
>Sent: Saturday, April 13, 2002 11:34 PM
>To: Tomcat Developers List
>Subject: Re: [Coyote] Coyote 1.0 Beta 7 available
>
>
>On Sat, 13 Apr 2002, Remy Maucherat wrote:
>
>> - JK 2 protocol handler, with support for the AJP 1.4 protocol
>
>Let's call it ajp13 for now, to avoid further confusion :-)
>
>I think we also agreed to keep the protocol unchanged in the near 
>future ( even if additional APIs/functions could be implemented, 
>the protocol elements will not change ).
>
>Costin
>
>
>--
>To unsubscribe, e-mail:   
>
>For additional commands, e-mail: 
>
>
>

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Building modapp for Tomcat4.0 and apache1_3.23

2002-04-18 Thread Pier Fumagalli

"GOMEZ Henri" <[EMAIL PROTECTED]> wrote:

> Back to NetLife 
> 
>>> Libtool also has history: it "supports" old versions of OSes
>>> and compilers...
> 
> Exact but libtool is missing on many majors OS like Windows (native
> not cygwin) and OS/400 (in my case it's a major os). jkant could be
> an alternative (even if it didn't fix all problems)
> 
>> Damn right... At least someone understands why a piece of crap
>> like libtool
>> in some cases (compiling C code on all the platforms we have
>> to  support)
>> sometimes is better than the wonderful ANT...
> 
> JF is working on the same kind of exotics OS I do and even
> worst our boxes speak EBCDIC ;)

Guys, that's _your_ problem. Not mine... I want to solve my problem which is
to build like APR and Apache 2.0 do (so that all platforms supported by that
build system are supported in the same way by mod_webapp). For the rest, I
don't really care (actually, I don't even care about Win32)

Pier


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




RE: Building modapp for Tomcat4.0 and apache1_3.23

2002-04-18 Thread GOMEZ Henri

Back to NetLife 

>> Libtool also has history: it "supports" old versions of OSes 
>and compilers...

Exact but libtool is missing on many majors OS like Windows (native
not cygwin) and OS/400 (in my case it's a major os). jkant could be
an alternative (even if it didn't fix all problems)

>Damn right... At least someone understands why a piece of crap 
>like libtool
>in some cases (compiling C code on all the platforms we have 
>to  support)
>sometimes is better than the wonderful ANT...

JF is working on the same kind of exotics OS I do and even
worst our boxes speak EBCDIC ;)

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java

2002-04-18 Thread remm

remm02/04/18 02:12:52

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
  Log:
  - Move the decodedURI field to the adapter. Although this is part of the protocol,
it is more a convinience feature used in TC "4.1".
  - Although I didn't test it, this should fix the mapping problems with JK2 (since
the decodedURI field was used for mapping, I can understand why it didn't
work too well if it was empty).
  
  Revision  ChangesPath
  1.5   +11 -4 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
  
  Index: CoyoteAdapter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CoyoteAdapter.java16 Apr 2002 21:59:36 -  1.4
  +++ CoyoteAdapter.java18 Apr 2002 09:12:52 -  1.5
  @@ -1,6 +1,6 @@
  -/* * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
 1.4 2002/04/16 21:59:36 remm Exp $
  - * $Revision: 1.4 $
  - * $Date: 2002/04/16 21:59:36 $
  +/* * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
 1.5 2002/04/18 09:12:52 remm Exp $
  + * $Revision: 1.5 $
  + * $Date: 2002/04/18 09:12:52 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.4 $ $Date: 2002/04/16 21:59:36 $
  + * @version $Revision: 1.5 $ $Date: 2002/04/18 09:12:52 $
*/
   
   final class CoyoteAdapter
  @@ -277,12 +277,19 @@
   request.setServerName(req.serverName().toString());
   }
   
  +// URI decoding
  +req.decodedURI().duplicate(req.requestURI());
  +req.getURLDecoder().convert(req.decodedURI(), true);
  +req.decodedURI().setEncoding("UTF-8");
  +
  +// Normalize decoded URI
   if (!normalize(req.decodedURI())) {
   res.setStatus(400);
   res.setMessage("Invalid URI");
   throw new IOException("Invalid URI");
   }
   
  +// Parse session Id
   parseSessionId(req, request);
   
   // Additional URI normalization and validation is needed for security 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java

2002-04-18 Thread remm

remm02/04/18 02:11:44

  Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java
  Log:
  - Move the decodedURI field to the adapter. Although this is part of the protocol,
it is more a convinience feature used in TC "4.1".
  
  Revision  ChangesPath
  1.29  +0 -12 
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
  
  Index: Http11Processor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Http11Processor.java  13 Apr 2002 05:40:51 -  1.28
  +++ Http11Processor.java  18 Apr 2002 09:11:44 -  1.29
  @@ -659,18 +659,6 @@
   
   }
   
  -// URI decoding
  -try {
  -request.decodedURI().duplicate(request.requestURI());
  -request.getURLDecoder().convert(request.decodedURI(), true);
  -request.decodedURI().setEncoding("UTF-8");
  -} catch (IOException e) {
  -// 500 - Internal Server Error
  -response.setStatus(500);
  -log.warn("Error decoding URI");
  -error = true;
  -}
  -
   // Input filter setup
   InputFilter[] inputFilters = inputBuffer.getFilters();
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




Re: Test build for Tomcat 4.next available

2002-04-18 Thread Remy Maucherat

> On Wed, 17 Apr 2002, Remy Maucherat wrote:
>
> > The build (which can be considered alpha quality) can be downloaded at:
> > http://jakarta.apache.org/builds/jakarta-tomcat-4.0/nightly/test1/
>
> Hi Remy - something is strange in coyote/jk2 - I get:
> "No Context configured to process this request"
>
> Everything is fine with 4.0.
>
> BTW, curently coyote-jk2 is using jk2.properties for 'advanced' config,
> the one in j-t-c/jk/config should work fine ( but you may have to
> remove some of the channels )

What is the problem with "4.1" ? The differences with 4.0 should be minimal.
If it's a mapping bug, one difference is that the protocol handler has to
fill out the decodedURI field of the request. Since it's part of the HTTP
and URI specs, I moved it in the protocol handler.
If it's a problem for you, I can move the code back in the adapter.

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve ValveUtil.java

2002-04-18 Thread manveen

manveen 02/04/18 00:39:28

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
ValveUtil.java
  Log:
  fix for adding valve to service.
  
  Revision  ChangesPath
  1.4   +14 -9 
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java
  
  Index: ValveUtil.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ValveUtil.java12 Apr 2002 22:06:30 -  1.3
  +++ ValveUtil.java18 Apr 2002 07:39:28 -  1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
 1.3 2002/04/12 22:06:30 manveen Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/04/12 22:06:30 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
 1.4 2002/04/18 07:39:28 manveen Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/04/18 07:39:28 $
*
* 
*
  @@ -94,7 +94,7 @@
* A utility class that contains methods common across valves.
*
* @author Manveen Kaur
  - * @version $Revision: 1.3 $ $Date: 2002/04/12 22:06:30 $
  + * @version $Revision: 1.4 $ $Date: 2002/04/18 07:39:28 $
*/
   
   public final class ValveUtil {
  @@ -136,8 +136,8 @@
   try {
   
   String objectName = DeleteLoggerAction.getObjectName(parent,
  -TomcatTreeBuilder.REALM_TYPE);
  -
  +TomcatTreeBuilder.VALVE_TYPE);
  +
   ObjectName pname = new ObjectName(parent);
   StringBuffer sb = new StringBuffer(pname.getDomain());
   
  @@ -157,8 +157,11 @@
   response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
   return (null);
   }
  +
  +// Ensure that the requested valve name is unique
   
  -// Ensure that the requested user database name is unique
  +// TBD -- do we need this check?
  +/*
   ObjectName oname =
   new ObjectName(objectName);
   if (mBServer.isRegistered(oname)) {
  @@ -170,14 +173,16 @@
   response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);

   return (new ActionForward(mapping.getInput()));
   }
  +*/
   
   // Look up our MBeanFactory MBean
   ObjectName fname =
   new ObjectName(TomcatTreeBuilder.FACTORY_TYPE);
   
   // Create a new StandardValve object
  -values = new String[1];
  -values[0] = parent;
  +values = new String[1];
  +values[0] = parent;   
  +
   operation = "create" + valveType;
   if ("AccessLogValve".equalsIgnoreCase(valveType))
   operation = "createAccessLoggerValve";
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties

2002-04-18 Thread manveen

manveen 02/04/18 00:37:20

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
ApplicationResources_es.properties
  Log:
  Addes properties for aliases.
  
  Revision  ChangesPath
  1.43  +1 -0  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
  
  Index: ApplicationResources_en.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- ApplicationResources_en.properties16 Apr 2002 17:04:19 -  1.42
  +++ ApplicationResources_en.properties18 Apr 2002 07:37:20 -  1.43
  @@ -104,6 +104,7 @@
   actions.valves.deletes=Delete Existing Valves
   actions.alias.create=Create New Aliases
   actions.alias.delete=Delete Aliases
  +new.alias=New Alias
   connector.type=Type
   connector.scheme=Scheme
   connector.accept.count=Accept Count
  
  
  
  1.37  +1 -0  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
  
  Index: ApplicationResources_es.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- ApplicationResources_es.properties10 Apr 2002 00:37:07 -  1.36
  +++ ApplicationResources_es.properties18 Apr 2002 07:37:20 -  1.37
  @@ -105,6 +105,7 @@
   actions.service.delete=Eliminar este servicio
   actions.alias.create=Cree Los Nuevos Pseudonimos
   actions.alias.delete=Pseudonimos De la Cancelacion
  +new.alias=Nuevos Alias
   connector.type=Tipo
   connector.scheme=Scheme
   connector.accept.count=Valide La Cuenta
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 




8024 is bugging me

2002-04-18 Thread Attila Szegedi

Guys, the bug 8024 (http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8024)
is really bugging me. Excuse me for nudging; I do know this is volunteer
work and have respect for all of your time (being a committer myself on
several OSS projects), but could you incorporate the patch I provided
(http://nagoya.apache.org/bugzilla/showattachment.cgi?attach_id=1600) into
the CVS?

It's 4 lines total, shouldn't be hard to commit, and would finally enable
people to include XML entities generated by "jspc -webinc" into their
web.xml files. The inclusion of webinc entities is part of the
JSP-precompiling practice I described in a published article, and I keep
getting posts from people that read the article complaining it's not working
in TC 4.x. (This worked perfectly in TC 3.2.x, btw.)

TIA,
  Attila.

--
Attila Szegedi
home: http://www.szegedi.org


- Original Message -
From: "Christopher K. St. John" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: 2002. április 18. 8:44
Subject: [ANN] MinTC 0.6 Alpha "It's JSP-alicious"


>
>  Big news for this release: initial JSP support, a
> sucessful test of MinTC running a simple Apache XML-RPC
> demo, and confirmation that MinTC will run on a Sharp
> Zaurus. Watchdog results: "345 TEST(S) PASSED! 3 TEST(S)
> FAILED!". This should be the last alpha.
>
> Check it out at:
>
>   http://www.distributopia.com
>
>  MinTC is sort of a bizarro-world Catalina implementation.
> Instead of being maxed out with features, it's small and
> special-purpose. It requires no local file system access,
> and can execute servlets and serve static content from
> within its jar. Think web-enabling an application's admin
> interface, or packaging a webapp as a zero-installation
> standalone application.
>
>  MinTC is good for Tomcat 4 because it keeps the Catalina
> interfaces honest. If you're a Tomcat 4 developer it's
> probably worth a look just to see other implementation
> options.
>
> MinTC is hard to compile, and probably will remain that
> way until fairly late in the beta release cycle. If your
> webapp runs with Tomcat 4, and you'd like to see if it
> runs under MinTC, then drop me an email and we'll see
> about getting you a special build.
>
> --
> To unsubscribe, e-mail:

> For additional commands, e-mail:

>
>
>
>


--
To unsubscribe, e-mail:   
For additional commands, e-mail: