cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.in
jfclere 2004/03/12 00:23:46
Modified:jk/native2/server/apache2 Makefile.in
Log:
PR 27006.
Revision ChangesPath
1.23 +11 -4 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.in 10 Mar 2004 23:52:34 - 1.22
+++ Makefile.in 12 Mar 2004 08:23:46 - 1.23
@@ -103,10 +103,17 @@
jni-build: ${BUILD_DIR}/libjkjni.so
-${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
- $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
-${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
- $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
+${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/${APACHE2_LIBEXEC}/mod_jk2.so
+ $(CP) $^ $@
+${BUILD_DIR}/${APACHE2_LIBEXEC}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
+ mkdir -p ${BUILD_DIR}/${APACHE2_LIBEXEC}
+ $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/${APACHE2_LIBEXEC}
+
+${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/${APACHE2_LIBEXEC}/libjkjni.so
+ $(CP) $^ $@
+${BUILD_DIR}/${APACHE2_LIBEXEC}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
+ mkdir -p ${BUILD_DIR}/${APACHE2_LIBEXEC}
+ $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/${APACHE2_LIBEXEC}
${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES}
$(MOD_LINK) -o $@ $(JK_LDFLAGS) $^
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27006] - libtool: install: error: cannot install `../../../build/jk2/apache2/jkjni.la' to a directory not ending in /usr/lib/apache2
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=27006. 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=27006 libtool: install: error: cannot install `../../../build/jk2/apache2/jkjni.la' to a directory not ending in /usr/lib/apache2 [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 08:27 --- It is now fixed. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Amy Paige-Hoien is out of the office.
I will be out of the office starting 03/12/2004 and will not return until 03/14/2004. I will respond to your message on March 15th when I return. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15278] - [PATCH] mod_jk2 for IIS, Bugfix corrupted data ]
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=15278. 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=15278 [PATCH] mod_jk2 for IIS, Bugfix corrupted data ] [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 09:08 --- Testest on 5.0.19/WIN XP Pro: Deploy - Select WAR file to upload: Browse - selected struct-documentation.war (4094103 bytes) Couple of seconds, and it passes smoothly. The war is uploaded and deployed. And it works all the time, for any file sizes from 4k to mutimegabyte ones. So can you check that with TC5? Also can you give some detailed jk2.log, Setting Alternate file logger and level to debug for workerEnv and channel.socket. Also you might consider attaching your isapi_redirector2.dll that you've built. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.0] Problems with the next release
Remy Maucherat wrote: Bill Barker wrote: I agree with Yoav that we can afford to wait a few days (if only so I don't have to take down the 3.3.2 binary distro :). However, I don't think that, without the ASF changing it's position, we can simply add some lines to the LICENSE file. That may work in C land, but in Java land it's the LGPL argument all over again. I agree we can wait a few days until we reach a consensus. IMHO, since we'd have to drop JMX and the Windows installer to ship from ASF, B) is the only reasonable choice. We would have to drop the Windows installer as well :( Here is a reply I got from the community list : Quoting Henri Gomez [EMAIL PROTECTED]: Should I understand that we could no more include third-party jars in ASF products, for example mx4j jars in Tomcat ? This is not a complete prohibition on all third-party jars or libraries, but only on those third-party libraries which are licensed under terms more restrictive than the ASL. In the case of mx4j, the code is licenced under the mx4j 1.0 License [1], which is a derivative of the ASL 1.1 license and therefore may potentially be included in ASF works. However, mx4j is a good example because apparently it includes code licensed under the Jetty and Jython licenses [2]. While I am not intimately familiar with mx4j, this may mean that the total legal effect of using mx4j is not contained within the mx4j license alone, but is in fact a combination of the terms of the three licenses. Since this combination may in fact be more restrictive than the terms in the mx4j license alone, the library may not be in the clear to be used by ASF projects. To confirm this, one would need to investigate all three licenses, understand which parts of mx4j fall outside of its own license, and then come to a decision on how the library can be used in the ASF. It is exactly this sort of confusion the ASF would like to avoid. While the mx4j developers may in fact be perfectly in compliance with using the Jetty and Jython licenses, users of mx4j will have to take into consideration not one, but _three_ licenses in order to determine how to legally use the library. Therefore, for the sake of our users it is best if an ASF product as a whole is licensed under terms no more restrictive than those set out in the ASL 2.0. For further inquries (including a specific resolution to the mx4j issue), I would suggest subscribing to the [EMAIL PROTECTED] list. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27623] New: - jsp:include / in XML view page product too many XML Decl
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=27623. 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=27623 jsp:include / in XML view page product too many XML Decl Summary: jsp:include / in XML view page product too many XML Decl Product: Tomcat 5 Version: 5.0.19 Platform: PC OS/Version: Windows XP Status: NEW Severity: Normal Priority: Other Component: Jasper AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I have two file hello.jspx world.jspx like: hello.jspx: | ?xml version=1.0? | fo:root xmlns:fo=http://www.w3.org/1999/XSL/Format; | xmlns:jsp=http://java.sun.com/JSP/Page; | jsp:include page=world.jspx/ | /fo:root world.jspx: | fo:block xmlns:fo=http://www.w3.org/1999/XSL/Format; | Hello World | /fo:block and the result is: | ?xml version=1.0 encoding=UTF-8? | fo:root xmlns:fo=http://www.w3.org/1999/XSL/Format; | ?xml version=1.0 encoding=UTF-8? | ~~ | fo:block xmlns:fo=http://www.w3.org/1999/XSL/Format; | Hello World/fo:block/fo:root and tomcat product too much XML decl. My env: Windows XP, jdk1.4.2_04, tomcat 5.0.19 Regards - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [5.0] Problems with the next release
-Original Message- From: Henri Gomez Here is a reply I got from the community list : This is not a complete prohibition on all third-party jars or libraries, but only on those third-party libraries which are licensed under terms more restrictive than the ASL. Ask them is there any list of accepted licenses and libraries. What about linking to static microsoft libraries? What can assure them that contributed binaries (and the code itself) are build with legally obtained software? Do we need to sign that or ASF will perhaps provide us with the development tools needed? Perhaps they should think in that direction. However, mx4j is a good example because apparently it includes code licensed under the Jetty and Jython licenses Reading this seems that they've already made a decision, without the will to help us. What are we suppose to do? Hire a lawyer to clear every library that has a feature to link with the property software or they will? I mean, exactly the same situation as with the tomcat-connectors. Seem that we cannot provide the binaries for that too, cause IIS apparently doesn't falls nearly to the ASF license. Are we linking to the any of the prohibited libraries (like api32, kernel32, ws2_32)? I'm not sure. Too many questions, and such a small head ;-). MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.0] Problems with the next release
Henri Gomez wrote: This is not a complete prohibition on all third-party jars or libraries, but only on those third-party libraries which are licensed under terms more restrictive than the ASL. In the case of mx4j, the code is licenced under the mx4j 1.0 License [1], which is a derivative of the ASL 1.1 license and therefore may potentially be included in ASF works. However, mx4j is a good example because apparently it includes code licensed under the Jetty and Jython licenses [2]. While I am not intimately familiar with mx4j, this may mean that the total legal effect of using mx4j is not contained within the mx4j license alone, but is in fact a combination of the terms of the three licenses. Since this combination may in fact be more restrictive than the terms in the mx4j license alone, the library may not be in the clear to be used by ASF projects. To confirm this, one would need to investigate all three licenses, understand which parts of mx4j fall outside of its own license, and then come to a decision on how the library can be used in the ASF. It is exactly this sort of confusion the ASF would like to avoid. While the mx4j developers may in fact be perfectly in compliance with using the Jetty and Jython licenses, users of mx4j will have to take into consideration not one, but _three_ licenses in order to determine how to legally use the library. Therefore, for the sake of our users it is best if an ASF product as a whole is licensed under terms no more restrictive than those set out in the ASL 2.0. For further inquries (including a specific resolution to the mx4j issue), I would suggest subscribing to the [EMAIL PROTECTED] list. This makes zero sense. None of the more restrictive licenses pose any problem for binary redistribution. Anyway, I won't include mx4j, as I'm not a lawyer, and I have a skewed opinion on licenses anyway. The biggest question is: what's next ? (it seems painfully obvious: zero non ASL 2.0 imports) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.0] Problems with the next release
Mladen Turk wrote: -Original Message- From: Henri Gomez Here is a reply I got from the community list : This is not a complete prohibition on all third-party jars or libraries, but only on those third-party libraries which are licensed under terms more restrictive than the ASL. Ask them is there any list of accepted licenses and libraries. What about linking to static microsoft libraries? That is probably not OK. What can assure them that contributed binaries (and the code itself) are build with legally obtained software? legally obtained software if someone is using those he kills its own business! Do we need to sign that or ASF will perhaps provide us with the development tools needed? Use Open Source tools and/or help to improve existing ones. Perhaps they should think in that direction. However, mx4j is a good example because apparently it includes code licensed under the Jetty and Jython licenses Reading this seems that they've already made a decision, without the will to help us. What are we suppose to do? Hire a lawyer to clear every library that has a feature to link with the property software or they will? I mean, exactly the same situation as with the tomcat-connectors. Seem that we cannot provide the binaries for that too, cause IIS apparently doesn't falls nearly to the ASF license. Are we linking to the any of the prohibited libraries (like api32, kernel32, ws2_32)? I'm not sure. You have to use dynamic linking... Cygwin brings the same API but the license is not ASF like and the API is not 100% compatible. Too many questions, and such a small head ;-). MT. - 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]
cvs commit: jakarta-tomcat-catalina/catalina/src/conf web.xml
remm2004/03/12 02:54:20 Modified:catalina/src/conf web.xml Log: - Add two MIME types, submitted by Scott Pontillo. Revision ChangesPath 1.37 +8 -0 jakarta-tomcat-catalina/catalina/src/conf/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- web.xml 19 Feb 2004 21:37:27 - 1.36 +++ web.xml 12 Mar 2004 10:54:20 - 1.37 @@ -705,6 +705,10 @@ mime-typeimage/x-portable-pixmap/mime-type /mime-mapping mime-mapping +extensionppt/extension +mime-typeapplication/powerpoint/mime-type +/mime-mapping +mime-mapping extensionps/extension mime-typeapplication/postscript/mime-type /mime-mapping @@ -867,6 +871,10 @@ mime-mapping extensionsvgz/extension mime-typeimage/svg+xml/mime-type +/mime-mapping +mime-mapping +extensionvsd/extension +mime-typeapplication/x-visio/mime-type /mime-mapping mime-mapping !-- Wireless Bitmap -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/conf web.xml
This account does not exist - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27617] - ppt and vsd MIME types should be included in web.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=27617. 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=27617 ppt and vsd MIME types should be included in web.xml [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 10:55 --- Fixed. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27627] New: - Buffer overflow in jk2 connector while parsing Host header
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=27627. 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=27627 Buffer overflow in jk2 connector while parsing Host header Summary: Buffer overflow in jk2 connector while parsing Host header Product: Tomcat 4 Version: 4.1.30 Platform: All OS/Version: All Status: NEW Severity: Critical Priority: Other Component: Connector:Coyote JK 2 AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] There is a buffer overflow bug in the following code in jk2 connector (jk/native2/common/jk_uriMap.c, jk2_uriMap_getHostCache function): char key[1024]; if (!vhost !port) return uriMap-vhosts-get(env, uriMap-vhosts, *); if (!vhost) vhost = *; sprintf(key, %s:%d, vhost, port); The value of the 'vhost' variable comes from the Host header and the maximum length of this variable depends on the web server (for Apache2 it is more than 1024). Client that connects to the web server and enters Host header longer than 1024 characters will cause web server crash (and this may even enable clients to execute arbitrary code on the server!). The simlar bug is in the jk2_uriMap_hostMap function. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27627] - Buffer overflow in jk2 connector while parsing Host header
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=27627. 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=27627 Buffer overflow in jk2 connector while parsing Host header --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 11:02 --- Created an attachment (id=10763) I attach patch that fixes the problem - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: jk2 new shmem using APR
1000448/8192?
The size you use should be a multiple of the pagesize
according to man mmap().
The pagesize could be checked by the following:
+++
#include stdlib.h
#include unistd.h
main()
{
printf(%d\n,(int)sysconf(_SC_PAGE_SIZE));
}
+++
# grep size workers2.properties
size=1015808
1015808/8192 = 124
Still fails in the same way, _test being the 2.0.4-dev, the plain 2.0.3.
-rwxr-xr-x 1 root other16777216 Mar 11 13:15
cr.sandwich.pfizer.com_81.shm
-rw-r--r-- 1 root other 0 Mar 12 10:59
cr.sandwich.pfizer.com_81_test.shm
Have not tried the below yet.
Greg
I saw these problems with another 3rd party module too
(mod_watch), and I looked for a solution, I've looked at this:
/**
* Set a file to be inherited by child processes.
*
*/
APR_DECLARE_INHERIT_SET(file);
which might probably solve it, but not tested yet with
mod_jk2; with the other module it didnt work, and I asked at
the httpd-dev list and was told that I should look at mod_ssl
which does some tricks to make sure that files created
by init are later accessable
from this point of view APR is probably not broken, and we
need to do some more than only open the scoreboard file to
make sure it is later accessable.
Guenter.
-
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]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: jk2 new shmem using APR
[EMAIL PROTECTED] wrote:
1000448/8192?
The size you use should be a multiple of the pagesize
according to man mmap().
The pagesize could be checked by the following:
+++
#include stdlib.h
#include unistd.h
main()
{
printf(%d\n,(int)sysconf(_SC_PAGE_SIZE));
}
+++
# grep size workers2.properties
size=1015808
1015808/8192 = 124
Still fails in the same way, _test being the 2.0.4-dev, the plain 2.0.3.
-rwxr-xr-x 1 root other16777216 Mar 11 13:15
cr.sandwich.pfizer.com_81.shm
-rw-r--r-- 1 root other 0 Mar 12 10:59
cr.sandwich.pfizer.com_81_test.shm
Have not tried the below yet.
Could you try to put cr.sandwich.pfizer.com_81_test.shm in another file system
(/tmp is a special one)?
Greg
I saw these problems with another 3rd party module too
(mod_watch), and I looked for a solution, I've looked at this:
/**
* Set a file to be inherited by child processes.
*
*/
APR_DECLARE_INHERIT_SET(file);
which might probably solve it, but not tested yet with
mod_jk2; with the other module it didnt work, and I asked at
the httpd-dev list and was told that I should look at mod_ssl
which does some tricks to make sure that files created
by init are later accessable
from this point of view APR is probably not broken, and we
need to do some more than only open the scoreboard file to
make sure it is later accessable.
Guenter.
-
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]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
signature.asc
Description: OpenPGP digital signature
RE: [5.0] Problems with the next release
-Original Message- From: jean-frederic clere Mladen Turk wrote: What about linking to static microsoft libraries? That is probably not OK. I know that, but I know too that the law doesn't have a term _probably_ in it's dictionary. Do we need to sign that or ASF will perhaps provide us with the development tools needed? Use Open Source tools and/or help to improve existing ones. Again, Is it required to use open source tools or not? Is it up to me and my moral or is there some ASF board decision on that? I had to sign for my current company that will take care that there are no illegal software on my boxes (as probably everyone else did). Take a look at http(apr, apr-util, etc...). The win32 port has vstudio build files (like our connectors). My question is, where those tools comes from? ASF or developers that have couple of 1000$ to spend? Also I heard that the ASF has an agreement with InstallShield. I would love to receive a license for some of those tools if possible :-). Since all of the board members are from httpd project, seems to me that all the decisions have been made through this point of view. It's not hard to implement this decisions for that particular project. They done this so far, although for different reasons (no ssl enabled dist, etc...). Henri, Remy and Costin proposed to move the binaries to sourceforge, until the things clears up. I'm in favor of that, and will support such a decision if voted. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: jk2 2.0.4 release
-Original Message- From: Henri Gomez Subject: jk2 2.0.4 release Hi, We see many bug fixes in the last 2 weeks in jk2, and I wonder if some of you still have some corrections to commit. I'm working on a new shm implementation (as said couple of times during last week). Will be finished during weekend. Perhaps to postpone that? But again we'll stil get those 'create slot epStat.0 failed' messages. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27629] New: - Memory problem with GZIPOutputFilter
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=27629.
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=27629
Memory problem with GZIPOutputFilter
Summary: Memory problem with GZIPOutputFilter
Product: Tomcat 5
Version: 5.0.19
Platform: All
OS/Version: Windows NT/2K
Status: NEW
Severity: Normal
Priority: Other
Component: Connector:Coyote
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
Hi,
the Deflater object, that is used inside the GZIPStream uses native memory.
This memory will only be free, when the Deflater's finializer runs. See also
Sun's Bugparades. If the memory is not free, an OutOfMemoryError is created
sooner or later.
In an enviroment with a lot of memory the java GC might be invoked too late. I
was able to crash tomcat with a lot of memory and some test load in a few
seconds.
The solution is to explizitly close the Deflater Objekt to free the native
memory. This can be done by closing the GZIP stream.
My propose solution to fix the problem in GZIPOutputFilter is included below.
After that change, I was not able to reproduce the crash.
Please verify my solution.
Regards,
Christian
public long end()
throws IOException {
if (compressionStream == null) {
compressionStream = new GZIPOutputStream(fakeOutputStream);
}
compressionStream.finish();
long result = ((OutputFilter) buffer).end();
compressionStream.close(); // frees the deflater memory!
return result;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriMap.c
hgomez 2004/03/12 03:59:32
Modified:jk/native2/common jk_uriMap.c
Log:
Avoid overflow bug when virtual host is more than 1024 chars.
Provided by Rafal Maczewski
Revision ChangesPath
1.69 +28 -8 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- jk_uriMap.c 27 Feb 2004 19:10:07 - 1.68
+++ jk_uriMap.c 12 Mar 2004 11:59:32 - 1.69
@@ -241,29 +241,41 @@
return NULL;
}
+#define MAX_HOST_LENGTH 1024
+
/* Find the vhost */
static jk_uriEnv_t *jk2_uriMap_hostMap(jk_env_t *env, jk_uriMap_t *uriMap,
const char *vhost, int port)
{
int i, j, n;
char *name;
-char hostname[1024] = {0};
+char hostname[MAX_HOST_LENGTH] = {0};
+char portSuffix[32];
+int vhostLen;
if (port) {
if (vhost) {
-if (strchr(vhost, ':'))
-strcpy(hostname, vhost);
-else
- sprintf(hostname, %s:%d, vhost, port);
+vhostLen = strlen(vhost);
+if (strchr(vhost, ':')) {
+ strncpy(hostname, vhost, MAX_HOST_LENGTH);
+} else {
+ strncpy(hostname, vhost, MAX_HOST_LENGTH);
+ if (strlen(vhost) MAX_HOST_LENGTH - 1) {
+ sprintf(portSuffix,:%d, port);
+ strncat(hostname+vhostLen, portSuffix, MAX_HOST_LENGTH-vhostLen);
+ }
+}
}
else
sprintf(hostname, *:%d, port);
}
else if (vhost)
-strcpy(hostname, vhost);
+strncpy(hostname, vhost, MAX_HOST_LENGTH);
else /* Return default host if vhost and port wasn't suplied */
return uriMap-vhosts-get(env, uriMap-vhosts, *);
+hostname[MAX_HOST_LENGTH - 1] = 0;
+
n = uriMap-vhosts-size(env, uriMap-vhosts);
/* Check the exact hostname:port first */
for (i = 0 ; i n ; i++) {
@@ -837,13 +849,21 @@
static jk_uriEnv_t *jk2_uriMap_getHostCache(jk_env_t *env, jk_uriMap_t *uriMap,
const char *vhost, int port)
{
-char key[1024];
+char key[MAX_HOST_LENGTH];
+char portSuffix[32];
+int vhostLen;
if (!vhost !port)
return uriMap-vhosts-get(env, uriMap-vhosts, *);
if (!vhost)
vhost = *;
-sprintf(key, %s:%d, vhost, port);
+vhostLen = strlen(vhost);
+strncpy(key, vhost, MAX_HOST_LENGTH);
+if (vhostLen MAX_HOST_LENGTH - 1) {
+ sprintf(portSuffix,:%d, port);
+ strncat(key+vhostLen, portSuffix, MAX_HOST_LENGTH);
+}
+key[MAX_HOST_LENGTH - 1] = 0;
return uriMap-vhcache-get(env, uriMap-vhcache, key);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.0] Problems with the next release
Mladen Turk wrote: -Original Message- From: jean-frederic clere Mladen Turk wrote: What about linking to static microsoft libraries? That is probably not OK. I know that, but I know too that the law doesn't have a term _probably_ in it's dictionary. Do we need to sign that or ASF will perhaps provide us with the development tools needed? Use Open Source tools and/or help to improve existing ones. Again, Is it required to use open source tools or not? No, it is required to avoid non ASF licensed elements in the binaries that are delivered by the ASF. We should ask about contributed builds (like the ones in apache/dist/httpd/binaries/) Is it up to me and my moral or is there some ASF board decision on that? I had to sign for my current company that will take care that there are no illegal software on my boxes (as probably everyone else did). Take a look at http(apr, apr-util, etc...). The win32 port has vstudio build files (like our connectors). My question is, where those tools comes from? ASF or developers that have couple of 1000$ to spend? I don't know I am (nearly) not using win32. Also I heard that the ASF has an agreement with InstallShield. I would love to receive a license for some of those tools if possible :-). Since all of the board members are from httpd project, seems to me that all the decisions have been made through this point of view. It's not hard to implement this decisions for that particular project. They done this so far, although for different reasons (no ssl enabled dist, etc...). Every one has an history. (ssl contains crypto some countries have restriction on such things). Henri, Remy and Costin proposed to move the binaries to sourceforge, until the things clears up. I'm in favor of that, and will support such a decision if voted. I am not. Temporary solutions may last long time. Blocking situations normaly evolve faster. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27629] - Memory problem with GZIPOutputFilter
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=27629.
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=27629
Memory problem with GZIPOutputFilter
--- Additional Comments From [EMAIL PROTECTED] 2004-03-12 12:16 ---
And this wouldn't work ?
public long end()
throws IOException {
if (compressionStream == null) {
compressionStream = new GZIPOutputStream(fakeOutputStream);
}
compressionStream.finish();
compressionStream.close(); // frees the deflater memory!
return ((OutputFilter) buffer).end();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27629] - Memory problem with GZIPOutputFilter
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=27629. 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=27629 Memory problem with GZIPOutputFilter --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 12:25 --- Hi, I assume, that this would also work. I am not very familiar with the architecture of the filtering, so I wanted to place the close() call as conservative as possible (after the buffer.end() call). It was just to be on the save side. Regards, Christian - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters GzipOutputFilter.java
remm2004/03/12 04:28:53 Modified:http11/src/java/org/apache/coyote/http11/filters GzipOutputFilter.java Log: - Call close to release native memory. - Bug 27629, submitted by Christian Nester. Revision ChangesPath 1.4 +1 -0 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/GzipOutputFilter.java Index: GzipOutputFilter.java === RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/GzipOutputFilter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- GzipOutputFilter.java 24 Feb 2004 08:50:55 - 1.3 +++ GzipOutputFilter.java 12 Mar 2004 12:28:53 - 1.4 @@ -119,6 +119,7 @@ compressionStream = new GZIPOutputStream(fakeOutputStream); } compressionStream.finish(); +compressionStream.close(); return ((OutputFilter) buffer).end(); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27629] - Memory problem with GZIPOutputFilter
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=27629. 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=27629 Memory problem with GZIPOutputFilter [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 12:29 --- As I understand it, only finish will output data. close is supposed to release memory, so there shouldn't be any problem. We really need to use a byte array based Java implementation for compression. All the native code and fake streams make the code really bad. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.0] Problems with the next release
jean-frederic clere wrote: Mladen Turk wrote: -Original Message- From: jean-frederic clere Mladen Turk wrote: What about linking to static microsoft libraries? That is probably not OK. I know that, but I know too that the law doesn't have a term _probably_ in it's dictionary. Do we need to sign that or ASF will perhaps provide us with the development tools needed? Use Open Source tools and/or help to improve existing ones. Again, Is it required to use open source tools or not? No, it is required to avoid non ASF licensed elements in the binaries that are delivered by the ASF. We should ask about contributed builds (like the ones in apache/dist/httpd/binaries/) Is it up to me and my moral or is there some ASF board decision on that? I had to sign for my current company that will take care that there are no illegal software on my boxes (as probably everyone else did). Take a look at http(apr, apr-util, etc...). The win32 port has vstudio build files (like our connectors). My question is, where those tools comes from? ASF or developers that have couple of 1000$ to spend? I don't know I am (nearly) not using win32. Also I heard that the ASF has an agreement with InstallShield. I would love to receive a license for some of those tools if possible :-). Since all of the board members are from httpd project, seems to me that all the decisions have been made through this point of view. It's not hard to implement this decisions for that particular project. They done this so far, although for different reasons (no ssl enabled dist, etc...). Every one has an history. (ssl contains crypto some countries have restriction on such things). Henri, Remy and Costin proposed to move the binaries to sourceforge, until the things clears up. I'm in favor of that, and will support such a decision if voted. Well I didn't agreed on moving TC binaries to sf or others. I mentioned that being also involved in projet like Jpackage, I know that's producing ready to use packages is not so easy, expecially when you have to explain to users that they have to get MANY external jars from outside sites. As Mladen say, the board came mainly from httpd team and in the NATIVE world there is allready distributions which provide the missing/required parts, like openssl, glibc But in Java land, there is no REAL distributions (only jpackage for RPM users), and there is a HUGE difference. I am not. Temporary solutions may last long time. Blocking situations normaly evolve faster. Yes, what will happen with board if WE decide to stop make Tomcat release until the problem get fixed ? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: jk2 new shmem using APR
Could you try to put cr.sandwich.pfizer.com_81_test.shm in another file system (/tmp is a special one)? Still does not work in /var/tmp ... [Fri Mar 12 13:01:41 2004] (error ) [jk_shm.c (158)] shm.create(): error creating /var/tmp/cr.sandwich.pfizer.com_81.shm 2117992 22 0x1f5020 Invalid argument [Fri Mar 12 13:01:41 2004] (error ) [jk_shm.c (233)] shm.create(): error mmapping /var/tmp/cr.sandwich.pfizer.com_81.shm I might get some time next week to look at this Greg - 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
jfclere 2004/03/12 05:47:20
Modified:jk/native2/server/apache13 mod_jk2.c
jk/native2/server/apache2 mod_jk2.c
Log:
Fix PR 27627: It was possible to core the httpd process.
Note only Apache has been fixed but jk_dsapi_plugin.c and jk_isapi_plugin.c
probably have the same problem.
Revision ChangesPath
1.32 +11 -2 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_jk2.c 24 Feb 2004 08:44:42 - 1.31
+++ mod_jk2.c 12 Mar 2004 13:47:20 - 1.32
@@ -573,6 +573,8 @@
jk_uriMap_t *uriMap;
char *name=NULL;
int n;
+const char *ptr;
+
if(r-proxyreq) {
return DECLINED;
}
@@ -597,8 +599,15 @@
/* get_env() */
env = workerEnv-globalEnv-getEnv( workerEnv-globalEnv );
+ptr = ap_get_server_name(r);
+if ( strlen(ptr) 1024 - 12 ) {
+/* That is probably an invalid request, DECLINED could display jsp source
code. */
+env-l-jkLog(env, env-l, JK_LOG_DEBUG,
+ jk2_map_to_storage Host too big %s\n, ptr);
+return HTTP_BAD_REQUEST;
+}
uriEnv = workerEnv-uriMap-mapUri(env, workerEnv-uriMap,
- ap_get_server_name(r),
+ ptr,
ap_get_server_port(r),
r-uri);
1.76 +10 -2 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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- mod_jk2.c 10 Mar 2004 09:39:30 - 1.75
+++ mod_jk2.c 12 Mar 2004 13:47:20 - 1.76
@@ -810,6 +810,7 @@
{
jk_uriEnv_t *uriEnv;
jk_env_t *env;
+const char *ptr;
if (r-proxyreq || workerEnv==NULL) {
return DECLINED;
@@ -822,8 +823,15 @@
/* From something like [uri:/examples/STAR] in workers2.properties */
env = workerEnv-globalEnv-getEnv( workerEnv-globalEnv );
+ptr = ap_get_server_name(r);
+if ( strlen(ptr) 1024 - 12 ) {
+/* That is probably an invalid request, DECLINED could display jsp source
code. */
+env-l-jkLog(env, env-l, JK_LOG_DEBUG,
+ jk2_map_to_storage Host too big %s\n, ptr);
+return HTTP_BAD_REQUEST;
+}
uriEnv=workerEnv-uriMap-mapUri(env, workerEnv-uriMap,
-ap_get_server_name(r),
+ptr,
ap_get_server_port(r),
r-uri);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.0] Problems with the next release
Henri Gomez wrote: Well I didn't agreed on moving TC binaries to sf or others. I mentioned that being also involved in projet like Jpackage, I know that's producing ready to use packages is not so easy, expecially when you have to explain to users that they have to get MANY external jars from outside sites. As Mladen say, the board came mainly from httpd team and in the NATIVE world there is allready distributions which provide the missing/required parts, like openssl, glibc But in Java land, there is no REAL distributions (only jpackage for RPM users), and there is a HUGE difference. Indeed. This move is only thought out in respect to httpd and the related native projects. I am not. Temporary solutions may last long time. Blocking situations normaly evolve faster. Yes, what will happen with board if WE decide to stop make Tomcat release until the problem get fixed ? Bad idea: I think they don't care ;) Right now, I'm in favor of doing solution A, and removing some of the distributions (the .exe and the embedded dist). It doesn't prevent doing B as well. I think we should post a statement on the Tomcat website explaning the reasons for the disappearance of the distributions, as well as voicing our opposition (if we indeed all agree we are opposed to this) to the latest board decision. Remy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [5.0] Problems with the next release
-Original Message- From: Henri Gomez Henri, Remy and Costin proposed to move the binaries to sourceforge, until the things clears up. I'm in favor of that, and will support such a decision if voted. Well I didn't agreed on moving TC binaries to sf or others. Sorry, It's been a lots of mails :-). I am not. Temporary solutions may last long time. Blocking situations normaly evolve faster. Yes, what will happen with board if WE decide to stop make Tomcat release until the problem get fixed ? I've got a feeling like somebody pulled the plug. They've made a declaration vithout a solution how to fix that (well, except mentioning ibiblio and sf). Further more that mail from board looked like: 'I don't give a shit about you'. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
[EMAIL PROTECTED] wrote:
jfclere 2004/03/12 05:47:20
Modified:jk/native2/server/apache13 mod_jk2.c
jk/native2/server/apache2 mod_jk2.c
Log:
Fix PR 27627: It was possible to core the httpd process.
Henri fixes the core... But I think we should return 400 otherwise jsp code
could be displayed as text.
Someone should take care of jk_dsapi_plugin.c and jk_isapi_plugin.c and do the same.
Note only Apache has been fixed but jk_dsapi_plugin.c and jk_isapi_plugin.c
probably have the same problem.
Revision ChangesPath
1.32 +11 -2 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_jk2.c 24 Feb 2004 08:44:42 - 1.31
+++ mod_jk2.c 12 Mar 2004 13:47:20 - 1.32
@@ -573,6 +573,8 @@
jk_uriMap_t *uriMap;
char *name=NULL;
int n;
+const char *ptr;
+
if(r-proxyreq) {
return DECLINED;
}
@@ -597,8 +599,15 @@
/* get_env() */
env = workerEnv-globalEnv-getEnv( workerEnv-globalEnv );
+ptr = ap_get_server_name(r);
+if ( strlen(ptr) 1024 - 12 ) {
+/* That is probably an invalid request, DECLINED could display jsp source code. */
+env-l-jkLog(env, env-l, JK_LOG_DEBUG,
+ jk2_map_to_storage Host too big %s\n, ptr);
+return HTTP_BAD_REQUEST;
+}
uriEnv = workerEnv-uriMap-mapUri(env, workerEnv-uriMap,
- ap_get_server_name(r),
+ ptr,
ap_get_server_port(r),
r-uri);
1.76 +10 -2 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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- mod_jk2.c 10 Mar 2004 09:39:30 - 1.75
+++ mod_jk2.c 12 Mar 2004 13:47:20 - 1.76
@@ -810,6 +810,7 @@
{
jk_uriEnv_t *uriEnv;
jk_env_t *env;
+const char *ptr;
if (r-proxyreq || workerEnv==NULL) {
return DECLINED;
@@ -822,8 +823,15 @@
/* From something like [uri:/examples/STAR] in workers2.properties */
env = workerEnv-globalEnv-getEnv( workerEnv-globalEnv );
+ptr = ap_get_server_name(r);
+if ( strlen(ptr) 1024 - 12 ) {
+/* That is probably an invalid request, DECLINED could display jsp source code. */
+env-l-jkLog(env, env-l, JK_LOG_DEBUG,
+ jk2_map_to_storage Host too big %s\n, ptr);
+return HTTP_BAD_REQUEST;
+}
uriEnv=workerEnv-uriMap-mapUri(env, workerEnv-uriMap,
-ap_get_server_name(r),
+ptr,
ap_get_server_port(r),
r-uri);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
signature.asc
Description: OpenPGP digital signature
RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
-Original Message- From: jean-frederic clere Henri fixes the core... But I think we should return 400 otherwise jsp code could be displayed as text. Someone should take care of jk_dsapi_plugin.c and jk_isapi_plugin.c and do the same. jk_isapi_plugin uses INTERNET_MAX_URL_LENGTH which is 32 + 4 + 2048 bytes long. Do we need to limit that to 1012 bytes? Is there any RFC saying what is the longest SERVER_NAME? MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 11364] - jk2 appears to forward all virtual host requests to Tomcat
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=11364. 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=11364 jk2 appears to forward all virtual host requests to Tomcat [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 14:29 --- It is working now - See example below - With the following in httpd.conf: +++ VirtualHost 172.25.182.35:80 ErrorLog logs/vtxpc1.log /VirtualHost VirtualHost 172.25.182.35:80 ErrorLog logs/vtxclere.log /VirtualHost +++ And in workers2.properties. +++ [uri:172.25.182.38:80/examples/*] worker=ajp13:pgtr0327:8009 +++ 172.25.182.38/examples goes to Tomcat and 172.25.182.35/examples tells not found. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/03/12 06:31:24
Modified:.build.xml
Log:
- Don't copy jmx.jar to dist.
Revision ChangesPath
1.179 +3 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- build.xml 2 Mar 2004 12:33:00 - 1.178
+++ build.xml 12 Mar 2004 14:31:24 - 1.179
@@ -1136,7 +1136,9 @@
!-- Copy the contents of each build directory --
copy todir=${tomcat.dist}/bin
- fileset dir=${tomcat.build}/bin /
+ fileset dir=${tomcat.build}/bin
+exclude name=jmx.jar /
+ /fileset
/copy
copy todir=${tomcat.dist}/common/classes
fileset dir=${tomcat.build}/common/classes /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
remm2004/03/12 06:32:47
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
- Add error message about the absence of JMX when running standalone.
- This is not i18nized because it will most likely go to the console, and few classes
are available at the start of bootstrap.
Revision ChangesPath
1.18 +24 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Bootstrap.java2 Mar 2004 12:32:08 - 1.17
+++ Bootstrap.java12 Mar 2004 14:32:47 - 1.18
@@ -59,6 +59,16 @@
// --- Static Variables
+private static final String JMX_ERROR_MESSAGE =
+Due to new licensing guidelines mandated by the Apache Software\n
++ Foundation Board of Directors, a JMX implementation can no longer\n
++ be distributed with the Apache Tomcat binaries. As a result, you \n
++ must download a JMX 1.2 implementation (such as the Sun Reference\n
++ Implementation) and copy the JAR containing the API and \n
++ implementation of the JMX specification to: \n
++ ${catalina.home}/bin/jmx.jar;
+
+
/**
* Daemon object used by main.
*/
@@ -369,6 +379,19 @@
* @param args Command line arguments to be processed
*/
public static void main(String args[]) {
+
+try {
+// Attempt to load JMX class
+new ObjectName(test:foo=bar);
+} catch (Throwable t) {
+System.out.println(JMX_ERROR_MESSAGE);
+try {
+// Give users some time to read the message before exiting
+Thread.sleep(5000);
+} catch (Exception ex) {
+}
+return;
+}
if (daemon == null) {
daemon = new Bootstrap();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
Mladen Turk wrote: -Original Message- From: jean-frederic clere Henri fixes the core... But I think we should return 400 otherwise jsp code could be displayed as text. Someone should take care of jk_dsapi_plugin.c and jk_isapi_plugin.c and do the same. jk_isapi_plugin uses INTERNET_MAX_URL_LENGTH which is 32 + 4 + 2048 bytes long. Do we need to limit that to 1012 bytes? 1024 is the size we have in jk_uriMap.c (:1234567890\0 makes the 12). Is there any RFC saying what is the longest SERVER_NAME? I have looked in RFC2616 - There is nothing about the length. MT. signature.asc Description: OpenPGP digital signature
cvs commit: jakarta-tomcat-5 build.xml
remm2004/03/12 06:35:45
Modified:.build.xml
Log:
- Don't bother about the other JMX related binaries.
Revision ChangesPath
1.180 +0 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- build.xml 12 Mar 2004 14:31:24 - 1.179
+++ build.xml 12 Mar 2004 14:35:45 - 1.180
@@ -137,12 +137,6 @@
copy todir=${tomcat.build}/bin
file=${commons-logging-api.jar} /
copy tofile=${tomcat.build}/bin/jmx.jar file=${jmx.jar} /
-copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
-file=${jmx-tools.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote.jar
-file=${jmx-remote.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote-tools.jar
-file=${jmx-remote-tools.jar} failonerror=false /
copy todir=${tomcat.build}/server/lib file=${commons-modeler.jar} /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.0] Problems with the next release
Please subscribe to [EMAIL PROTECTED] and follow the thread about 'clarification'. It seems there is a discussion on having non ASF binaries : 2) state that the ASF will allow the use of its infrastructure for the distribution of binary objects that are legally distributable standalone even if they do not originate from the ASF and are not covered by the apache license and create a policy that says that source code must be available alongside as well and no modification to the original packages must be in place [only patches alongside] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
[EMAIL PROTECTED] wrote:
remm2004/03/12 06:35:45
Modified:.build.xml
Log:
- Don't bother about the other JMX related binaries.
Revision ChangesPath
1.180 +0 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- build.xml 12 Mar 2004 14:31:24 - 1.179
+++ build.xml 12 Mar 2004 14:35:45 - 1.180
@@ -137,12 +137,6 @@
copy todir=${tomcat.build}/bin
file=${commons-logging-api.jar} /
copy tofile=${tomcat.build}/bin/jmx.jar file=${jmx.jar} /
-copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
-file=${jmx-tools.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote.jar
-file=${jmx-remote.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote-tools.jar
-file=${jmx-remote-tools.jar} failonerror=false /
copy todir=${tomcat.build}/server/lib file=${commons-modeler.jar} /
We have HTTP and JRMP support in jmx-tools.jar, are you sure we could
forget to include them ?
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
Henri Gomez wrote:
[EMAIL PROTECTED] wrote:
remm2004/03/12 06:35:45
Modified:.build.xml
Log:
- Don't bother about the other JMX related binaries.
Revision ChangesPath
1.180 +0 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- build.xml12 Mar 2004 14:31:24 -1.179
+++ build.xml12 Mar 2004 14:35:45 -1.180
@@ -137,12 +137,6 @@
copy todir=${tomcat.build}/bin
file=${commons-logging-api.jar} /
copy tofile=${tomcat.build}/bin/jmx.jar file=${jmx.jar} /
-copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
-file=${jmx-tools.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote.jar
-file=${jmx-remote.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote-tools.jar
-file=${jmx-remote-tools.jar} failonerror=false /
copy todir=${tomcat.build}/server/lib
file=${commons-modeler.jar} /
We have HTTP and JRMP support in jmx-tools.jar, are you sure we could
forget to include them ?
I've never actually bundled these binaries (at least, not for a while),
so there's no change.
Rémy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/conf web.xml
Could someone remove [EMAIL PROTECTED] from tomcat-dev list please ? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
Remy Maucherat wrote:
Henri Gomez wrote:
[EMAIL PROTECTED] wrote:
remm2004/03/12 06:35:45
Modified:.build.xml
Log:
- Don't bother about the other JMX related binaries.
Revision ChangesPath
1.180 +0 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- build.xml12 Mar 2004 14:31:24 -1.179
+++ build.xml12 Mar 2004 14:35:45 -1.180
@@ -137,12 +137,6 @@
copy todir=${tomcat.build}/bin
file=${commons-logging-api.jar} /
copy tofile=${tomcat.build}/bin/jmx.jar file=${jmx.jar} /
-copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
-file=${jmx-tools.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote.jar
-file=${jmx-remote.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote-tools.jar
-file=${jmx-remote-tools.jar} failonerror=false /
copy todir=${tomcat.build}/server/lib
file=${commons-modeler.jar} /
We have HTTP and JRMP support in jmx-tools.jar, are you sure we could
forget to include them ?
I've never actually bundled these binaries (at least, not for a while),
so there's no change.
Ok, they are needed if you want to use JMX from a JMX console like
ExtremeJ or MC4J, since they use JRMP.
Just my .2 EUR
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.0] Problems with the next release
Henri Gomez wrote: Please subscribe to [EMAIL PROTECTED] and follow the thread about 'clarification'. It seems there is a discussion on having non ASF binaries : 2) state that the ASF will allow the use of its infrastructure for the distribution of binary objects that are legally distributable standalone even if they do not originate from the ASF and are not covered by the apache license and create a policy that says that source code must be available alongside as well and no modification to the original packages must be in place [only patches alongside] Ok. So it's confusing ;) I'll revert my changes if the situation evolves. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.0] Problems with the next release
Remy Maucherat wrote: Henri Gomez wrote: Please subscribe to [EMAIL PROTECTED] and follow the thread about 'clarification'. It seems there is a discussion on having non ASF binaries : 2) state that the ASF will allow the use of its infrastructure for the distribution of binary objects that are legally distributable standalone even if they do not originate from the ASF and are not covered by the apache license and create a policy that says that source code must be available alongside as well and no modification to the original packages must be in place [only patches alongside] Ok. So it's confusing ;) I'll revert my changes if the situation evolves. I suggest that we subscribe to [EMAIL PROTECTED] and participate to the thread ... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[5] Broken build
Hi, init: build-tomcatcoyote: [echo] == Building: tomcat-coyote compile.shared: [javac] Compiling 13 source files to /disk/raid0/home/jfarcand/jakarta-tomcat/jakarta-tomcat-5/build/classes [javac] Note: Some input files use or override a deprecated API. [javac] Note: Recompile with -deprecation for details. [copy] Copying 4 files to /disk/raid0/home/jfarcand/jakarta-tomcat/jakarta-tomcat-5/build/classes [copy] Copied 2 empty directories to /disk/raid0/home/jfarcand/jakarta-tomcat/jakarta-tomcat-5/build/classes compile.tomcat5: jar.tomcat5: BUILD FAILED file:/disk/raid0/home/jfarcand/jakarta-tomcat/jakarta-tomcat-connectors/coyote/build.xml:236: Manifest file: /disk/raid0/home/jfarcand/jakarta-tomcat/jakarta-tomcat-5/build/conf/MANIFEST.MF does not exist. Total time: 2 minutes 17 seconds I did not yet investigate. Anybodys? Thanks, -- Jeanfrancois - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Your letter
Your document is attached. ** ** WARNING: WinProxy has detected a prohibited file type attached to this e-mail message! The attachment has been automatically removed to protect your network. WinProxy Administrator: [EMAIL PROTECTED] 03/12/04 09:10:06 WinProxy (Version 5.0 R1c (5.0.50.8)) - http://www.Ositis.com/ Machine name: Proxy Machine IP address: 216.201.132.30 Client: Cwalker Protocol: SMTP Attachment: your_letter.pif ** ** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21549] - mod_jk2 interference with other mods needs to be resolved
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=21549. 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=21549 mod_jk2 interference with other mods needs to be resolved [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 15:36 --- It seems fixed trying with. RewriteRule^/path(.*)$ /newpath/$1 [NC,L,R=permanent] path/foo.html - goes to /newpath/foo.html path/foo.jsp - goes to /newpath/foo.jsp - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 davhowto.xml
jfclere 2004/03/12 07:49:31 Modified:jk/xdocs/jk2 davhowto.xml Log: Now mod_jk2 works better. The Alias is not mandatory. Revision ChangesPath 1.2 +1 -2 jakarta-tomcat-connectors/jk/xdocs/jk2/davhowto.xml Index: davhowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk2/davhowto.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- davhowto.xml 3 Mar 2004 11:19:26 - 1.1 +++ davhowto.xml 12 Mar 2004 15:49:31 - 1.2 @@ -13,8 +13,7 @@ section name=extract of httpd.conf p -The Alias is NEEDED otherwise mod_jk2 translate hook will be called first... -That is a Hack it need to be fixed in mod_jk2.c +The Alias is just for confort ;-) source Alias /examples/jsp-source /home/jfclere/jakarta-tomcat-4.1.24/webapps/examples/jsp lt;Location /examples/jsp-sourcegt; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: jk2 2.0.4 release
From: Henri Gomez [EMAIL PROTECTED] Hi, We see many bug fixes in the last 2 weeks in jk2, and I wonder if some of you still have some corrections to commit. I plan to tag jk2 next Monday morning, and make the release on monday afternoon. If nobody object, I'll do like this +1 as soon as Mladen is ready. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15278] - [PATCH] mod_jk2 for IIS, Bugfix corrupted data ]
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=15278. 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=15278 [PATCH] mod_jk2 for IIS, Bugfix corrupted data ] --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 17:38 --- Created an attachment (id=10766) jk2 log of problem with debug turned on in WorkerEnv and channel - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15278] - [PATCH] mod_jk2 for IIS, Bugfix corrupted data ]
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=15278. 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=15278 [PATCH] mod_jk2 for IIS, Bugfix corrupted data ] --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 17:39 --- Created an attachment (id=10767) Tomcat exception log to match JK2 log - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15278] - [PATCH] mod_jk2 for IIS, Bugfix corrupted data ]
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=15278. 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=15278 [PATCH] mod_jk2 for IIS, Bugfix corrupted data ] --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 17:41 --- Created an attachment (id=10768) My compiled version of the isapi_redirector2.dll - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15278] - [PATCH] mod_jk2 for IIS, Bugfix corrupted data ]
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=15278. 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=15278 [PATCH] mod_jk2 for IIS, Bugfix corrupted data ] --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 17:45 --- Need to find a machine to set up Tomcat 5.0 for testing.. ACC Tourney may delay this..lol In case it's needed for use with the JK2 debug attachment: The war file I was testing with was 174,597 bytes. FWIW, The isapi_redirector2.dll was compiled under WinXP Pro. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
container managed security
In tomcat 4 I was able to to protect my app with non-SSL security-constraints while using SSL form-based authentication so that the passwords were not sent in clear text. This has been a specification of the last 3 projects I have worked on. In tomcat 5 this is impossible without coding a work-around. I logged this as a bug in tomcat but it was closed as 'invalid'. http://issues.apache.org/bugzilla/show_bug.cgi?id=23970 I remember 6 months ago someone saying that the tomcat developers had decided that due to the danger of session-hijacking, if it was worth encrypting the login, it was worth encrypting the whole session traffic. Due to the charges that the extra hardware brings when doing all logged-in sessions in SSL, amongst other reasons, I disagreed and developed a work-around to let me carry on using the Struts Tomcat security features. This took me a few days back then, and then this week something else cropped up which caused me to revisit the work-around code and spend 2 days adding to it (and documenting it - it's pretty arcane). It occurred to me that this will always happen. The work-around is vulnerable to any changes in the servlet spec of course, but also in tomcat and in struts. I would appreciate finding out the whole story on this - last time I just let it go through lack of time. If I'm in the wrong place - perhaps the JCP Servlet working group would be better - can someone point me in the right direction? Adam -- struts 1.1 + tomcat 5.0.16 + java 1.4.2 Linux 2.4.20 Debian - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.0] Problems with the next release
- Original Message - From: Mladen Turk [EMAIL PROTECTED] To: 'Tomcat Developers List' [EMAIL PROTECTED]; [EMAIL PROTECTED] Sent: Friday, March 12, 2004 3:24 AM Subject: RE: [5.0] Problems with the next release -Original Message- From: jean-frederic clere Mladen Turk wrote: What about linking to static microsoft libraries? That is probably not OK. I know that, but I know too that the law doesn't have a term _probably_ in it's dictionary. Do we need to sign that or ASF will perhaps provide us with the development tools needed? Use Open Source tools and/or help to improve existing ones. Again, Is it required to use open source tools or not? Is it up to me and my moral or is there some ASF board decision on that? I had to sign for my current company that will take care that there are no illegal software on my boxes (as probably everyone else did). Take a look at http(apr, apr-util, etc...). The win32 port has vstudio build files (like our connectors). My question is, where those tools comes from? ASF or developers that have couple of 1000$ to spend? Also I heard that the ASF has an agreement with InstallShield. I would love to receive a license for some of those tools if possible :-). A quick look at the VS build files for httpd shows that they are using dynamic linking for the MS stuff (Multithreaded DLL). The tools themselves aren't really relevant: gcc is GPL and glibc is LGPL. Since all of the board members are from httpd project, seems to me that all the decisions have been made through this point of view. It's not hard to implement this decisions for that particular project. They done this so far, although for different reasons (no ssl enabled dist, etc...). Henri, Remy and Costin proposed to move the binaries to sourceforge, until the things clears up. I'm in favor of that, and will support such a decision if voted. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_shm.h
mturk 2004/03/12 11:12:19
Modified:jk/native2/include jk_shm.h
Log:
Change some struct elements.
Added inmem and attached flags.
Revision ChangesPath
1.10 +15 -4 jakarta-tomcat-connectors/jk/native2/include/jk_shm.h
Index: jk_shm.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_shm.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_shm.h 24 Feb 2004 08:44:39 - 1.9
+++ jk_shm.h 12 Mar 2004 19:12:19 - 1.10
@@ -70,8 +70,9 @@
struct jk_shm_head {
-struct jk_shm_slot slot;
+int structSize;
+
int slotSize;
int slotMaxCount;
@@ -82,6 +83,10 @@
/* XXX Need a more generic mechanism */
int lbVer;
+
+/* Array of used slots set to nonzero if used */
+char slots[1];
+
};
@@ -132,11 +137,17 @@
int slotMaxCount;
-void *image;
-
struct jk_shm_head *head;
-/* Private data */
+/* Memory image (the data after head)*/
+void *image;
+
+/* Is the shmem attached or created */
+int attached;
+
+/* Use the main memory instead */
+int inmem;
+/* Private data (apr_shm_t) */
void *privateData;
};
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_shm.c
mturk 2004/03/12 11:15:56
Modified:jk/native2/common jk_shm.c
Log:
Total rewrite...
Allows using anonymous shared memory or file based.
Also allow usage of raw memory in case there is no shmem support.
Added two new setup direcives: slots (manages max number of slots),
and memory that when set uses malloc'd memory instead shmem.
If the file name starts with 'anon' try using anonymous memory.
Shmem uses create/attach mechanism so please test.
Revision ChangesPath
1.40 +205 -370 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- jk_shm.c 11 Mar 2004 15:32:38 - 1.39
+++ jk_shm.c 12 Mar 2004 19:15:56 - 1.40
@@ -15,14 +15,6 @@
*/
/**
- * Scoreboard - used for communication on multi-process servers.
- *
- * This is an optional component - will be enabled only if APR is used.
- * The code is cutpasted from apache and mod_jserv.
- *
- *
- *
- * @author Jserv and Apache people
*/
#include jk_global.h
@@ -30,23 +22,11 @@
#include jk_pool.h
#include jk_shm.h
-/* global.h will include apr.h. If APR and mmap is compiled in, we'll use
- it. If APR is not availalbe, we use mmap directly - the code worked fine
- for jserv.
-*/
-#if APR_HAS_MMAP
-
-#include apr_mmap.h
-#include apr_file_io.h
-#include apr_file_info.h
+#include apr_shm.h
+#include apr_rmm.h
+#include apr_errno.h
#include apr_general.h
-
-#elif defined(HAVE_MMAP) !defined(WIN32)
-
-#include sys/mman.h
-#include fcntl.h
-
-#endif
+#include apr_lib.h
#define SHM_WRITE_SLOT 2
@@ -54,276 +34,147 @@
#define SHM_DUMP 6
-#if (APR_HAS_MMAP == 1)
-
-static int JK_METHOD jk2_shm_destroy(jk_env_t *env, jk_shm_t *shm)
+static int JK_METHOD jk2_shm_destroy(jk_env_t *env, jk_shm_t *shmem)
{
-apr_mmap_t *aprShm=(apr_mmap_t *)shm-privateData;
+apr_status_t rv = APR_SUCCESS;
+#if APR_HAS_SHARED_MEMORY
+apr_shm_t *shm = (apr_shm_t *)shmem-privateData;
+
+if (shm) {
+if (shmem-attached)
+rv = apr_shm_detach(shm);
+else
+rv = apr_shm_destroy(shm);
+}
+#endif
+shmem-head = NULL;
+shmem-image = NULL;
-if( aprShm==NULL )
-return JK_OK;
-
-return apr_mmap_delete(aprShm);
+return rv == APR_SUCCESS ? JK_OK : JK_ERR;
}
-static int jk2_shm_create(jk_env_t *env, jk_shm_t *shm)
+static int jk2_shm_create(jk_env_t *env, jk_shm_t *shmem)
{
-apr_status_t rc;
-apr_file_t *file;
-apr_finfo_t finfo;
-apr_mmap_t *aprMmap;
+apr_status_t rc = APR_EGENERAL;
+apr_shm_t *shm = NULL;
apr_pool_t *globalShmPool;
-globalShmPool= (apr_pool_t *)env-getAprPool( env );
+globalShmPool = (apr_pool_t *)env-getAprPool(env);
-if( globalShmPool==NULL )
+if (!globalShmPool) {
return JK_ERR;
-
-/* Check if the scoreboard is in a note. That's the only way we
- can get HP-UX to work
-*/
-apr_pool_userdata_get( shm-image, mod_jk_shm,globalShmPool );
-if( shm-image!=NULL ) {
-shm-head = (jk_shm_head_t *)shm-image;
-
-if( shm-mbean-debug 0 )
-env-l-jkLog(env, env-l, JK_LOG_DEBUG,
- shm.create(): GLOBAL_SHM %#lx\n, shm-image );
-return JK_OK;
-} else {
-if( shm-mbean-debug 0 )
-env-l-jkLog(env, env-l, JK_LOG_DEBUG,
- shm.create(): NO GLOBAL_SHM %#lx\n, shm-image );
}
-
-/* First make sure the file exists and is big enough
- */
-rc=apr_file_open( file, shm-fname,
- APR_READ | APR_WRITE | APR_CREATE | APR_BINARY,
- APR_OS_DEFAULT, globalShmPool);
-if (rc) {
-char error[256];
-apr_strerror( rc, error, 256 );
-
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
- shm.create(): error opening file %s %d %s\n,
- shm-fname, rc, error );
-shm-privateData=NULL;
-return JK_ERR;
-}
-
-rc=apr_file_info_get(finfo, APR_FINFO_SIZE, file);
-
-if( shm-mbean-debug 0 )
-env-l-jkLog(env, env-l, JK_LOG_DEBUG,
- shm.create(): file open %s %d %d\n, shm-fname, shm-size,
(int) finfo.size );
-
-if( (int) finfo.size shm-size ) {
-char bytes[1024];
-apr_size_t toWrite = (apr_size_t)(shm-size-finfo.size);
-apr_off_t off=0;
-
-memset( bytes, 0, 1024 );
-apr_file_seek( file, APR_END, off);
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c
mturk 2004/03/12 11:19:58
Modified:jk/native2/common jk_worker_status.c
Log:
Change the loop for shmem.
The shmem indexes starts with 0 now.
Revision ChangesPath
1.54 +1 -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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- jk_worker_status.c1 Mar 2004 09:38:20 - 1.53
+++ jk_worker_status.c12 Mar 2004 19:19:58 - 1.54
@@ -186,7 +186,7 @@
s-jkprintf(env, s, table border\n);
-for( i=1; i wenv-shm-head-lastSlot; i++ ) {
+for( i=0; i wenv-shm-head-lastSlot; i++ ) {
jk_shm_slot_t *slot= wenv-shm-getSlot( env, wenv-shm, i );
if( slot==NULL ) continue;
-
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
This account does not exist - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml
mturk 2004/03/12 11:33:24 Modified:jk/xdocs/jk2 configwebcom.xml Log: Some docs about new shm directives. Revision ChangesPath 1.15 +21 -11jakarta-tomcat-connectors/jk/xdocs/jk2/configwebcom.xml Index: configwebcom.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk2/configwebcom.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- configwebcom.xml 10 Mar 2004 09:36:39 - 1.14 +++ configwebcom.xml 12 Mar 2004 19:33:24 - 1.15 @@ -156,16 +156,26 @@ thDefault/th thDescription/th /tr -tr -tdfile/td -tdNo default value/td -tdName of the file that will be mmapped to use as shared memory./td -/tr -tr -tdsize/td -tdNo default value/td -tdSize of the file./td -/tr +tr +tdfile/td +tdNo default value/td +tdName of the file that will be mmapped to use as shared memory, if set to 'anonymous' use the anonymous shered memory/td +/tr +tr +tdsize/td +tdNo default value/td +tdDeprecated. Size of the file./td +/tr +tr +tdslots/td +td256/td +tdNumber of shared memory slots. Set to the number of child processes/td +/tr +tr +tdmemory/td +td0/td +tdUse the precess memory instead of shared memory. Useful for single child mpm's/td +/tr /table /p /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteRequest.java
remm2004/03/12 11:45:43
Modified:catalina/src/share/org/apache/catalina/core
ApplicationHttpRequest.java
catalina/src/share/org/apache/catalina/session
StandardSession.java
catalina/src/share/org/apache/coyote/tomcat5
CoyoteRequest.java
Log:
- Initialize accessCount to 0.
- Call access when creating a session and in crossContext creations as well.
Revision ChangesPath
1.21 +2 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ApplicationHttpRequest.java 28 Feb 2004 10:56:52 - 1.20
+++ ApplicationHttpRequest.java 12 Mar 2004 19:45:43 - 1.21
@@ -507,9 +507,8 @@
localSession.setMaxInactiveInterval
(context.getManager().getMaxInactiveInterval());
localSession.setId(other.getId());
-} else {
-localSession.access();
}
+localSession.access();
session = localSession;
return session.getSession();
}
1.39 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java
Index: StandardSession.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- StandardSession.java 11 Mar 2004 19:56:52 - 1.38
+++ StandardSession.java 12 Mar 2004 19:45:43 - 1.39
@@ -278,7 +278,7 @@
/**
* The access count for this session.
*/
-protected transient int accessCount = 1;
+protected transient int accessCount = 0;
// - Session Properties
1.32 +5 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java
Index: CoyoteRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- CoyoteRequest.java27 Feb 2004 14:58:53 - 1.31
+++ CoyoteRequest.java12 Mar 2004 19:45:43 - 1.32
@@ -2246,10 +2246,12 @@
((HttpServletResponse) response).addCookie(cookie);
}
-if (session != null)
+if (session != null) {
+session.access();
return (session.getSession());
-else
+} else {
return (null);
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15278] - [PATCH] mod_jk2 for IIS, Bugfix corrupted data ]
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=15278. 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=15278 [PATCH] mod_jk2 for IIS, Bugfix corrupted data ] --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 19:57 --- Well, I've tried your dll and it works on my side with TC5. I'll try to test this with 4.1.30 to see if this works. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15278] - [PATCH] mod_jk2 for IIS, Bugfix corrupted data ]
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=15278. 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=15278 [PATCH] mod_jk2 for IIS, Bugfix corrupted data ] --- Additional Comments From [EMAIL PROTECTED] 2004-03-12 20:14 --- Apache Tomcat/4.1.30-LE-jdk14 JVM 1.4.2_03-b02 Windows XP 5.1 x86 It works even with your dll. There are very strange lines in your jk2.log They shuld mosly be: ... jk_ws_service_t::read buffer readed 8186 ... You are getting much random read values from 162 bytes to 8K. Do you have slow line? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
truk2004/03/12 12:42:51
Modified:jk/native2/common jk_worker_ajp13.c
Log:
Don't do a prepost check alive if the endpoint is not connected yet (it
always fails). When connecting endpoint do a prepost check alive if
there isn't a connect check alive.
Revision ChangesPath
1.62 +5 -2 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- jk_worker_ajp13.c 1 Mar 2004 09:35:26 - 1.61
+++ jk_worker_ajp13.c 12 Mar 2004 20:42:51 - 1.62
@@ -303,9 +303,12 @@
/** XXX use a 'connected' field */
if( ae-sd == -1 ) ae-sd=0;
-if (ae-worker-connect_timeout != 0 ) {
+if (ae-worker-connect_timeout != 0) {
if (jk2_check_alive(env, ae, ae-worker-connect_timeout) != JK_OK)
return JK_ERR;
+} else if (ae-worker-prepost_timeout != 0) {
+if (jk2_check_alive(env, ae, ae-worker-prepost_timeout) != JK_OK)
+return JK_ERR;
}
/* Check if we must execute a logon after the physical connect */
@@ -569,7 +572,7 @@
s-left_bytes_to_send = s-content_length;
s-content_read=0;
-if (w-prepost_timeout != 0) {
+if (w-prepost_timeout != 0 e-sd != -1) {
if (jk2_check_alive(env, e, e-worker-prepost_timeout) != JK_OK)
return JK_ERR;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: jk2 2.0.4 release
Good morning Henri. 1. I have tried your recently added style section for the jkstatus page, and the dab of colour is a nice addition. Application of some more P's and H? to the output display would make a small refinement to the approach. However, the notion that one has to recompile the module just to change the colour scheme seems a little too heavyweight. An alternative I tried was to embed a LINK HREF= [in jk_worker_status.c] to an external stylesheet in /styles/jkstatus.css. While hard coding isn't always appreciated (I've seen a few sites with this type of directory) the external file makes changing colour combinations a _lot_ easier. While this might expose the colouring to some tampering, the same is also true with Apache and Mod_Jk2 when external config files are used. 2. A recent e-mail from me to TC-dev indicated a 'problem' with JkUriSet, whereby the 'match_type' is being incorrectly set in the uri bean due to the digits added to the uri passed to the jk_uriEnv_init function. Jean Clere offered some feedback regarding this, but the question still remains. This currently 'breaks' JkUriSet AFAICTest and it 'ought' to be working for the 2.0.4 release if possible. The 'primary key' for URI objects is the URI type + a name field made up of a possible host,port and context. If the same values can be recovered for a particular Location entry in an Apache conf file, then it makes sense to simply update an existing [matching] uri object created through workers2.properties... in which case there is no point to adding the extra numbers, which prevents identical uri keys from being detected. 3. I recently suggested a patch for uriEnv.c to remove a duplicated field from the uri runtime display in /jkstatus. While I can even stand a reply of 'Idiot - it can't be done because...', it's not polite to just ignore offers of assistance to make the module better. Thanks for the time and effort given, Norm Hi, We see many bug fixes in the last 2 weeks in jk2, and I wonder if some of you still have some corrections to commit. I plan to tag jk2 next Monday morning, and make the release on monday afternoon. If nobody object, I'll do like this - 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]
{Virus?} RWQIQ
Warning: This message has had one or more attachments removed Warning: (text.zip). Warning: Please read the vif-Attachment-Warning.txt attachment(s) for more information. Please see the attached file for details This is a message from the MailScanner E-Mail Virus Protection Service -- The original e-mail attachment text.zip was believed to be infected by a virus and has been replaced by this warning message. Due to limitations placed on us by the Regulation of Investigatory Powers Act 2000, we were unable to keep a copy of the infected attachment. Please ask the sender of the message to disinfect their original version and send you a clean copy. At Fri Mar 12 16:32:48 2004 the virus scanner said: F-Prot: text.zip-text.jpg Infection: W32/[EMAIL PROTECTED] -- Postmaster MailScanner thanks transtec Computers for their support - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml
Good morning. 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. 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? 3. Can the shm 'memory' option be changed to 'memoryType' so that it more self-explanatory. [memory=0 isn't.] 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? Thanks for any feedback, Norm - Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Saturday, March 13, 2004 6:33 AM Subject: cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml mturk 2004/03/12 11:33:24 Modified:jk/xdocs/jk2 configwebcom.xml Log: Some docs about new shm directives. Revision ChangesPath 1.15 +21 -11 jakarta-tomcat-connectors/jk/xdocs/jk2/configwebcom.xml Index: configwebcom.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk2/configwebcom.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- configwebcom.xml 10 Mar 2004 09:36:39 - 1.14 +++ configwebcom.xml 12 Mar 2004 19:33:24 - 1.15 @@ -156,16 +156,26 @@ thDefault/th thDescription/th /tr -tr -tdfile/td -tdNo default value/td -tdName of the file that will be mmapped to use as shared memory./td -/tr -tr -tdsize/td -tdNo default value/td -tdSize of the file./td -/tr +tr +tdfile/td +tdNo default value/td +tdName of the file that will be mmapped to use as shared memory, if set to 'anonymous' use the anonymous shered memory/td +/tr +tr +tdsize/td +tdNo default value/td +tdDeprecated. Size of the file./td +/tr +tr +tdslots/td +td256/td +tdNumber of shared memory slots. Set to the number of child processes/td +/tr +tr +tdmemory/td +td0/td +tdUse the precess memory instead of shared memory. Useful for single child mpm's/td +/tr /table /p /section - 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]
Re: jk2 2.0.4 release
Good morning again. As a PS to my last message, while testing the new changes to Jk2 noted that, in jk_worker_status.c the qry= option uses a plain/text coding rather than plain/html, and as a consequence, the recently added STYLE block is shown at the top of the page... it needs to be moved inside the if (qry=)/else block. Norm Hi, We see many bug fixes in the last 2 weeks in jk2, and I wonder if some of you still have some corrections to commit. I plan to tag jk2 next Monday morning, and make the release on monday afternoon. If nobody object, I'll do like this - 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]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session StandardSession.java
luehe 2004/03/12 14:36:46 Modified:catalina/src/share/org/apache/catalina/session StandardSession.java Log: set accessCount to 0 (instead of 1) in recycle() Revision ChangesPath 1.40 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java Index: StandardSession.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- StandardSession.java 12 Mar 2004 19:45:43 - 1.39 +++ StandardSession.java 12 Mar 2004 22:36:46 - 1.40 @@ -802,7 +802,7 @@ id = null; lastAccessedTime = 0L; maxInactiveInterval = -1; -accessCount = 1; +accessCount = 0; notes.clear(); setPrincipal(null); isNew = false; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Adding a new ServletRequest attribute
Hi. I'd like to be able to access the Socket associated with an HttpServletRequest from within a servlet (I want to call getChannel() in order to do some mux I/O). The getAttribute() method of ServletRequest would seem to be a good means of providing access to the Socket. If I submitted code (that didn't suck) that added the Socket as an attribute, would it be accepted? Thanks, Dave __ Do you Yahoo!? Yahoo! Search - Find what youre looking for faster http://search.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 26275] - Problems extracting WAR file when file names are latin 1 encoded
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=26275. 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=26275 Problems extracting WAR file when file names are latin 1 encoded --- Additional Comments From [EMAIL PROTECTED] 2004-03-13 01:38 --- The problem is obviously caused by http://developer.java.sun.com/developer/bugParade/bugs/4244499.html A possible solution would be to replace the java.util.zip package with the org.apache.tools.zip package that comes with Ant. The desired encoding might be specified in the Tomcat specific context description. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: DO NOT REPLY [Bug 26275] -
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_shm.c
mturk 2004/03/12 23:32:37
Modified:jk/native2/common jk_shm.c
Log:
Change memory directive to useMemory.
Revision ChangesPath
1.41 +2 -2 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- jk_shm.c 12 Mar 2004 19:15:56 - 1.40
+++ jk_shm.c 13 Mar 2004 07:32:37 - 1.41
@@ -319,7 +319,7 @@
static char *jk2_shm_setAttributeInfo[] = {resetEndpointStats,
file, size,
- slots, memory,
+ slots, useMemory,
NULL};
static int JK_METHOD jk2_shm_setAttribute(jk_env_t *env, jk_bean_t *mbean,
@@ -334,7 +334,7 @@
shm-size=atoi(value);
} else if( strcmp( slots, name ) == 0 ) {
shm-slotMaxCount=atoi(value);
-} else if( strcmp( memory, name ) == 0 ) {
+} else if( strcmp( useMemory, name ) == 0 ) {
shm-inmem=atoi(value);
} else if( strcmp( resetEndpointStats, name ) == 0 ) {
if( strcmp( value, 1 )==0 )
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml
mturk 2004/03/12 23:33:24 Modified:jk/xdocs/jk2 configwebcom.xml Log: Spell check fixes Revision ChangesPath 1.16 +4 -4 jakarta-tomcat-connectors/jk/xdocs/jk2/configwebcom.xml Index: configwebcom.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk2/configwebcom.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- configwebcom.xml 12 Mar 2004 19:33:24 - 1.15 +++ configwebcom.xml 13 Mar 2004 07:33:24 - 1.16 @@ -159,7 +159,7 @@ tr tdfile/td tdNo default value/td -tdName of the file that will be mmapped to use as shared memory, if set to 'anonymous' use the anonymous shered memory/td +tdName of the file that will be mmapped to use as shared memory, If set to 'anonymous' use the anonymous shered memory/td /tr tr tdsize/td @@ -172,9 +172,9 @@ tdNumber of shared memory slots. Set to the number of child processes/td /tr tr -tdmemory/td +tduseMemory/td td0/td -tdUse the precess memory instead of shared memory. Useful for single child mpm's/td +tdUse process memory instead of shared memory. Useful for single child mpm's/td /tr /table /p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml
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]
