RE: cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml

2004-03-13 Thread Mladen Turk 
 

> From: NormW
> 
> >
> > Perhaps in 2.0.5
> * Suggested mainly for consistency with most of the other 
> objects, but it also now has enough properties that could 
> appear in a qry= dump.

Well, you may always make a patch :-).

> And lastly, the configwebcom.xml indicates the default value 
> for "slots" is 256, but the program
> if (!shm->slotMaxCount)
> shm->slotMaxCount = 1;
> suggests rather that it is 1, AFAICT.
> 

No, It's a sanity check if someone puts solts=0 in config, and for potential
settings from server side.
The default value is defined by DEFAULT_SLOT_COUNT, and it is set when the
shm object is created.

> Thanks again, and will now have to focus on Novell.
> Have a Good Morning && Good Day && Good Evening && Good Night!
> Norm
> 

I'm from Croatia (GMT+1) :-)

MT.


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

[GUMP@lsd]: jakarta-tomcat-5/jakarta-tomcat-5 failed

2004-03-13 Thread bobh 
To whom it may engage...

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

Project jakarta-tomcat-5 has an issue affecting it's community integration, and has 
been outstanding for 11 runs. The current state is 'Failed', for reason 'Build Failed'

Full details are available at: 
http://lsd.student.utwente.nl/gump/jakarta-tomcat-5/jakarta-tomcat-5.html, however 
some snippets follow:

-  -  -  -  - -- --  G U M P

Gump provided these annotations:

 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/server/lib/servlets-default.jar] 
identifier set to jar basename: [servlets-default.jar]
 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/common/lib/naming-common.jar] 
identifier set to jar basename: [naming-common.jar]
 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/common/lib/naming-resources.jar] 
identifier set to jar basename: [naming-resources.jar]
 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/server/lib/catalina.jar] 
identifier set to jar basename: [catalina.jar]
 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/bin/bootstrap.jar] identifier set 
to jar basename: [bootstrap.jar]
 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/server/lib/servlets-common.jar] 
identifier set to jar basename: [servlets-common.jar]
 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/server/lib/servlets-invoker.jar] 
identifier set to jar basename: [servlets-invoker.jar]
 - Info - Dependency on javamail exists, no need to add for property mail.jar.
 - Info - Dependency on jaf exists, no need to add for property activation.jar.
 - Info - Dependency on jakarta-servletapi-5-servlet exists, no need to add for 
property servlet-api.jar.
 - Info - Dependency on jakarta-servletapi-5-jsp exists, no need to add for property 
jsp-api.jar.
 - Info - Dependency on xml-xerces exists, no need to add for property xercesImpl.jar.
 - Info - Dependency on xml-xerces exists, no need to add for property 
xmlParserAPIs.jar.
 - Info - Dependency on jakarta-tomcat-util exists, no need to add for property 
tomcat-util.jar.
 - Info - Dependency on commons-el exists, no need to add for property commons-el.jar.
 - Info - Dependency on commons-logging exists, no need to add for property 
commons-logging-api.jar.
 - Info - Dependency on commons-modeler exists, no need to add for property 
commons-modeler.jar.
 - Info - Dependency on ant exists, no need to add for property ant.home.
 - Info - Dependency on jsse exists, no need to add for property jsse.home.
 - Info - Dependency on jmx exists, no need to add for property jmx.home.
 - Info - Dependency on jmx exists, no need to add for property jmx.jar.
 - Info - Dependency on jmx exists, no need to add for property jmx-tools.jar.
 - Info - Dependency on jndi exists, no need to add for property jndi.home.
 - Info - Dependency on jakarta-regexp exists, no need to add for property regexp.home.
 - Info - Dependency on jakarta-regexp exists, no need to add for property regexp.jar.
 - Info - Dependency on javamail exists, no need to add for property mail.home.
 - Info - Dependency on jakarta-tomcat-coyote exists, no need to add for property 
tomcat-coyote.home.
 - Info - Dependency on jakarta-tomcat-jasper_tc5 exists, no need to add for property 
jasper.home.
 - Info - Dependency on jaf exists, no need to add for property activation.home.
 - Info - Dependency on commons-modeler exists, no need to add for property 
commons-modeler.home.
 - Info - Dependency on commons-daemon exists, no need to add for property 
commons-daemon.jsvc.tar.gz.
 - Info - Dependency on jakarta-struts exists, no need to add for property struts.home.
 - Info - Enable "debug" output, due to a sequence of 10 previous errors.
 - Error - Failed with reason build failed


-  -  -  -  - -- --  G U M P
Gump performed this work:

Work Name: build_jakarta-tomcat-5_jakarta-tomcat-5 (Type: Build)
State: Failed
Elapsed: 0 hours, 0 minutes, 18 seconds
Command Line: java -Djava.awt.headless=true -Dbuild.clonevm=true 
-Xbootclasspath/p:/data3/gump/xml-xerces2/java/build/xercesImpl.jar:/data3/gump/xml-xerces2/java/build/xmlParserAPIs.jar:/data3/gump/xml-xalan/java/build/xalan-unbundled.jar:/data3/gump/xml-commons/java/external/build/xml-apis.jar
 org.apache.tools.ant.Main -debug -Dgump.merge=/data3/gump/gump-install/work/merge.xml 
-Dbuild.sysclasspath=only -Dtomcat33.home=*Unset* 
-Djsp-api.jar=/data3/gump/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar 
-Dtomcat-coyote.home=/data3/gump/jakarta-tomcat-connectors/coyote 
-Djndi.jar=/data3/gump/opt/jndi1_2_1/lib/jndi.jar 
-Dsite2.home=/data3/gump/jakarta-site2 
-DxmlParserAPIs.jar=/data3/gump/xml-xerces2/java/build/xercesImpl.jar 
-Dactivation.home=/data3/gump/opt/jaf-1.0.1 -Djmx.home=/data3/gump/opt/jmx-1_2-ri 
-Djdbc20ext.jar=/data3/gump/opt/jdbc2_0/jdbc2_0-stdext.jar 
-Djmx-to

Re: Re: cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml

2004-03-13 Thread ax 
This account does not exist



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

Re: cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml

2004-03-13 Thread NormW 
Good... what ever part of the day pleases... :-)

Another look at the new shm.c and would comment on a design point, perhaps
to consider for 2.0.5.

The setAttributes() list for shm.c includes a 'resetEndpointStats' element,
which is not a 'property' of shm but a means to reset its counters as
such it is actually closer to a method for the shm object. It is a matter of
design interpretation, but I see setAttributes() as a mechanism for setting
the value of a property rather than an alternate means to call local object
functions.

My $0.02.
Norm

> Hi,
>
> > -Original Message-
> > From: NormW
> > jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml
> >
> > Good morning.
>
> It depends where :-)
>
> > In looking at the new shm, note the following:
> >
> > 1. SHM no longer works on NetWare with either file option.
> > ... will have to look into that.
> >
>
> Good. It shouldn't, cause shm is not officially supported on Netware.
> That's why I've added the memory (changed to useMemory) option, where the
> mapping is done using plain allocated memory.
> That enables to use the stats and lb factors consistently.
> If you wish that useMemory will be the default behavior disable the apr's
> APR_HAS_SHARED_MEMORY flag.
>
> Since you have only single child process shm is not needed after all.
> I think that shm was planned to be the communication channel too, but that
> was never implemented.
>
> > 2. Is it possible to have a 'slots' 'auto' option that gets
> > the value from either the platform or the build rather than a
> > hard coded 256?
> >
>
> Perhaps in 2.0.5
> But I'll see if I can put that to workerEnv
>
> > 3. Can the shm 'memory' option be changed to 'memoryType' so
> > that it more self-explanatory. [memory=0 isn't.]
> >
>
> Changed to useMemory.
>
> > 4. The fourth line added should read "...memory. If set to
> > 'anonymous' use the anonymous shared memory".
> >
> > 5. The second last line added should read "Use the process
> > memory..." I think.
> >
> > 6. Can the size, file, slots and memory[Type] properties be
> > added to a shm getAttribute method?
> >
>
> Perhaps in 2.0.5
>
> > Thanks for any feedback,
> > Norm
> >
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>


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

DO NOT REPLY [Bug 27642] New: - trimSpaces property not settable via command-line options

2004-03-13 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://issues.apache.org/bugzilla/show_bug.cgi?id=27642

trimSpaces property not settable via command-line options

   Summary: trimSpaces property not settable via command-line
options
   Product: Tomcat 5
   Version: 5.0.19
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Jasper
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


There is no command-line option to turn on 'trimSpaces' while 
precompiling .jsp-s.

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

Re: Re: cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml

2004-03-13 Thread ax 
This account does not exist



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

Re: cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml

2004-03-13 Thread NormW 
Good morning Mladen.
Okay, a little bluff. The sun isn't quite up but the sky is clear. The Good
morning is as much to indicate that this project is a global thing as it is
a social sense.
Thanks for the time and consideration given the 'ideas' sent.

> Hi,
>
> > -Original Message-
> > From: NormW
> > jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml
> >
> > Good morning.
>
> It depends where :-)
* True, but one can only describe their experience and regards.

> > In looking at the new shm, note the following:
> >
> > 1. SHM no longer works on NetWare with either file option.
> > ... will have to look into that.
> >
>
> Good. It shouldn't, cause shm is not officially supported on Netware.
> That's why I've added the memory (changed to useMemory) option, where the
> mapping is done using plain allocated memory.
> That enables to use the stats and lb factors consistently.
> If you wish that useMemory will be the default behavior disable the apr's
> APR_HAS_SHARED_MEMORY flag.
>
> Since you have only single child process shm is not needed after all.
> I think that shm was planned to be the communication channel too, but that
> was never implemented.
* Sniff... we had it for a while, and now it's gone again, but that might be
the basis to prod Novell's own developers.

> > 2. Is it possible to have a 'slots' 'auto' option that gets
> > the value from either the platform or the build rather than a
> > hard coded 256?
> >
>
> Perhaps in 2.0.5
> But I'll see if I can put that to workerEnv

> > 3. Can the shm 'memory' option be changed to 'memoryType' so
> > that it more self-explanatory. [memory=0 isn't.]
> >
>
> Changed to useMemory.
* Thanks.

> > 4. The fourth line added should read "...memory. If set to
> > 'anonymous' use the anonymous shared memory".
> >
> > 5. The second last line added should read "Use the process
> > memory..." I think.
> >
> > 6. Can the size, file, slots and memory[Type] properties be
> > added to a shm getAttribute method?
> >
>
> Perhaps in 2.0.5
* Suggested mainly for consistency with most of the other objects, but it
also now has enough properties that could appear in a qry= dump.
> > Thanks for any feedback,
> > Norm
> >
And lastly, the configwebcom.xml indicates the default value for "slots" is
256, but the program
if (!shm->slotMaxCount)
shm->slotMaxCount = 1;
suggests rather that it is 1, AFAICT.

Thanks again, and will now have to focus on Novell.
Have a Good Morning && Good Day && Good Evening && Good Night!
Norm

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


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

DO NOT REPLY [Bug 17724] - HTML comments handled by Jasper incorrectly

2004-03-13 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://issues.apache.org/bugzilla/show_bug.cgi?id=17724

HTML comments handled by Jasper incorrectly

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2004-03-13 18:18 ---
Tomcat 4 implements the JSP 1.2 spec, not the 1.1 spec.

That being said, pretty much identical text can be found in JSP.2.5

Having read this section carefully I do not agree with your interpretation. I 
don't see anything that says that your example is invalid. It does give the 
example of using the expression sytax within a HTML comment but it does not 
state that scriplets are invalid in this location.

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

DO NOT REPLY [Bug 17690] - WARDirContext - setDocBase throws confusing message

2004-03-13 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://issues.apache.org/bugzilla/show_bug.cgi?id=17690

WARDirContext - setDocBase throws confusing message

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2004-03-13 17:52 ---
I have just committed this change to TC4 and TC5.

Thanks for the suggestion.

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

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources WARDirContext.java

2004-03-13 Thread markt 
markt   2004/03/13 09:51:53

  Modified:catalina/src/share/org/apache/naming/resources
WARDirContext.java
  Log:
  - Fix bug 17690. Display more helpful error message if docBase is invalid.
  - Ported from TC4.
  
  Revision  ChangesPath
  1.5   +2 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/WARDirContext.java
  
  Index: WARDirContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/WARDirContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WARDirContext.java27 Feb 2004 14:58:54 -  1.4
  +++ WARDirContext.java13 Mar 2004 17:51:53 -  1.5
  @@ -125,7 +125,7 @@
// Validate that the document base is an existing directory
if (!base.exists() || !base.canRead() || base.isDirectory())
throw new IllegalArgumentException
  - (sm.getString("warResources.notWar"));
  + (sm.getString("warResources.invalidWar", docBase));
   try {
   this.base = new ZipFile(base);
   } catch (Exception e) {
  
  
  

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

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources WARDirContext.java

2004-03-13 Thread markt 
markt   2004/03/13 09:50:39

  Modified:catalina/src/share/org/apache/naming/resources
WARDirContext.java
  Log:
  - Fix bug 17690. Display more helpful error message if docBase is invalid.
  - Remove unused imports identified by Eclipse.
  - Fix used of deprecated methods also identified by Eclipse.
  
  Revision  ChangesPath
  1.6   +6 -14 
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/WARDirContext.java
  
  Index: WARDirContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/WARDirContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WARDirContext.java28 Feb 2002 07:04:36 -  1.5
  +++ WARDirContext.java13 Mar 2004 17:50:39 -  1.6
  @@ -71,27 +71,19 @@
   import java.util.Enumeration;
   import java.io.File;
   import java.io.InputStream;
  -import java.io.OutputStream;
   import java.io.IOException;
   import java.util.zip.ZipEntry;
   import java.util.zip.ZipFile;
   import java.util.zip.ZipException;
  -import javax.naming.Context;
   import javax.naming.Name;
  -import javax.naming.NameParser;
   import javax.naming.NamingEnumeration;
   import javax.naming.NamingException;
   import javax.naming.CompositeName;
  -import javax.naming.NameParser;
   import javax.naming.OperationNotSupportedException;
  -import javax.naming.NameAlreadyBoundException;
   import javax.naming.directory.DirContext;
   import javax.naming.directory.Attributes;
  -import javax.naming.directory.Attribute;
   import javax.naming.directory.ModificationItem;
   import javax.naming.directory.SearchControls;
  -import org.apache.naming.StringManager;
  -import org.apache.naming.NameParserImpl;
   import org.apache.naming.NamingEntry;
   import org.apache.naming.NamingContextBindingsEnumeration;
   import org.apache.naming.NamingContextEnumeration;
  @@ -178,7 +170,7 @@
// Validate that the document base is an existing directory
if (!base.exists() || !base.canRead() || base.isDirectory())
throw new IllegalArgumentException
  - (sm.getString("warResources.notWar"));
  + (sm.getString("warResources.invalidWar", docBase));
   try {
   this.base = new ZipFile(base);
   } catch (Exception e) {
  @@ -503,7 +495,7 @@
   if (!zipEntry.isDirectory())
   attrs.setResourceType("");
   attrs.setContentLength(zipEntry.getSize());
  -attrs.setLastModified(new Date(zipEntry.getTime()));
  +attrs.setLastModified(zipEntry.getTime());
   
   return attrs;
   
  
  
  

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

DO NOT REPLY [Bug 17609] - Multiple IllegalStateExceptions (from exceeding maxActiveSessions) not handled

2004-03-13 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://issues.apache.org/bugzilla/show_bug.cgi?id=17609

Multiple IllegalStateExceptions (from exceeding maxActiveSessions) not handled

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2004-03-13 17:23 ---
I have just tested this with the latest source for TC4 and I don't see this 
behaviour.

I am assuming that this has been fixed somewhere between 4.1.18 and 4.1.30.

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

cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi install4iis.js

2004-03-13 Thread mturk 
mturk   2004/03/13 02:38:32

  Modified:jk/native2/server/isapi install4iis.js
  Log:
  Fix the install script argument parsing
  
  Revision  ChangesPath
  1.2   +5 -4  jakarta-tomcat-connectors/jk/native2/server/isapi/install4iis.js
  
  Index: install4iis.js
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/install4iis.js,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- install4iis.js29 Feb 2004 13:10:45 -  1.1
  +++ install4iis.js13 Mar 2004 10:38:32 -  1.2
  @@ -437,8 +437,8 @@
   

   }

   }

  -

  -if (args.optind <= args.argc) {

  +TRACE("argc " + args.argc + " optind " + args.optind);

  +if (args.optind >= args.argc) {

   /* Case when isapi_redirector2.dll is inside TOMCAT_HOME\bin */

   params.WebPath = WScript.ScriptFullName.substr(0,

WScript.ScriptFullName.lastIndexOf("\\"));

  @@ -446,14 +446,15 @@
   }

   else {

   params.WebPath = args.argv(args.optind);

  +++args.optind;

   }

   if (!checkFilterExists(params)) {

   ERROR(args, "The specified filter library could not be found...\n" +

 "File " + params.WebPath + "\\" + params.FilterLib + " does not 
exist.");

   

   }

  -if (args.argc && (args.optind > (args.argc - 1)))

  -tchome = args.argv(args.argc + 1);

  +if (args.optind < args.argc)

  +tchome = args.argv(args.optind);

   else if (!tchome)

   tchome = params.WebPath;

   workers2 = tchome + _DEFAULT_WORKERS2 ;

  
  
  

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

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

2004-03-13 Thread mturk 
mturk   2004/03/13 02:36:04

  Modified:jk/native2/server/isapi jk_isapi_plugin.c
  Log:
  Return 400 - Bad Request if the hostname is longer then 1012 bytes,
  and if port is out of rage [0-65536]
  
  Revision  ChangesPath
  1.62  +11 -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.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- jk_isapi_plugin.c 28 Feb 2004 09:01:11 -  1.61
  +++ jk_isapi_plugin.c 13 Mar 2004 10:36:04 -  1.62
  @@ -270,7 +270,7 @@
   
   rc = jk_requtil_unescapeUrl(uri);
   jk_requtil_getParents(uri);
  -
  +Host[0] = '\0';
   if (pfc->GetServerVariable(pfc, SERVER_NAME, (LPVOID)Host, 
(LPDWORD)&szHost)){
   if (szHost > 0) {
   Host[szHost-1] = '\0';
  @@ -283,6 +283,14 @@
   }
   }
   nPort = atoi(Port);
  +if (strlen(Host) > 1012 || nPort < 0 || nPort > 65535) {
  +env->l->jkLog(env, env->l,  JK_LOG_ERROR, 
  +"HttpFilterProc [%s] contains invalid host or port 
value.\n", 
  +uri);
  +write_error_response(pfc,"400 Bad Request", HTML_ERROR_400);
  +workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
  +return SF_STATUS_REQ_FINISHED;
  +}
   env->l->jkLog(env, env->l,  JK_LOG_DEBUG, 
   "In HttpFilterProc Virtual Host redirection of %s : 
%s\n", 
   Host, Port);
  @@ -578,6 +586,7 @@
   rc=(JK_OK == workerEnv->config->setPropertyString( env, workerEnv->config, 
"config.file", worker_file ));
   }
   workerEnv->init(env,workerEnv);
  + 
   env->l->jkLog(env, env->l, JK_LOG_INFO, "Set serverRoot %s\n", server_root);
   if (using_ini_file) {
   env->l->jkLog(env, env->l,  JK_LOG_DEBUG, "Using ini file %s.\n", 
ini_file_name);
  
  
  

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

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

2004-03-13 Thread ax 
This account does not exist



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

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

2004-03-13 Thread mturk 
mturk   2004/03/13 02:12:24

  Modified:jk/native2/common jk_worker_status.c
  Log:
  Use the apr_ctime for ReqStart.
  Since this is absolute time not a time difference, there is no need to
  display secons after 1970.
  
  Revision  ChangesPath
  1.56  +2 -1  jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
  
  Index: jk_worker_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- jk_worker_status.c13 Mar 2004 09:17:25 -  1.55
  +++ jk_worker_status.c13 Mar 2004 10:12:24 -  1.56
  @@ -70,7 +70,8 @@
   else
   s->jkprintf(env, s, "-\n");
   
  -s->jkprintf(env, s, "%lu\n", (long)apr_time_as_msec(stat->startTime));
  +apr_ctime( ctimeBuf, stat->startTime);
  +s->jkprintf(env, s, "%s\n", ctimeBuf);
   s->jkprintf(env, s, "%ld\n",
   (long)apr_time_as_msec(stat->jkStartTime - stat->startTime));
   s->jkprintf(env, s, "%ld\n",
  
  
  

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

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

2004-03-13 Thread mturk 
mturk   2004/03/13 01:17:25

  Modified:jk/native2/common jk_worker_status.c
  Log:
  Convert the times to msecs. apr_time_now return microsecods,
  so displaying that is not so user friendly.
  All the display logic and function calls should change to apr_time_t instead
  long.
  
  Revision  ChangesPath
  1.55  +13 -13jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
  
  Index: jk_worker_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- jk_worker_status.c12 Mar 2004 19:19:58 -  1.54
  +++ jk_worker_status.c13 Mar 2004 09:17:25 -  1.55
  @@ -61,20 +61,20 @@
   apr_ctime( ctimeBuf, stat->connectedTime );
   s->jkprintf(env, s, "%s\n", ctimeBuf );
   
  -s->jkprintf(env, s, "%ld\n", (long)stat->totalTime );
  -s->jkprintf(env, s, "%ld\n", (long)stat->maxTime );
  +s->jkprintf(env, s, "%ld\n", (long)apr_time_as_msec(stat->totalTime));
  +s->jkprintf(env, s, "%ld\n", (long)apr_time_as_msec(stat->maxTime));
   
   if( stat->reqCnt + stat->errCnt > 0 ) 
   s->jkprintf(env, s, "%ld\n",
  -(long)(stat->totalTime / ( stat->reqCnt + stat->errCnt )) );
  +(long)apr_time_as_msec((stat->totalTime / ( stat->reqCnt + 
stat->errCnt ;
   else
   s->jkprintf(env, s, "-\n");
   
  -s->jkprintf(env, s, "%lu\n", (long)stat->startTime );
  +s->jkprintf(env, s, "%lu\n", (long)apr_time_as_msec(stat->startTime));
   s->jkprintf(env, s, "%ld\n",
  -(long)(stat->jkStartTime - stat->startTime) );
  +(long)apr_time_as_msec(stat->jkStartTime - stat->startTime));
   s->jkprintf(env, s, "%ld\n",
  -(long)(stat->endTime - stat->startTime) );
  +(long)apr_time_as_msec(stat->endTime - stat->startTime));
   
   totalTime += (long)stat->totalTime;
   if( maxTime < stat->maxTime )
  @@ -100,10 +100,10 @@
   s->jkprintf(env, s, "%d\n", totalReq );
   s->jkprintf(env, s, "%d\n", totalErr );
   
  -s->jkprintf(env, s, "%ld\n", maxTime );
  +s->jkprintf(env, s, "%ld\n", apr_time_as_msec(maxTime));
   
   if( totalErr + totalReq > 0 ) {
  -unsigned long avg=totalTime / ( totalReq + totalErr );
  +unsigned long avg=apr_time_as_msec(totalTime / ( totalReq + totalErr));
   s->jkprintf(env, s, "%ld\n", avg );
   } else {
   s->jkprintf(env, s, "-\n" );
  @@ -479,14 +479,14 @@
   apr_ctime( ctimeBuf, stat->connectedTime );
   s->jkprintf(env, s, "lastConnectionTime=%s\n", ctimeBuf);
   
  -s->jkprintf(env, s, "totalTime=%ld\n", (long)stat->totalTime );
  -s->jkprintf(env, s, "maxTime=%ld\n", (long)stat->maxTime ); 
  +s->jkprintf(env, s, "totalTime=%ld\n", 
(long)apr_time_as_msec(stat->totalTime));
  +s->jkprintf(env, s, "maxTime=%ld\n", 
(long)apr_time_as_msec(stat->maxTime)); 
   
  -s->jkprintf(env, s, "requestStart=%lu\n", (long)stat->startTime); 
  +s->jkprintf(env, s, "requestStart=%lu\n", 
(long)apr_time_as_msec(stat->startTime)); 
   s->jkprintf(env, s, "jkTime=%ld\n", 
  -(long)(stat->jkStartTime - stat->startTime) );
  +(long)apr_time_as_msec((stat->jkStartTime - 
stat->startTime)));
   s->jkprintf(env, s, "requestEnd=%ld\n", 
  -(long)(stat->endTime - stat->startTime) );
  +(long)apr_time_as_msec((stat->endTime - 
stat->startTime)));
   s->jkprintf(env, s, "\n"); 
   }
   
  
  
  

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

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

2004-03-13 Thread mturk 
mturk   2004/03/13 00:49:26

  Modified:jk/native2/server/apache2 mod_jk2.c
  Log:
  Use the maxDaemon from workerEnv, and query the mpm on jk2_init.
  Also on single child mpm's use the pid for a child id.
  
  Revision  ChangesPath
  1.77  +10 -7 jakarta-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.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- mod_jk2.c 12 Mar 2004 13:47:20 -  1.76
  +++ mod_jk2.c 13 Mar 2004 08:49:26 -  1.77
  @@ -474,6 +474,8 @@
   
   workerEnv->init(env, workerEnv );
   workerEnv->server_name   = (char *)ap_get_server_version();
  +ap_mpm_query(AP_MPMQ_MAX_DAEMONS, &workerEnv->maxDaemons);
  +
   /* Should be done in post config instead (cf DAV2) */
   /* ap_add_version_component(pconf, JK_EXPOSED_VERSION); */
   apr_pool_cleanup_register(pconf, NULL, jk2_shutdown, apr_pool_cleanup_null);
  @@ -586,11 +588,12 @@
   *  and fix the mpm_winnt reporting 0 daemons.
   */
   if (workerEnv->childId == -1) {
  -int max_daemons_limit;
  -ap_mpm_query(AP_MPMQ_MAX_DAEMONS, &max_daemons_limit);
  -
  -if (max_daemons_limit == 0) {
  -workerEnv->childId = 0;
  +/* If the server max daemons are less then 2
  + * this is the single child mpm.
  + * the WINNT mpm has a bug returning 0 instead 1
  + */
  +if (workerEnv->maxDaemons < 2) {
  +workerEnv->childId = proc.pid;
   env->l->jkLog(env, env->l, JK_LOG_INFO, 
   "jk2_init() Setting scoreboard slot 0 for child %d\n",
   proc.pid);
  @@ -598,7 +601,7 @@
   else {
   env->l->jkLog(env, env->l, JK_LOG_ERROR, 
   "jk2_init() Can't find child %d in none of the %d scoreboard 
slots\n",
  -proc.pid, max_daemons_limit);
  +proc.pid, workerEnv->maxDaemons);
   workerEnv->childId = -2;
   }
   } else {
  
  
  

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

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

2004-03-13 Thread mturk 
mturk   2004/03/13 00:47:31

  Modified:jk/native2/common jk_shm.c
  Log:
  Change the getSlot loop starting from index 0, not 1.
  
  Revision  ChangesPath
  1.42  +1 -1  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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- jk_shm.c  13 Mar 2004 07:32:37 -  1.41
  +++ jk_shm.c  13 Mar 2004 08:47:31 -  1.42
  @@ -233,7 +233,7 @@
   jk_shm_slot_t *slot;
   
   if (shm->head != NULL) { 
  -for (i = 1; i < shm->head->lastSlot; i++) {
  +for (i = 0; i < shm->head->lastSlot; i++) {
   slot = shm->getSlot(env, shm, i);
   if (strncmp(slot->name, name, strlen(name)) == 0) {
   env->l->jkLog(env, env->l, JK_LOG_INFO, 
  
  
  

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

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

2004-03-13 Thread mturk 
mturk   2004/03/13 00:46:26

  Modified:jk/native2/include jk_workerEnv.h
  Log:
  Add the maxDaemons to the workerEnv struct.
  So we can know if we are inside single or muti child server.
  
  Revision  ChangesPath
  1.31  +3 -1  jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h
  
  Index: jk_workerEnv.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- jk_workerEnv.h24 Feb 2004 08:44:39 -  1.30
  +++ jk_workerEnv.h13 Mar 2004 08:46:26 -  1.31
  @@ -123,6 +123,8 @@
   int childId;
   int childProcessId;
   int childGeneration;
  +/* maximum configured number of child processes */
  +int maxDaemons;
   
   struct jk_env *globalEnv;
   
  
  
  

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