Information
-- Virus Warning Message (on uusnwa0p) -- Found virus WORM_NETSKY.Z in file Part-2.txt .exe (in Part-2.zip) The uncleanable file is deleted. - Important! -- Virus Warning Message (on uusnwa0p) -- Part-2.zip is removed from here because it contains a virus. - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30833] - request.getServerPort() returns wrong port (WAS: response.sendRedirect() does not include port)
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=30833. 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=30833 request.getServerPort() returns wrong port (WAS: response.sendRedirect() does not include port) [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2004-08-25 09:52 --- http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.23 Your Host header should be: Host: login.d1segs.selectacast.net:81 not Host: login.d1segs.selectacast.net - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.5] Packaging
Costin Manolache wrote: Remy Maucherat wrote: No, you misunderstood. - jakarta-tomcat-5.5.0.zip - for JRE 5.0, no Admin - jakarta-tomcat-5.5.0.tar.gz - for JRE 5.0, no Admin - jakarta-tomcat-5.5.0.exe - for Windows, everything - jakarta-tomcat-5.5.0-compat.zip - for JRE 1.4 (a few additional JARs, not the whole thing) - jakarta-tomcat-5.5.0-compat.tar.gz - for JRE 1.4, no Admin You mean mx4j ? I'm not sure about having the main target be a JRE beta, The said JRE 5 adds a lot of extremely useful features for servers (good Linux 2.6 support, adequate monitoring, easy deadlock debugging), and should be out of beta at about the same time as a 5.5.x stable, right ? For the first time, the improvements are more useful than a performance increase :) This will help a lot for support. but I understand your point, it's cleaner this way. The alternative would be to have a 1.4 distro, with mx4j jars included, and detect at runtime if it's 1.5 and skip them from the loader. I suspect people will keep using 1.4 and 1.5 for a while, as usual there are incompatibilities - so it's better to be able to use the same tomcat with both. Please make sure target=1.3 is present in all javac tasks :-) Shouldn't we support only JRE 1.4 and 5.0 instead ? I would be able to replace jakarta-regexp use with Java regexp. Obviously people who don't want to upgrade (ex: I saw a really funny thread on tomcat-user about a guy who wants JMX runtime stats on 4.1.x, like the ones that were in 5.0.x) aren't going to upgrade to this new branch, because of API breakage. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: 5.0.28 next week?
Hi, OK. I also see Amy has done her commit. So it looks like Friday for the code freeze, and I'll cut the release Saturday or Sunday. Cool, Yoav Shapira Millennium Research Informatics -Original Message- From: Jan Luehe [mailto:[EMAIL PROTECTED] Sent: Tuesday, August 24, 2004 10:31 PM To: Tomcat Developers List Subject: Re: 5.0.28 next week? Shapira, Yoav wrote: Hola, I'm ready to cut 5.0.28 once the JSP folks are done with their work. I think you guys are actually all done and waiting for me, right? Shall we say this weekend with Friday as the deadline for committing any code on the TOMCAT_5_0 branch? +1. All Jasper critical bugs, as well upgrading default web.xml to Servlet 2.4, have been ported. Thanks! Jan Yoav Shapira Millennium Research Informatics This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - 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] This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [OT] - anyone wants a gmail invite
Peter Lin wrote: I normally don't like to post off topic things, but I have a gmail invite. if any of the tomcat-developers want a gmail account, email me directly. And I have 5 more myself :) Who wants one ? Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [5.5] Packaging
Hi, Please make sure target=1.3 is present in all javac tasks :-) Shouldn't we support only JRE 1.4 and 5.0 instead ? I would be able to I'm also not big on JDK 1.3 as the default target. I'm +0 on adding a javaTarget build.properties attribute that users can set to 1.3 but whose default value is 1.4, 1.5, or none, but not 1.3. I haven't seen a question on tomcat-user with someone running JDK 1.3 for a long time now. Yoav This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30843] New: - Partition workers2.properties
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=30843.
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=30843
Partition workers2.properties
Summary: Partition workers2.properties
Product: Tomcat 5
Version: 5.0.27
Platform: All
OS/Version: All
Status: NEW
Severity: Enhancement
Priority: Other
Component: Native:JK
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
Hi,
is it possible to partition the workers2.properties for the JK2?
We got JK2 running as a ISAPI-Filter on IIS6.
Now, the new structure of workers2.properties is better
against workers.properties and uriworkermap.properties.
But now, that we have loads of webs with many contexts each, which itself have
2-5 mappings each, the file get's huge (40kb) and complex.
Is it possible to partition the file, say, with include={file} statements?
Or better...
[include:file]
file={file}
ver=1
... this way the the main and subfiles (Mappings, Worker, Channels, ...)
remain clear, and even a reload is faster, because the jk2 only needs to read
the included files which version-numbers have increased.
thanks for your brill work...
--
Björn Andersen
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30848] New: - CATALINA_HOME env var not set by Windows install
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=30848. 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=30848 CATALINA_HOME env var not set by Windows install Summary: CATALINA_HOME env var not set by Windows install Product: Tomcat 5 Version: 5.0.27 Platform: PC OS/Version: Other Status: NEW Severity: Enhancement Priority: Other Component: Native:Packaging AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] It appears that jakarta-tomcat-5.0.27.exe (for Windows) does not set the environment variable CATALINA_HOME. Perhaps it should. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30848] - CATALINA_HOME env var not set by Windows install
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=30848. 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=30848 CATALINA_HOME env var not set by Windows install --- Additional Comments From [EMAIL PROTECTED] 2004-08-25 14:31 --- Hmm, I'm not sure. The windows unzip certainly doesn't set it, and leaves it up to the automatic detection mechanism. (Which is simple: one directory up from the startup/shutdown scripts -- that usually works fairly well). In the future, please discuss on the mailing list and come up with more expressive/convincing reasoning than perhaps it should' when opening an enhancement ticket. Thanks ;) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30489] - removeAttribute: Session already invalidated
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=30489. 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=30489 removeAttribute: Session already invalidated --- Additional Comments From [EMAIL PROTECTED] 2004-08-25 14:32 --- Please provide a test case if possible. I've never had this happen before... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30848] - CATALINA_HOME env var not set by Windows install
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=30848. 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=30848 CATALINA_HOME env var not set by Windows install --- Additional Comments From [EMAIL PROTECTED] 2004-08-25 14:41 --- Sorry, I'm new here... OK, reasons: CATALINA_HOME is pretty important. Without it, Strange Things happen. It would help newbies (like me) a lot if the install kit sets it. And, since it appears that the install kit for Windows uses MS Windows Installer (or something similar), it *can* set environment variables. The install kit should be as complete as possible, setting up everything. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30489] - removeAttribute: Session already invalidated
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=30489. 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=30489 removeAttribute: Session already invalidated --- Additional Comments From [EMAIL PROTECTED] 2004-08-25 15:15 --- Which version of Tomcat are you working with. this happens when the shutdown, the manager tries to write sessions to file, but one of the sessions is in an invalid state. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30489] - removeAttribute: Session already invalidated
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=30489. 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=30489 removeAttribute: Session already invalidated --- Additional Comments From [EMAIL PROTECTED] 2004-08-25 16:05 --- I use Tomcat 5.0.24. I have similar problem while reloading context. There were 200-1000 session when this problem occured. Unfortunately I am not able to provide a test case :-( I think it may be related with session expiration, but I am not sure - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.5] Packaging
Remy Maucherat wrote: Please make sure target=1.3 is present in all javac tasks :-) Shouldn't we support only JRE 1.4 and 5.0 instead ? I would be able to replace jakarta-regexp use with Java regexp. Obviously people who don't want to upgrade (ex: I saw a really funny thread on tomcat-user about a guy who wants JMX runtime stats on 4.1.x, like the ones that were in 5.0.x) aren't going to upgrade to this new branch, because of API breakage. I'm using 1.3 most of the time, there is a _lot_ of software out there that doesn't work in jdk1.4 and won't work in jdk1.5 either. Not to mention companies having policies and supporting only one VM ( so they don't have to deal with all the incompatibilities between versions ). I'm personally -1 on droping support for 1.3 ( well, I would be +1 on supporting J2ME or 1.1 as a baseline :-). Even compiling software with jdk1.5 or loading it in an IDE is problematic. I think we should value stability more than featurism - and value flexibility and modularity more than bloat. There are people who have problems with the Sun/Microsoft policy of bundling features in order to reduce competition ( logging, mx4j/jbossmx, jakarta-regexp, parser, etc ). Especially when those features are hard to replace with better implementations ( even if they implement an API and have some convoluted endorsed setting to replace ). Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.5] Packaging
Shapira, Yoav wrote: Hi, Please make sure target=1.3 is present in all javac tasks :-) Shouldn't we support only JRE 1.4 and 5.0 instead ? I would be able to I'm also not big on JDK 1.3 as the default target. I'm +0 on adding a javaTarget build.properties attribute that users can set to 1.3 but whose default value is 1.4, 1.5, or none, but not 1.3. I haven't seen a question on tomcat-user with someone running JDK 1.3 for a long time now. Maybe that's because they don't have endorsed problems and things just work and are stable :-) Write once, run anywhere - why would you choose a target that will not run for a (significant) number of people, and try to force them to choose between upgrading tomcat and upgrading other software ? What do we gain ? Few features that are available anyway - with many choices of better implementations. Sun has the bad habit of breaking compatibility and the run anywhere promise on every release. 5.0 is particularly bad. I consider run anywhere one of the essential things in java - including the ability to run with other vendor or open source VMs. Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [5.5] Packaging
Hola, I'm personally -1 on droping support for 1.3 ( well, I would be +1 on supporting J2ME or 1.1 as a baseline :-). It depends how you define support, right? Does support mean by default everything is configured for JDK 1.3, and Tomcat is built with target=1.3 ? Or does it means there's an easy way to set this target parameter (e.g. a build.properties setting) and build your own Tomcat for 1.3? I think we should value stability more than featurism - and value flexibility and modularity more than bloat. There are people who have I definitely agree on modularity more than bloat. I wish we had a minimal tomcat distro that comes without admin, without manager, without balancer, without webdav, without docs, without examples, etc. Then we could have individual downloads for these (most would just be a simple zip file you'd extract to $CATALINA_HOME). And maybe one bundle that has everything to save people time. You could work from the minimal distro and add things or from the full distro and remove things. But I've brought this minimal distro idea up in the past already ;) Stability versus featurism is much more of a judgment call IMHO. Does stability mean we stick with an old platform (JDK 1.3) and jump through hoops (e.g. runtime detection) to use newer (JDK 1.4, JDK 1.5) features? If so, then at what point does the cost (e.g. performance) become higher than the benefit (ease of use for old platform users)? It's a subjective call I think. While I don't doubt the legitimacy of your pro-1.3 arguments, you just don't see users on the mailing list with anything other than JDK 1.4. We already get more JDK 1.5 questions than JDK 1.3 it seems, even though 1.5 is still in beta. So I don't know, I'm not 100% convinced we should require JDK 1.5, and I'm not 100% convinced we should drop 1.3, I'm just in the middle ;) I'm comfortable with requiring 1.4 though, as it's been more than 2 years since JDK 1.4 was released. Yoav This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.5] Packaging
Costin Manolache wrote: Remy Maucherat wrote: Please make sure target=1.3 is present in all javac tasks :-) Shouldn't we support only JRE 1.4 and 5.0 instead ? I would be able to replace jakarta-regexp use with Java regexp. Obviously people who don't want to upgrade (ex: I saw a really funny thread on tomcat-user about a guy who wants JMX runtime stats on 4.1.x, like the ones that were in 5.0.x) aren't going to upgrade to this new branch, because of API breakage. I'm using 1.3 most of the time, there is a _lot_ of software out there that doesn't work in jdk1.4 and won't work in jdk1.5 either. Not to mention companies having policies and supporting only one VM ( so they don't have to deal with all the incompatibilities between versions ). I'm personally -1 on droping support for 1.3 ( well, I would be +1 on supporting J2ME or 1.1 as a baseline :-). Well, that's your opinion, and you have one vote (I'll be sure to call a vote on that). This no longer makes any sense to me. Even compiling software with jdk1.5 or loading it in an IDE is problematic. I think we should value stability more than featurism - and value flexibility and modularity more than bloat. I don't see why cleaning up useless depedencies gets labelled as featurism. OTOH, it seems to me it reduces bloat. JRE 1.4.2 is now very stable, so there are no stability concerns. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [5.5] Packaging
Hola, Write once, run anywhere - why would you choose a target that will not run for a (significant) number of people, and try to force them to choose between upgrading tomcat and upgrading other software ? I don't think the number is significant. It's very subjective, and I have no empirical data, just opinion from the tomcat-user list. If someone could show, for example, that more than a tenth of Tomcat users run with JDK 1.3 in production, I'd be convinced me JDK 1.3 is still significant. I completely agree WORA is essential, possibly the biggest advantage of the Java language/platform. But then why aren't we coding/building to JDK 1.1 or J2ME? It's a question of tradeoffs. Maybe we should have a vote on whether Tomcat 5.5 should require JDK 1.5? This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30848] - CATALINA_HOME env var not set by Windows install
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=30848. 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=30848 CATALINA_HOME env var not set by Windows install [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||LATER --- Additional Comments From [EMAIL PROTECTED] 2004-08-25 16:42 --- I'm working on the environment var setter for procrun that will enable private environment variables. The support is present right now, but without GUI. Having installer option for setting environment variables directly to the system environment would require a restart after installing tomcat. The nullsoft installer we are using can do that with ease, but the upper problem still exists. In the mean time use the controll pannel for that. Why are Windows admins so lazy :)? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.5] Packaging
I would *guess* that those not bothering to move from 1.3 (for whatever reason) are mostly the same folk who won't upgrade to a more recent Tomcat version anyway. -- Jess Holle Shapira, Yoav wrote: Hola, Write once, run anywhere - why would you choose a target that will not run for a (significant) number of people, and try to force them to choose between upgrading tomcat and upgrading other software ? I don't think the number is significant. It's very subjective, and I have no empirical data, just opinion from the tomcat-user list. If someone could show, for example, that more than a tenth of Tomcat users run with JDK 1.3 in production, I'd be convinced me JDK 1.3 is still significant. I completely agree WORA is essential, possibly the biggest advantage of the Java language/platform. But then why aren't we coding/building to JDK 1.1 or J2ME? It's a question of tradeoffs. Maybe we should have a vote on whether Tomcat 5.5 should require JDK 1.5? This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-servletapi-5/jsr154/src/share/dtd web-app_2_4.xsd
jfarcand2004/08/25 09:50:35
Modified:jsr154/src/share/dtd Tag: TOMCAT_5_0 web-app_2_4.xsd
Log:
Port patch from the HEAD.
Revision ChangesPath
No revision
No revision
1.13.2.1 +2 -2 jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd
Index: web-app_2_4.xsd
===
RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- web-app_2_4.xsd 18 Mar 2004 16:40:34 - 1.13
+++ web-app_2_4.xsd 25 Aug 2004 16:50:34 - 1.13.2.1
@@ -30,7 +30,7 @@
xsd:annotation
xsd:documentation
- Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+ Copyright 2004 Sun Microsystems, Inc., 901 San Antonio
Road, Palo Alto, California 94303, U.S.A. All rights
reserved.
@@ -804,7 +804,7 @@
xsd:simpleContent
xsd:restriction base=j2ee:string
- xsd:pattern value=[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+/
+ xsd:pattern value=[^\p{Cc}^\s]+/[^\p{Cc}^\s]+/
/xsd:restriction
/xsd:simpleContent
/xsd:complexType
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30489] - removeAttribute: Session already invalidated
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=30489. 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=30489 removeAttribute: Session already invalidated [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2004-08-25 16:58 --- Sorry, no test case, no bug... The Servlet TCKs test that scenario and there is no failure. Re-open the bug once you have a test case. Thanks -- Jeanfrancois - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.5] Packaging
Remy Maucherat wrote: Costin Manolache wrote: Remy Maucherat wrote: Please make sure target=1.3 is present in all javac tasks :-) Shouldn't we support only JRE 1.4 and 5.0 instead ? I would be able to replace jakarta-regexp use with Java regexp. Obviously people who don't want to upgrade (ex: I saw a really funny thread on tomcat-user about a guy who wants JMX runtime stats on 4.1.x, like the ones that were in 5.0.x) aren't going to upgrade to this new branch, because of API breakage. I'm using 1.3 most of the time, there is a _lot_ of software out there that doesn't work in jdk1.4 and won't work in jdk1.5 either. Not to mention companies having policies and supporting only one VM ( so they don't have to deal with all the incompatibilities between versions ). I'm personally -1 on droping support for 1.3 ( well, I would be +1 on supporting J2ME or 1.1 as a baseline :-). Well, that's your opinion, and you have one vote (I'll be sure to call a vote on that). This no longer makes any sense to me. +1 for the vote. :-) I'm in favor of requiring j2se 5.0 (but I work at Sun so I might have a couple of bad habits ;-) ) -- Jeanfrancois Even compiling software with jdk1.5 or loading it in an IDE is problematic. I think we should value stability more than featurism - and value flexibility and modularity more than bloat. I don't see why cleaning up useless depedencies gets labelled as featurism. OTOH, it seems to me it reduces bloat. JRE 1.4.2 is now very stable, so there are no stability concerns. Rémy - 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: [5.5] Packaging
Shapira, Yoav wrote: Hola, Write once, run anywhere - why would you choose a target that will not run for a (significant) number of people, and try to force them to choose between upgrading tomcat and upgrading other software ? I don't think the number is significant. It's very subjective, and I have no empirical data, just opinion from the tomcat-user list. If someone could show, for example, that more than a tenth of Tomcat users run with JDK 1.3 in production, I'd be convinced me JDK 1.3 is still significant. I completely agree WORA is essential, possibly the biggest advantage of the Java language/platform. But then why aren't we coding/building to JDK 1.1 or J2ME? It's a question of tradeoffs. Maybe we should have a vote on whether Tomcat 5.5 should require JDK 1.5? Right now, my position is to use J2SE 1.4 APIs as needed, and to release the default bundle for J2SE 5.0 (with a separate bundle to add the JARs needed to run on J2SE 1.4). All that keeping in mind that Tomcat can now be fully supported on a JRE rather than a JDK. Overall, I'd say few people are going to upgrade to this new branch (but who knows, we don't even have numbers on how many people upgrade), so the J2SE requirement should have little impact. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.5] Packaging
Jeanfrancois Arcand wrote: +1 for the vote. :-) I'm in favor of requiring j2se 5.0 (but I work at Sun so I might have a couple of bad habits ;-) ) There are definitely a lot of places where using the generic collections would make the code a lot cleaner. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.5] Packaging
Jeanfrancois Arcand wrote: +1 for the vote. :-) I'm in favor of requiring j2se 5.0 (but I work at Sun so I might have a couple of bad habits ;-) ) Is the vote to be only on whether to continue to support 1.3? Or the same for 1.4? Also, is it just a commiters vote? Every platform of *any* note has a stable 1.4.2 now and there is precious little excuse to keep using it. On the other hand, if history is any indicator it will be up to 1 full year before 1.5 is available *and* stable on all platforms.(including various versions of UNIX, etc). Perhaps this will somehow only be 6 months, but I'd guess that though 1.5 could be the default, 1.4 support will be needed for up to 12 months after Sun's initial 1.5.0 release. -- Jess Holle - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.5] Packaging
Jess Holle wrote: Jeanfrancois Arcand wrote: +1 for the vote. :-) I'm in favor of requiring j2se 5.0 (but I work at Sun so I might have a couple of bad habits ;-) ) Is the vote to be only on whether to continue to support 1.3? Or the same for 1.4? Also, is it just a commiters vote? Only commiters have votes which do count, but you can participate in any vote if you want to. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/08/25 10:46:32
Modified:.build.xml
Log:
- Rework the packaging as discussed, with separate bundles for admin and compat.
Revision ChangesPath
1.199 +98 -34jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- build.xml 18 Aug 2004 01:54:47 - 1.198
+++ build.xml 25 Aug 2004 17:46:32 - 1.199
@@ -13,7 +13,7 @@
!-- Project Properties --
property name=name value=Apache Tomcat /
property name=year value=2004 /
- property name=version value=5.5 /
+ property name=version value=5.5.0 /
property name=project value=jakarta-tomcat /
property name=final.namevalue=${project}-${version} /
property name=final-src.namevalue=${project}-${version}-src /
@@ -739,7 +739,6 @@
copy todir=embed/lib file=${commons-modeler.jar}/
copy todir=embed/lib file=${commons-beanutils.jar}/
copy todir=embed/lib file=${commons-collections.jar}/
-copy todir=embed/lib file=${jmx.jar}/
copy todir=embed/lib file=${regexp.jar}/
copy todir=embed/lib file=${jasper-compiler-jdt.jar}/
@@ -1237,7 +1236,11 @@
!-- Copy the contents of each build directory --
copy todir=${tomcat.dist}/bin
- fileset dir=${tomcat.build}/bin /
+ fileset dir=${tomcat.build}/bin
+ exclude name=catalina.xml/
+ exclude name=commons-launcher.jar/
+ exclude name=*-using-launcher.*/
+ /fileset
/copy
copy todir=${tomcat.dist}/common/classes
fileset dir=${tomcat.build}/common/classes /
@@ -1414,7 +1417,7 @@
!-- RELEASE: Create Release === --
- target name=release
depends=clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-src-zip,package-src-tgz,clean-tester,run-tester,run-watchdog
+ target name=release
depends=clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-compat-zip,package-compat-tgz,package-admin-zip,package-admin-tgz,package-src-zip,package-src-tgz,clean-tester,run-tester
description=Create a Tomcat 5 packaged distribution
filter token=VERSION value=${version}/
@@ -1434,36 +1437,24 @@
target name=package-zip
zip zipfile=${tomcat.release}/v${version}/bin/${final.name}.zip
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=bin/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=common/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=conf/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=logs/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=server/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=shared/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=webapps/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=work/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=temp/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=LICENSE /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=NOTICE /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=README.txt /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=RELEASE-NOTES /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=RUNNING.txt /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=BENCHMARKS.txt /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}
+ include name=bin/**/
+ include name=conf/**/
+ include name=logs/**/
+ include name=server/**/
+ include name=shared/**/
+ include name=webapps/**/
+ include name=work/**/
+ include name=temp/**/
+ include name=LICENSE/
+ include name=NOTICE/
+ include name=README.txt/
+ include name=RELEASE-NOTES/
+ include name=RUNNING.txt/
+ include name=BENCHMARKS.txt/
+ exclude name=server/webapps/admin/**/
+ exclude name=conf/Catalina/localhost/admin.xml/
+ /zipfileset
/zip
/target
@@ -1497,6 +1488,39
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper Mapper.java
jfarcand2004/08/25 12:25:46
Modified:util/java/org/apache/tomcat/util/http/mapper Mapper.java
Log:
Add missing case to support the following web.xml:
servlet
display-nameServletTest/display-name
servlet-nameServletTest/servlet-name
servlet-classtest.ServletTest/servlet-class
/servlet
servlet-mapping
servlet-nameServletTest/servlet-name
url-pattern*.screen/url-pattern
/servlet-mapping
welcome-file-list
welcome-filewelcome.screen/welcome-file
/welcome-file-list
All Servlet TCKs passed. Please review (I recall some discussion on welcome file but
can't find those emails).
Revision ChangesPath
1.41 +9 -0
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
Index: Mapper.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Mapper.java 27 Jun 2004 23:56:23 - 1.40
+++ Mapper.java 25 Aug 2004 19:25:46 - 1.41
@@ -751,10 +751,19 @@
}
}
}
+
+// Rule 4d -- Welcome resources that
+//are mapped to an extension.
+if (mappingData.wrapper == null) {
+internalMapExtensionWrapper(extensionWrappers,
+path, mappingData);
+}
}
+
path.setOffset(servletPath);
path.setEnd(pathEnd);
}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.5] Packaging
Shapira, Yoav wrote: It depends how you define support, right? Does support mean by default everything is configured for JDK 1.3, and Tomcat is built with target=1.3 ? Or does it means there's an easy way to set this target parameter (e.g. a build.properties setting) and build your own Tomcat for 1.3? What is the cost of having target=1.3 by default ? It means the class files and the release will work with jdk1.3 - and it will also run on 1.4 or 1.5. What is the benefit of having target=1.4 and forcing people who use 1.3 to recompile the entire tomcat ? Stability versus featurism is much more of a judgment call IMHO. Does stability mean we stick with an old platform (JDK 1.3) and jump through hoops (e.g. runtime detection) to use newer (JDK 1.4, JDK 1.5) features? If so, then at what point does the cost (e.g. performance) become higher than the benefit (ease of use for old platform users)? It's a subjective call I think. That's a question for Sun :-), who is forcing people to jump through the hoops by bundling all features with the VM. Tomcat core already works with 1.3 - and you can have optional connectors/valves/etc that only work with 1.5 or 1.6 - with just a simple conditional compilation. I understand why MSFT is forcing people to upgrade windows - they make a lot of money from that, and don't care how much the users will suffer to upgrade. But we don't gain that much by forcing people to upgrade the VM to use the latest version of tomcat. I wish Sun would sell and make money on the VM - so at least someone would gets some benefit from this forced upgrade cycle :-) While I don't doubt the legitimacy of your pro-1.3 arguments, you just don't see users on the mailing list with anything other than JDK 1.4. We already get more JDK 1.5 questions than JDK 1.3 it seems, even though 1.5 is still in beta. IMO that's because 1.3 is used in production for quite a while - so most problems are solved. If you release the next version with 1.4 target - you may get more 1.3 questions :-) Upgrading the VM is almost the same with upgrading the OS - there are still plenty of packages for RedHat7.3 or NT, and most of the questions are from people trying the latest OS and noticing things are breaking. So I don't know, I'm not 100% convinced we should require JDK 1.5, and I'm not 100% convinced we should drop 1.3, I'm just in the middle ;) I'm comfortable with requiring 1.4 though, as it's been more than 2 years since JDK 1.4 was released. I'm ok with using 1.5 features, or having a default distribution for 1.5 - as long as the code is compiled with target=1.3 ( no major harm ) and it is possible to run the basic tomcat with 1.3 ( with some additional packages - parser, mx4j, etc ). Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.5] Packaging
Costin Manolache wrote: Shapira, Yoav wrote: It depends how you define support, right? Does support mean by default everything is configured for JDK 1.3, and Tomcat is built with target=1.3 ? Or does it means there's an easy way to set this target parameter (e.g. a build.properties setting) and build your own Tomcat for 1.3? What is the cost of having target=1.3 by default ? It means the class files and the release will work with jdk1.3 - and it will also run on 1.4 or 1.5. What is the benefit of having target=1.4 and forcing people who use 1.3 to recompile the entire tomcat ? Despite my own feeling that 1.3 has gone the way of the dodo bird, this is a good question. The only thing I know of offhand is that 1.4 gives you assert(). Stability versus featurism is much more of a judgment call IMHO. Does stability mean we stick with an old platform (JDK 1.3) and jump through hoops (e.g. runtime detection) to use newer (JDK 1.4, JDK 1.5) features? If so, then at what point does the cost (e.g. performance) become higher than the benefit (ease of use for old platform users)? It's a subjective call I think. That's a question for Sun :-), who is forcing people to jump through the hoops by bundling all features with the VM. Most of the features that are interesting in 1.5 have to be to be done right... Tomcat core already works with 1.3 - and you can have optional connectors/valves/etc that only work with 1.5 or 1.6 - with just a simple conditional compilation. I understand why MSFT is forcing people to upgrade windows - they make a lot of money from that, and don't care how much the users will suffer to upgrade. But we don't gain that much by forcing people to upgrade the VM to use the latest version of tomcat. I wish Sun would sell and make money on the VM - so at least someone would gets some benefit from this forced upgrade cycle :-) The reasons to force upgrades are: 1. Ability to fully leverage compelling runtime features for end-user benefit (e.g. in the case of 1.5, better concurrency utilities, built-in JMX, etc; in the case of 1.4 this might possibly include NIO stuff for loading static files or some such) 2. Ability to use compelling development features (e.g. generics in the case of dropping releases prior to 1.5, improved/easier-to-use APIs in cases, etc) 3. Narrower platform mix to mess with supporting / answering questions on, etc. -- Jess Holle
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf Ascii.java ByteChunk.java MessageBytes.java
markt 2004/08/25 13:44:15
Modified:coyote/src/java/org/apache/coyote Tag: TOMCAT_5_0
Request.java
http11/src/java/org/apache/coyote/http11 Tag: TOMCAT_5_0
Http11Processor.java
http11/src/java/org/apache/coyote/http11/filters Tag:
TOMCAT_5_0 IdentityInputFilter.java
util/java/org/apache/tomcat/util/buf Tag: TOMCAT_5_0
Ascii.java ByteChunk.java MessageBytes.java
Log:
Backport support for content-length greater than Integer.MAX_VALUE to 5.0.x branch
Revision ChangesPath
No revision
No revision
1.27.2.1 +13 -10
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java
Index: Request.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -u -r1.27 -r1.27.2.1
--- Request.java 24 Feb 2004 08:54:29 - 1.27
+++ Request.java 25 Aug 2004 20:44:15 - 1.27.2.1
@@ -134,10 +134,7 @@
/**
* HTTP specific fields. (remove them ?)
*/
-private int contentLength = -1;
-// how much body we still have to read.
-// Apparently nobody uses this field...
-private int available = -1;
+private long contentLength = -1;
private MessageBytes contentTypeMB = null;
private String charEncoding = null;
private Cookies cookies = new Cookies(headers);
@@ -297,18 +294,25 @@
public void setContentLength(int len) {
this.contentLength = len;
- available = len;
}
public int getContentLength() {
+long length = getContentLengthLong();
+
+if (length Integer.MAX_VALUE) {
+return (int) length;
+}
+return -1;
+}
+
+public long getContentLengthLong() {
if( contentLength -1 ) return contentLength;
- MessageBytes clB = headers.getValue(content-length);
-contentLength = (clB == null || clB.isNull()) ? -1 : clB.getInt();
- available = contentLength;
+MessageBytes clB = headers.getValue(content-length);
+contentLength = (clB == null || clB.isNull()) ? -1 : clB.getLong();
- return contentLength;
+return contentLength;
}
@@ -424,7 +428,6 @@
throws IOException {
int n = inputBuffer.doRead(chunk, this);
if (n 0) {
-available -= n;
bytesRead+=n;
}
return n;
No revision
No revision
1.100.2.1 +1 -1
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.100
retrieving revision 1.100.2.1
diff -u -r1.100 -r1.100.2.1
--- Http11Processor.java 1 Jun 2004 14:34:22 - 1.100
+++ Http11Processor.java 25 Aug 2004 20:44:15 - 1.100.2.1
@@ -1196,7 +1196,7 @@
InputFilter[] inputFilters = inputBuffer.getFilters();
// Parse content-length header
-int contentLength = request.getContentLength();
+long contentLength = request.getContentLengthLong();
if (contentLength = 0) {
inputBuffer.addActiveFilter
(inputFilters[Constants.IDENTITY_FILTER]);
No revision
No revision
1.11.2.1 +1 -1
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
Index: IdentityInputFilter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/IdentityInputFilter.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- IdentityInputFilter.java 24 Feb 2004 08:50:55 - 1.11
+++ IdentityInputFilter.java 25 Aug 2004 20:44:15 - 1.11.2.1
@@ -144,7 +144,7 @@
* Read the content length from the request.
*/
public void setRequest(Request request) {
-contentLength = request.getContentLength();
+contentLength = request.getContentLengthLong();
remaining = contentLength;
}
No revision
No revision
1.2.2.1 +65 -0
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/Ascii.java
Index: Ascii.java
cvs commit: jakarta-tomcat-connectors/ajp/ajplib/src ajp_link.c
mturk 2004/08/25 13:54:31
Added: ajp/ajplib/src ajp_link.c
Log:
Not to bad :). Only the ajp_link.c has been lost during
manual moving of ajplib files.
Revision ChangesPath
1.1 jakarta-tomcat-connectors/ajp/ajplib/src/ajp_link.c
Index: ajp_link.c
===
/* Copyright 1999-2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include ajp.h
apr_status_t ajp_ilink_send(apr_socket_t *sock, ajp_msg_t *msg)
{
char *buf;
apr_status_t status;
apr_size_t length;
if (sock == NULL) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
ajp_ilink_send(): NULL socket provided);
return AJP_EINVAL;
}
ajp_msg_end(msg);
length = msg-len;
buf= (char *)msg-buf;
do {
apr_size_t written = length;
status = apr_socket_send(sock, buf, written);
if (status != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL,
ajp_ilink_send(): send failed);
return status;
}
length -= written;
buf+= written;
} while (length);
return APR_SUCCESS;
}
static apr_status_t ilink_read(apr_socket_t *sock, char * buf,
apr_size_t len)
{
apr_size_t length;
apr_status_t status;
apr_size_t rdlen;
if (sock == NULL) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
ajp_ilink_readN(): NULL socket provided);
return AJP_EINVAL;
}
rdlen = 0;
length = len;
while (rdlen len) {
status = apr_socket_recv(sock, buf + rdlen, length);
if (status == APR_EOF)
return status; /* socket closed. */
else if (APR_STATUS_IS_EAGAIN(status))
continue;
else if (status != APR_SUCCESS)
return status; /* any error. */
rdlen += length;
length = len - rdlen;
}
return APR_SUCCESS;
}
apr_status_t ajp_ilink_receive(apr_socket_t *sock, ajp_msg_t *msg)
{
apr_status_t status;
apr_size_t hlen;
apr_size_t blen;
if (sock == NULL) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
ajp_ilink_receive(): NULL socket provided);
return AJP_EINVAL;
}
hlen = msg-header_len;
status = ilink_read(sock, msg-buf, hlen);
if (status != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL,
ajp_ilink_receive() can't receive header\n);
return AJP_ENO_HEADER;
}
status = ajp_msg_check_header(msg, blen);
if (status != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
ajp_ilink_receive() received bad header\n);
return AJP_EBAD_HEADER;
}
status = ilink_read(sock, msg-buf + hlen, blen);
if (status != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL,
ajp_ilink_receive() error while receiving message body %of
length %d\n,
hlen);
return AJP_EBAD_MESSAGE;
}
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
ajp_ilink_receive() received packet len=%d type=%d\n,
blen, (int)msg-buf[hlen]);
return APR_SUCCESS;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime BodyContentImpl.java HttpJspBase.java JspFactoryImpl.java JspRuntimeLibrary.java JspWriterImpl.java PageContextImpl.java ServletResponseWrapperInclude.java TagHandlerPool.java
markt 2004/08/25 13:54:36 Modified:jasper2/src/share/org/apache/jasper/runtime Tag: tomcat_4_branch BodyContentImpl.java HttpJspBase.java JspFactoryImpl.java JspRuntimeLibrary.java JspWriterImpl.java PageContextImpl.java ServletResponseWrapperInclude.java TagHandlerPool.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath No revision No revision 1.4.2.4 +13 -52 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/BodyContentImpl.java Index: BodyContentImpl.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/BodyContentImpl.java,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -u -r1.4.2.3 -r1.4.2.4 --- BodyContentImpl.java 22 Aug 2004 12:35:59 - 1.4.2.3 +++ BodyContentImpl.java 25 Aug 2004 20:54:35 - 1.4.2.4 @@ -1,56 +1,17 @@ /* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, if - *any, must include the following acknowlegement: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowlegement may appear in the software itself, - *if and wherever such third-party acknowlegements normally appear. - * - * 4. The names The Jakarta Project, Tomcat, and Apache Software - *Foundation must not be used to endorse or promote products derived - *from this software without prior written permission. For written - *permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache - *nor may Apache appear in their names without prior written - *permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper.runtime; 1.3.2.4 +13 -52 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/HttpJspBase.java Index: HttpJspBase.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/HttpJspBase.java,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -r1.3.2.3 -r1.3.2.4
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet JasperLoader.java JspCServletContext.java JspServlet.java JspServletWrapper.java ServletEngine.java TomcatServletEngine.java
markt 2004/08/25 13:55:29 Modified:jasper2/src/share/org/apache/jasper/logging Tag: tomcat_4_branch DefaultLogger.java JasperLogger.java LogAware.java Logger.java jasper2/src/share/org/apache/jasper/servlet Tag: tomcat_4_branch JasperLoader.java JspCServletContext.java JspServlet.java JspServletWrapper.java ServletEngine.java TomcatServletEngine.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath No revision No revision 1.1.1.1.2.3 +12 -53 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/logging/Attic/DefaultLogger.java Index: DefaultLogger.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/logging/Attic/DefaultLogger.java,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- DefaultLogger.java22 Aug 2004 12:35:59 - 1.1.1.1.2.2 +++ DefaultLogger.java25 Aug 2004 20:55:25 - 1.1.1.1.2.3 @@ -1,58 +1,17 @@ /* - * + * Copyright 1999,2004 The Apache Software Foundation. * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, if - *any, must include the following acknowlegement: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowlegement may appear in the software itself, - *if and wherever such third-party acknowlegements normally appear. - * - * 4. The names The Jakarta Project, Tomcat, and Apache Software - *Foundation must not be used to endorse or promote products derived - *from this software without prior written permission. For written - *permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache - *nor may Apache appear in their names without prior written - *permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper.logging; 1.2.2.3 +12 -53 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/logging/Attic/JasperLogger.java Index: JasperLogger.java
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser ParserUtils.java TreeNode.java
markt 2004/08/25 13:56:18 Modified:jasper2/src/share/org/apache/jasper/util Tag: tomcat_4_branch FastDateFormat.java Queue.java SimplePool.java StringManager.java SystemLogHandler.java jasper2/src/share/org/apache/jasper/xmlparser Tag: tomcat_4_branch ParserUtils.java TreeNode.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath No revision No revision 1.1.1.1.2.2 +13 -58 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/util/FastDateFormat.java Index: FastDateFormat.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/util/FastDateFormat.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- FastDateFormat.java 22 Aug 2004 12:36:00 - 1.1.1.1.2.1 +++ FastDateFormat.java 25 Aug 2004 20:56:15 - 1.1.1.1.2.2 @@ -1,62 +1,17 @@ /* - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, if - *any, must include the following acknowlegement: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowlegement may appear in the software itself, - *if and wherever such third-party acknowlegements normally appear. - * - * 4. The names The Jakarta Project, Tomcat, and Apache Software - *Foundation must not be used to endorse or promote products derived - *from this software without prior written permission. For written - *permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache - *nor may Apache appear in their names without prior written - *permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * Original code Copyright 2000 Quadcap Software: - * This software may be freely redistributed in source or binary form - * for any purpose. - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper.util; 1.1.1.1.2.2 +12 -53 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/util/Queue.java Index: Queue.java
Re: cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper Mapper.java
[EMAIL PROTECTED] wrote: jfarcand2004/08/25 12:25:46 Modified:util/java/org/apache/tomcat/util/http/mapper Mapper.java Log: Add missing case to support the following web.xml: servlet display-nameServletTest/display-name servlet-nameServletTest/servlet-name servlet-classtest.ServletTest/servlet-class /servlet servlet-mapping servlet-nameServletTest/servlet-name url-pattern*.screen/url-pattern /servlet-mapping welcome-file-list welcome-filewelcome.screen/welcome-file /welcome-file-list All Servlet TCKs passed. Please review (I recall some discussion on welcome file but can't find those emails). -1, this was on purpose. Extension mapping in welcome files cannot work. Since you have no way of testing if the resource exists or not, the request will *always* be redirected to the welcome file. It also means that, with the default settings and mappings, all requests to a folder will end up being redirected to index.jsp. I thought this was obvious enough. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
FW: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler (1 of 2)
The original commit message failed. From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler BeanRepository.java Collector.java Compiler.java DefaultErrorHandler.java Dumper.java ErrorDispatcher.java ErrorHandler.java Generator.java JavacErrorDetail.java JspDocumentParser.java JspReader.java JspRuntimeContext.java JspUtil.java Mark.java Node.java PageDataImpl.java PageInfo.java Parser.java ParserController.java ScriptingVariabler.java ServletWriter.java TagConstants.java TagLibraryInfoImpl.java TldLocationsCache.java Validator.java X-Virus-Checked: Checked markt 2004/08/25 13:53:42 Modified:jasper2/src/share/org/apache/jasper/compiler Tag: tomcat_4_branch BeanRepository.java Collector.java Compiler.java DefaultErrorHandler.java Dumper.java ErrorDispatcher.java ErrorHandler.java Generator.java JavacErrorDetail.java JspDocumentParser.java JspReader.java JspRuntimeContext.java JspUtil.java Mark.java Node.java PageDataImpl.java PageInfo.java Parser.java ParserController.java ScriptingVariabler.java ServletWriter.java TagConstants.java TagLibraryInfoImpl.java TldLocationsCache.java Validator.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath No revision No revision 1.1.1.1.2.3 +12 -57 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/BeanRepositor y.java Index: BeanRepository.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Bea nRepository.java,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- BeanRepository.java 22 Aug 2004 12:35:58 - 1.1.1.1.2.2 +++ BeanRepository.java 25 Aug 2004 20:53:29 - 1.1.1.1.2.3 @@ -1,62 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * + * Copyright 1999,2004 The Apache Software Foundation. * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, if - *any, must include the following acknowlegement: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowlegement may appear in the software itself, - *if and wherever such third-party acknowlegements normally appear. - * - * 4. The names The Jakarta Project, Tomcat, and Apache Software - *Foundation must not be used to endorse or promote products derived - *from this software without prior written permission. For written - *permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache - *nor may Apache appear in their names without prior written - *permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache
FW: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler (2 of 2)
The original commit message failed. 1.4.2.7 +13 -58 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeCon text.java Index: JspRuntimeContext.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Jsp RuntimeContext.java,v retrieving revision 1.4.2.6 retrieving revision 1.4.2.7 diff -u -r1.4.2.6 -r1.4.2.7 --- JspRuntimeContext.java5 Feb 2004 22:19:07 - 1.4.2.6 +++ JspRuntimeContext.java25 Aug 2004 20:53:31 - 1.4.2.7 @@ -1,63 +1,18 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * + * Copyright 1999,2004 The Apache Software Foundation. * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, if - *any, must include the following acknowlegement: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowlegement may appear in the software itself, - *if and wherever such third-party acknowlegements normally appear. - * - * 4. The names The Jakarta Project, Tomcat, and Apache Software - *Foundation must not be used to endorse or promote products derived - *from this software without prior written permission. For written - *permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache - *nor may Apache appear in their names without prior written - *permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper.compiler; 1.4.2.3 +12 -57 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java Index: JspUtil.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Jsp Util.java,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- JspUtil.java 22 Aug 2004 12:35:58 - 1.4.2.2 +++ JspUtil.java 25 Aug 2004 20:53:31 - 1.4.2.3 @@ -1,62 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * + * Copyright 1999,2004 The Apache Software Foundation. * - * The Apache Software License, Version 1.1 - * - * Copyright (c)
Re: cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper Mapper.java
Remy Maucherat wrote: [EMAIL PROTECTED] wrote: jfarcand2004/08/25 12:25:46 Modified:util/java/org/apache/tomcat/util/http/mapper Mapper.java Log: Add missing case to support the following web.xml: servlet display-nameServletTest/display-name servlet-nameServletTest/servlet-name servlet-classtest.ServletTest/servlet-class /servlet servlet-mapping servlet-nameServletTest/servlet-name url-pattern*.screen/url-pattern /servlet-mapping welcome-file-list welcome-filewelcome.screen/welcome-file /welcome-file-list All Servlet TCKs passed. Please review (I recall some discussion on welcome file but can't find those emails). -1, this was on purpose. Extension mapping in welcome files cannot work. Since you have no way of testing if the resource exists or not, the request will *always* be redirected to the welcome file. It also means that, with the default settings and mappings, all requests to a folder will end up being redirected to index.jsp. I thought this was obvious enough. Not enough for me ;-). So if it's impossible, the spec should be updated, righ? -- Jeanfrancois Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30833] - request.getServerPort() returns wrong port (WAS: response.sendRedirect() does not include port)
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=30833. 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=30833 request.getServerPort() returns wrong port (WAS: response.sendRedirect() does not include port) [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|VERIFIED --- Additional Comments From [EMAIL PROTECTED] 2004-08-25 21:15 --- Yup, you're right. http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.23 if anyone cares. Should I mark this as verified invalid or as closed? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper LICENSE
markt 2004/08/25 14:16:08 Modified:.Tag: tomcat_4_branch LICENSE Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath No revision No revision 1.1.1.1.2.2 +205 -51 jakarta-tomcat-jasper/LICENSE Index: LICENSE === RCS file: /home/cvs/jakarta-tomcat-jasper/LICENSE,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- LICENSE 24 Dec 2003 19:53:05 - 1.1.1.1.2.1 +++ LICENSE 25 Aug 2004 21:16:08 - 1.1.1.1.2.2 @@ -1,53 +1,207 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + License shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + Licensor shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + Legal Entity shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + control means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + You (or Your) shall mean an individual or Legal Entity + exercising permissions granted by this License. + + Source form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + Object form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + Work shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + Derivative Works shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + Contribution shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, submitted + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as Not a Contribution. + + Contributor shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free,
Re: cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper Mapper.java
Jeanfrancois Arcand wrote: Remy Maucherat wrote: [EMAIL PROTECTED] wrote: jfarcand2004/08/25 12:25:46 Modified:util/java/org/apache/tomcat/util/http/mapper Mapper.java Log: Add missing case to support the following web.xml: servlet display-nameServletTest/display-name servlet-nameServletTest/servlet-name servlet-classtest.ServletTest/servlet-class /servlet servlet-mapping servlet-nameServletTest/servlet-name url-pattern*.screen/url-pattern /servlet-mapping welcome-file-list welcome-filewelcome.screen/welcome-file /welcome-file-list All Servlet TCKs passed. Please review (I recall some discussion on welcome file but can't find those emails). -1, this was on purpose. Extension mapping in welcome files cannot work. Since you have no way of testing if the resource exists or not, the request will *always* be redirected to the welcome file. It also means that, with the default settings and mappings, all requests to a folder will end up being redirected to index.jsp. I thought this was obvious enough. Not enough for me ;-). So if it's impossible, the spec should be updated, righ? Sorry, I'm almost certain I had talked about it earlier: that's the reason for my comment. I really don't see any way to implement it (if you find one ...), so IMO the spec is broken for extension mapping with welcome files (since they'll always match *.jsp with index.jsp - ok, I know, it's a static file, so there's a way to check in the special case). For exact or wildcard mappings, there's no problem. If you want more spec issues, let me know :) (right now, I have session handling with cross context, and also request dispatching and wrapping) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper Mapper.java
jfarcand2004/08/25 14:28:35
Modified:util/java/org/apache/tomcat/util/http/mapper Mapper.java
Log:
Rollback this fix since it doesn't handle corrently all cases.
Revision ChangesPath
1.42 +0 -7
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
Index: Mapper.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Mapper.java 25 Aug 2004 19:25:46 - 1.41
+++ Mapper.java 25 Aug 2004 21:28:35 - 1.42
@@ -751,13 +751,6 @@
}
}
}
-
-// Rule 4d -- Welcome resources that
-//are mapped to an extension.
-if (mappingData.wrapper == null) {
-internalMapExtensionWrapper(extensionWrappers,
-path, mappingData);
-}
}
path.setOffset(servletPath);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper Mapper.java
Remy Maucherat wrote: Jeanfrancois Arcand wrote: Remy Maucherat wrote: [EMAIL PROTECTED] wrote: jfarcand2004/08/25 12:25:46 Modified:util/java/org/apache/tomcat/util/http/mapper Mapper.java Log: Add missing case to support the following web.xml: servlet display-nameServletTest/display-name servlet-nameServletTest/servlet-name servlet-classtest.ServletTest/servlet-class /servlet servlet-mapping servlet-nameServletTest/servlet-name url-pattern*.screen/url-pattern /servlet-mapping welcome-file-list welcome-filewelcome.screen/welcome-file /welcome-file-list All Servlet TCKs passed. Please review (I recall some discussion on welcome file but can't find those emails). -1, this was on purpose. Extension mapping in welcome files cannot work. Since you have no way of testing if the resource exists or not, the request will *always* be redirected to the welcome file. It also means that, with the default settings and mappings, all requests to a folder will end up being redirected to index.jsp. I thought this was obvious enough. Not enough for me ;-). So if it's impossible, the spec should be updated, righ? Sorry, I'm almost certain I had talked about it earlier: that's the reason for my comment. I really don't see any way to implement it (if you find one ...), so IMO the spec is broken for extension mapping with welcome files (since they'll always match *.jsp with index.jsp - ok, I know, it's a static file, so there's a way to check in the special case). OK I will investigate more. For exact or wildcard mappings, there's no problem. If you want more spec issues, let me know :) (right now, I have session handling with cross context, and also request dispatching and wrapping) Actually, yes, raise them :-) This is the perfect time for raising issues to the spec leads if we want a fix for the next spec revision. This mapping issue was sent by the spec leads, so probably somebody else complained about that. Thanks -- Jeanfrancois Rémy - 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-jasper LICENSE
markt 2004/08/25 14:46:22 Modified:.Tag: tomcat_4_branch LICENSE Log: Align license on TC4 branch with one on HEAD Revision ChangesPath No revision No revision 1.1.1.1.2.3 +0 -13 jakarta-tomcat-jasper/LICENSE Index: LICENSE === RCS file: /home/cvs/jakarta-tomcat-jasper/LICENSE,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- LICENSE 25 Aug 2004 21:16:08 - 1.1.1.1.2.2 +++ LICENSE 25 Aug 2004 21:46:21 - 1.1.1.1.2.3 @@ -200,16 +200,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -/* = * - * * - * This software consists of voluntary contributions made by many indivi- * - * duals on behalf of the Apache Software Foundation. For more information * - * on the Apache Software Foundation, please see http://www.apache.org/. * - * * - * = */ - -/* CVS information: $Revision$ $Date$ - * $Source$ - * $Author$ - */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper Mapper.java
Jeanfrancois Arcand wrote: Actually, yes, raise them :-) This is the perfect time for raising issues to the spec leads if we want a fix for the next spec revision. This mapping issue was sent by the spec leads, so probably somebody else complained about that. I have two issues: a) I don't understand the lifecycle of sessions with cross context (I had sent you a private email in relation to the portlet spec TCK, which somehow considers this as something which can be tested; I suppose it was tested with TC 4.1 ;) ) b) there are a lot of requirements when dispatching requests, which needs wrapping, and at the same time, the spec wants to disallow wrapping in some cases (obviously, we always wrap in Tomcat) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Ursula Witte/NORDLB ist außer Haus.
Ich werde ab 02.08.2004 nicht im Büro sein. Ich kehre zurück am 31.08.2004. Ich werde Ihre Nachricht nach meiner Rückkehr beantworten. Die in dieser E-Mail enthaltenen Informationen sind vertraulich. Diese E-Mail ist ausschliesslich fuer den Adressaten bestimmt und jeglicher Zugriff durch andere Personen ist nicht zulaessig. Falls Sie nicht einer der genannten Empfaenger sind, ist jede Veroeffentlichung, Vervielfaeltigung, Verteilung oder sonstige in diesem Zusammenhang stehende Handlung untersagt und unter Umstaenden ungesetzlich. Sollte diese Nachricht nicht fuer Sie bestimmt sein, so bitten wir Sie, den Absender unverzueglich zu informieren und die E-Mail zu loeschen. The information in this e-mail is confidential. It is intended solely for the addressee and access to the e-mail by anyone else is unauthorised. If you are not a named recipient, any disclosure, copying, distribution or any action taken or omitted to be taken in reliance on it, is prohibited and may be unlawful. If the notice is not intended for you, please notify the sender immediately and delete the e-mail. -]ncp[- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper Mapper.java
Remy Maucherat wrote: Jeanfrancois Arcand wrote: Actually, yes, raise them :-) This is the perfect time for raising issues to the spec leads if we want a fix for the next spec revision. This mapping issue was sent by the spec leads, so probably somebody else complained about that. I have two issues: a) I don't understand the lifecycle of sessions with cross context (I had sent you a private email in relation to the portlet spec TCK, which somehow considers this as something which can be tested; I suppose it was tested with TC 4.1 ;) ) Yes, that one is in progress :-) b) there are a lot of requirements when dispatching requests, which needs wrapping, and at the same time, the spec wants to disallow wrapping in some cases (obviously, we always wrap in Tomcat) OK I will see what I can do with that one (I need to read the spec again and pinpoint exactly where it should be re-phrased Thanks! -- Jeanfrancois Rémy - 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-5 build.xml
remm2004/08/25 17:21:10
Modified:.build.xml
Log:
- Fix packaging issues.
Revision ChangesPath
1.200 +3 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- build.xml 25 Aug 2004 17:46:32 - 1.199
+++ build.xml 26 Aug 2004 00:21:10 - 1.200
@@ -1240,6 +1240,8 @@
exclude name=catalina.xml/
exclude name=commons-launcher.jar/
exclude name=*-using-launcher.*/
+ exclude name=LauncherBootstrap.class/
+ exclude name=launcher.properties/
/fileset
/copy
copy todir=${tomcat.dist}/common/classes
@@ -1439,6 +1441,7 @@
zip zipfile=${tomcat.release}/v${version}/bin/${final.name}.zip
zipfileset dir=${tomcat.dist} prefix=${final.name}
include name=bin/**/
+ include name=common/**/
include name=conf/**/
include name=logs/**/
include name=server/**/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Protected Mail System
Encrypted message is available. +++ Attachment: No Virus found +++ Bitdefender AntiVirus - www.bitdefender.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
