Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h
PLEASE STOP SENDING ME YOUR E-MAILS...Satalogue. --- [EMAIL PROTECTED] wrote: mturk 2005/02/15 03:43:15 Modified:jk/native/common jk_global.h Log: The saga continues. Remove CRLFs, again :). Revision ChangesPath 1.43 +28 -28 jakarta-tomcat-connectors/jk/native/common/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- jk_global.h 15 Feb 2005 11:40:00 - 1.42 +++ jk_global.h 15 Feb 2005 11:43:15 - 1.43 @@ -61,33 +61,33 @@ #include sys/stat.h #ifdef WIN32 -#ifndef _WINDOWS_ -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#ifndef _WIN32_WINNT - -/* Restrict the server to a subset of Windows NT 4.0 header files by default - */ -#define _WIN32_WINNT 0x0400 -#endif -#ifndef NOUSER -#define NOUSER -#endif -#ifndef NOMCX -#define NOMCX -#endif -#ifndef NOIME -#define NOIME -#endif -#include windows.h -/* - * Add a _very_few_ declarations missing from the restricted set of headers - * (If this list becomes extensive, re-enable the required headers above!) - * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now - */ -#include winsock2.h -#include mswsock.h +#ifndef _WINDOWS_ +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif +#ifndef _WIN32_WINNT + +/* Restrict the server to a subset of Windows NT 4.0 header files by default + */ +#define _WIN32_WINNT 0x0400 +#endif +#ifndef NOUSER +#define NOUSER +#endif +#ifndef NOMCX +#define NOMCX +#endif +#ifndef NOIME +#define NOIME +#endif +#include windows.h +/* + * Add a _very_few_ declarations missing from the restricted set of headers + * (If this list becomes extensive, re-enable the required headers above!) + * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now + */ +#include winsock2.h +#include mswsock.h #include ws2tcpip.h #endif #include sys/timeb.h - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] = FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL... Please call our Duty Engineer on 01332 811564 - for a proper 'one to one' answer as further information and / or clarification is required from you in order to answer your question properly . He is available from 10am until 5pm Monday to Friday inclusive. TO RETURN TO SATALOGUE WEBSITE: Click on to link below. http://www.satalogue.com/about.htm - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Fwd: Bug and Possible Fix in JK 1.2.8 (I am not sure where/how to post this)
PLEASE STOP SENDING US YOUR E-MAILSSatalogue
--- Pier Fumagalli [EMAIL PROTECTED] wrote:
Begin forwarded message:
From: Ivo Conde [EMAIL PROTECTED]
Date: 15 February 2005 01:43:39 GMT
To: [EMAIL PROTECTED]
Subject: Bug and Possible Fix in JK 1.2.8 (I am not sure where/how to
post this)
Hi,
I have found a bug and possible fix in the latest version (1.2.8) of
the JK Connector for Apache+Tomcat.
The bug:
JK converts user http HEAD requests made to Apache into http GET
calls to Tomcat
The fix:
There seems to be in a error in jk_ajp_common.c , inside the method
static int sc_for_req_method(const char *method, size_t len).
The switch statement is incorrectly returning the GET method for the
HEAD case.
Here is the buggy part of the method:
case 4:
switch (method[0])
{
case 'H':
return (method[1] == 'E'
method[2] == 'A'
method[3] == 'D'
? SC_M_GET : UNKNOWN_METHOD);
The fix:
case 4:
switch (method[0])
{
case 'H':
return (method[1] == 'E'
method[2] == 'A'
method[3] == 'D'
? SC_M_HEAD : UNKNOWN_METHOD); // REPLACE GET BY
HEAD
The fix worked, at least for me.
The bug occurred in a Linux Red Hat Entreprise, Kernel 2.4.21-27.EL ,
EMT64 Processor (x86_64 GNU/Linux)
Can you please forward this email to the right place? Sorry if Im not
following the proper rules to report this, but I dont have much time
to learn about bug/patch submission methods on jakarta. I did search
your bug database but did not find this bug anywhere. I hope this can
be of some help anyway. This is my first contribution to the open
source community since years, and I wouldnt sleep at night if I
missed this opportunity to give something back, after having received
so much from it.
Thanks and best regards,
Ivo
ATTACHMENT part 2 application/pkcs7-signature name=smime.p7s
=
FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL...
Please call our Duty Engineer on 01332 811564 - for a proper 'one to one'
answer as further information and / or clarification is required from you in
order to answer your question properly .
He is available from 10am until 5pm Monday to Friday inclusive.
TO RETURN TO SATALOGUE WEBSITE: Click on to link below.
http://www.satalogue.com/about.htm
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Fwd: Bug and Possible Fix in JK 1.2.8 (I am not sure where/how to post this)
PLEASE STOP SENDINU US YOUR E-MAILS...Satalogue
--- Mladen Turk [EMAIL PROTECTED] wrote:
Pier Fumagalli wrote:
From: Ivo Conde [EMAIL PROTECTED]
Here is the buggy part of the method:
case 4:
switch (method[0])
{
case 'H':
return (method[1] == 'E'
method[2] == 'A'
method[3] == 'D'
? SC_M_GET : UNKNOWN_METHOD);
Standard copy/paste error :).
Commited. Thanks for spotting that.
Regards,
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
=
FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL...
Please call our Duty Engineer on 01332 811564 - for a proper 'one to one'
answer as further information and / or clarification is required from you in
order to answer your question properly .
He is available from 10am until 5pm Monday to Friday inclusive.
TO RETURN TO SATALOGUE WEBSITE: Click on to link below.
http://www.satalogue.com/about.htm
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: First look at new mod_jk status page
PLEASE STOP SENDING US YOUR E-MAILS...Satalogue --- Peter Rossbach [EMAIL PROTECTED] wrote: Hello Mladen, new status page work fine. Really cool ;-) Only the type of a workers was currently not correct displayed. I got unknown as value. opps! Is it planned that we can save the worker configuration as seperate workers.properties? How we can transfer the information to an Tomcat MBeanServer? Can I help to fix the old Java AJP jk2 handler or start with a new implementaion? Can we get the status information as XML document? Not really important but easier to integrate in some monitoring products. What are your next steps? Here my working configuration: workers.properties worker.list=lb,status worker.node1.port=9012 worker.node1.host=localhost worker.node1.type=ajp13 worker.node2.port=9022 worker.node2.host=localhost worker.node2.type=ajp13 worker.node3.port=9032 worker.node3.host=localhost worker.node3.type=ajp13 worker.lb.balanced_workers=node1,node2,node3 worker.lb.type=lb worker.status.type=status And at httpd.conf JkMount /status/* status Many Thanx Peter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] = FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL... Please call our Duty Engineer on 01332 811564 - for a proper 'one to one' answer as further information and / or clarification is required from you in order to answer your question properly . He is available from 10am until 5pm Monday to Friday inclusive. TO RETURN TO SATALOGUE WEBSITE: Click on to link below. http://www.satalogue.com/about.htm - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: JK Removing local_worker and local_worker_only directives
PLEASE STOP SENDING US YOUR E-MAILSSatalogue
--- Henri Gomez [EMAIL PROTECTED] wrote:
+1, I was unconfortable to explain these.
Simpler the better
On Tue, 15 Feb 2005 08:58:11 +0100, Mladen Turk [EMAIL PROTECTED]
wrote:
Hi,
I would like to deprecate the local_worker and local_worker_only
directives.
The reason is that we have now shared memory, and thus more powerful
ways to accomplish it's use.
Now, we two new directives 'redirect' and 'domain' that are more
powerful then exiting ones.
Here is how it works:
1. If there is a session the request is routed to the worker.
2. If there is no session and the worker is disabled, meaning not
accepting new connections then the request is redirected to
the 'redirect' router if present or 'domain' if not.
3. If there is a session and the worker is in error state and
the 'sticky_session_force' is not set then the 'redirect'
and 'domain' are checked.
4. If there is a session and the worker is in error state and
the 'sticky_session_force' is set the 500 is returned.
Here is the simple state table:
('x' means don't care, '-' means not set)
| worker | session | route | domain | force | err | dis | result |
| w1 | w1 | x | x| x | 0 | x | w1 |
| w1 | w1 | x | x| 1 | 1 | x | 500|
| w1 | w1 | w2 | x| 0 | 1 | x | w2 |
| w1 | w1 | - | grp | 0 | 1 | x | grp|
| w1 | - | - | -| x | 0 | 0 | any|
| w1 | - | - | grp | x | 0 | 0 | grp|
| w1 | - | - | -| x | 0 | 1 | !w1|
So, basically the local_worker_only will become
'sticky_session_force',
that is more descriptive meaning of the actual usage.
Regards,
Mladen.
-
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]
=
FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL...
Please call our Duty Engineer on 01332 811564 - for a proper 'one to one'
answer as further information and / or clarification is required from you in
order to answer your question properly .
He is available from 10am until 5pm Monday to Friday inclusive.
TO RETURN TO SATALOGUE WEBSITE: Click on to link below.
http://www.satalogue.com/about.htm
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
PLEASE PLEASE STOP SENDING US YOUR E-MAILS...Satalogue --- [EMAIL PROTECTED] wrote: yoavs 2005/02/15 07:32:32 Modified:.tomcat.nsi webapps/docs changelog.xml Log: Bugzilla 33489. Revision ChangesPath 1.69 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- tomcat.nsi 2 Feb 2005 12:01:43 - 1.68 +++ tomcat.nsi 15 Feb 2005 15:32:32 - 1.69 @@ -631,7 +631,7 @@ ; if $INSTDIR was removed, skip these next ones IfFileExists $INSTDIR 0 Removed MessageBox MB_YESNO|MB_ICONQUESTION \ - Remove all files in your Tomcat 5.5 directory? (If you have anything \ + Remove all files in your Tomcat 5.5 directory? (If you have anything \ you created that you want to keep, click No) IDNO Removed RMDir /r $INSTDIR\webapps\ROOT ; this would be skipped if the user hits no RMDir $INSTDIR\webapps 1.236 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- changelog.xml 15 Feb 2005 09:58:06 - 1.235 +++ changelog.xml 15 Feb 2005 15:32:32 - 1.236 @@ -35,6 +35,9 @@ fix bug33351/bug: Fix silent uninstallation. (remm) /fix + fix +bug33489/bug: Missing space in uninstaller message. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] = FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL... Please call our Duty Engineer on 01332 811564 - for a proper 'one to one' answer as further information and / or clarification is required from you in order to answer your question properly . He is available from 10am until 5pm Monday to Friday inclusive. TO RETURN TO SATALOGUE WEBSITE: Click on to link below. http://www.satalogue.com/about.htm - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/conf context.xml
PLEASE PLEASE STOP SENDING US YOUR E-MAILS...Satalogue
--- [EMAIL PROTECTED] wrote:
remm2005/02/15 07:42:58
Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java LocalStrings.properties
catalina/src/conf context.xml
Log:
- Tentative fix for 33572: context.xml should be a redeploy resource.
This is done by prioritizing the redeploy resources.
- I need to test this better. The basic cases seem to be working
(editing manager.xml, as well as an expanded folder as per the bug
report).
- Remove context.xml from the list of watched resources.
Revision ChangesPath
1.55 +36 -23
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- HostConfig.java 29 Jan 2005 19:45:55 - 1.54
+++ HostConfig.java 15 Feb 2005 15:42:58 - 1.55
@@ -25,6 +25,7 @@
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -572,9 +573,6 @@
}
context.setConfigFile(contextXml.getAbsolutePath());
context.setPath(contextPath);
-// Add the context XML to the list of watched files
-deployedApp.reloadResources.put
-(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
// Add the associated docBase to the redeployed list if
it's a WAR
boolean isWar = false;
if (context.getDocBase() != null) {
@@ -628,7 +626,6 @@
external = true;
deployedApp.redeployResources.put
(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
-
deployedApp.reloadResources.remove(contextXml.getAbsolutePath());
}
} catch (IOException e) {
// Ignore
@@ -645,8 +642,14 @@
addWatchedResources(deployedApp,
expandedDocBase.getAbsolutePath(), context);
}
+// Add the context XML to the list of files
which should trigger a redeployment
+deployedApp.redeployResources.put
+(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
}
} else {
+// Add the context XML to the list of files which
should trigger a redeployment
+deployedApp.redeployResources.put
+(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
addWatchedResources(deployedApp, null, context);
}
}
@@ -904,13 +907,17 @@
}
context.setPath(contextPath);
context.setDocBase(file);
+File configFile = new File(dir,
Constants.ApplicationContextXml);
if (deployXML) {
-context.setConfigFile
-((new File(dir,
Constants.ApplicationContextXml)).getAbsolutePath());
+context.setConfigFile(configFile.getAbsolutePath());
}
host.addChild(context);
deployedApp.redeployResources.put(dir.getAbsolutePath(),
new Long(dir.lastModified()));
+if (deployXML) {
+
deployedApp.redeployResources.put(configFile.getAbsolutePath(),
+new Long(configFile.lastModified()));
+}
addWatchedResources(deployedApp, dir.getAbsolutePath(),
context);
} catch (Throwable t) {
log.error(sm.getString(hostConfig.deployDir.error,
file), t);
@@ -974,7 +981,9 @@
if (resource.exists()) {
long lastModified = ((Long)
app.redeployResources.get(resources[i])).longValue();
if ((!resource.isDirectory())
resource.lastModified() lastModified) {
-// Redeploy application
+// Undeploy application
+if (log.isInfoEnabled())
+log.info(sm.getString(hostConfig.undeploy,
app.name));
ContainerBase context = (ContainerBase)
host.findChild(app.name);
Re: Custom load balancing algorithm and mod_jk???
--- HiWill you PLEASE stop sending us copies of all your e-mails! A. We don't understand them B. You are all restricting our available K C. We don't mind the odd Spam, but 20 per day is a mite OTT Mike Hancox...---...G4MJH...---...Technical Director Satellite Scene Group http://www.satalogue.com Mladen Turk [EMAIL PROTECTED] wrote: [EMAIL PROTECTED] wrote: Hi, We need to use Apache to load balance a set of Tomcat servers. However, we need to use a custom load-balancing algorithm, based on the usage of those servers. Is this possible with mod_jk? Would it be easy to extend it? Any other suggestions? Yes, it's possible, but I doubt it has any practical usage. Since you are using load balancer, then usage is proportional to it's balance factors. If you ment to balance on CPU usage of remote backends, then that'll be hard or even impossible due to AJP13 protocol limitations. That's why we are trying to make a AJP14 protocol. Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] = FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL... Please call our Duty Engineer on 01332 811564 - for a proper 'one to one' answer as further information and / or clarification is required from you in order to answer your question properly . He is available from 10am until 5pm Monday to Friday inclusive. TO RETURN TO SATALOGUE WEBSITE: Click on to link below. http://www.satalogue.com/about.htm - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Fwd: Re: Custom load balancing algorithm and mod_jk???
--- TECHNICAL DIRECTOR [EMAIL PROTECTED] wrote: Date: Wed, 9 Feb 2005 09:30:34 -0800 (PST) From: TECHNICAL DIRECTOR [EMAIL PROTECTED] Subject: Re: Custom load balancing algorithm and mod_jk??? To: Tomcat Developers List tomcat-dev@jakarta.apache.org --- HiWill you PLEASE stop sending us copies of all your e-mails! A. We don't understand them B. You are all restricting our available K C. We don't mind the odd Spam, but 20 per day is a mite OTT Mike Hancox...---...G4MJH...---...Technical Director Satellite Scene Group http://www.satalogue.com Mladen Turk [EMAIL PROTECTED] wrote: [EMAIL PROTECTED] wrote: Hi, We need to use Apache to load balance a set of Tomcat servers. However, we need to use a custom load-balancing algorithm, based on the usage of those servers. Is this possible with mod_jk? Would it be easy to extend it? Any other suggestions? Yes, it's possible, but I doubt it has any practical usage. Since you are using load balancer, then usage is proportional to it's balance factors. If you ment to balance on CPU usage of remote backends, then that'll be hard or even impossible due to AJP13 protocol limitations. That's why we are trying to make a AJP14 protocol. Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] = FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL... Please call our Duty Engineer on 01332 811564 - for a proper 'one to one' answer as further information and / or clarification is required from you in order to answer your question properly . He is available from 10am until 5pm Monday to Friday inclusive. TO RETURN TO SATALOGUE WEBSITE: Click on to link below. http://www.satalogue.com/about.htm - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] = FROM SATALOGUE TECHNICAL DEPARTMENT...WE HAVE READ YOUR E-MAIL... Please call our Duty Engineer on 01332 811564 - for a proper 'one to one' answer as further information and / or clarification is required from you in order to answer your question properly . He is available from 10am until 5pm Monday to Friday inclusive. TO RETURN TO SATALOGUE WEBSITE: Click on to link below. http://www.satalogue.com/about.htm - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
