svn commit: r677507 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default build.xml dist.xml res/tomcat.nsi
Author: mturk
Date: Wed Jul 16 23:14:31 2008
New Revision: 677507
URL: http://svn.apache.org/viewvc?rev=677507view=rev
Log:
Backport r676510 from trunk.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/res/tomcat.nsi
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=677507r1=677506r2=677507view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jul 16 23:14:31 2008
@@ -69,12 +69,6 @@
+1: markt, remm, fhanik
-1:
-* Backport r676510 from trunk. The patch embeds tcnative-1.dll inside
- exe installer and uses the released binary from ASF site instead
- downloading tomcat-native at install time from tomcat.heanet.ie.
- +1: mturk, remm, fhanik
- -1:
-
* Fix comet behavior
Invoke READ when there is a body and make sure END is called if
CometEvent.close is called during an invokation
http://svn.apache.org/viewvc?rev=677473view=rev
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=677507r1=677506r2=677507view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Wed Jul 16 23:14:31 2008
@@ -62,9 +62,11 @@
jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
# - Tomcat native library -
-tomcat-native.home=${base.path}/tomcat-native-1.1.12
+tomcat-native.version=1.1.14
+tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.12-src.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-${tomcat-native.version}-src.tar.gz
+tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
# - Commons DBCP, version 1.1 or later -
commons-dbcp.version=1.2.2
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=677507r1=677506r2=677507view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Jul 16 23:14:31 2008
@@ -667,6 +667,18 @@
param name=destdir value=${tomcat-native.home}/
/antcall
+antcall target=downloadfile
+ param name=sourcefile
value=${tomcat-native.dll}/win32/tcnative-1.dll/
+ param name=destfile value=${tomcat-native.home}/tcnative-1.dll.x86/
+ param name=destdir value=${tomcat-native.home}/
+/antcall
+
+antcall target=downloadfile
+ param name=sourcefile
value=${tomcat-native.dll}/win64/x64/tcnative-1.dll/
+ param name=destfile value=${tomcat-native.home}/tcnative-1.dll.x64/
+ param name=destdir value=${tomcat-native.home}/
+/antcall
+
antcall target=downloadgz
param name=sourcefile value=${commons-daemon.loc}/
param name=destfile value=${commons-daemon.jar}/
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=677507r1=677506r2=677507view=diff
==
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Jul 16 23:14:31 2008
@@ -449,6 +449,8 @@
tofile=${tomcat.dist}/bin/tomcat6.exe /
copy file=res/procrun/tomcat6w.exe
tofile=${tomcat.dist}/bin/tomcat6w.exe /
+copy file=${tomcat-native.home}/tcnative-1.dll.x86
+tofile=${tomcat.dist}/bin/tcnative-1.dll /
filter token=VERSION value=${version}/
filter token=VERSION_NUMBER value=${version.number}/
@@ -470,6 +472,7 @@
forceOverwrite=yes fileext=.md5 /
echo file=${tomcat.release}/v${version}/bin/${final.name}.exe.md5
message=${md5sum.binary-prefix}${final.name}.exe${line.separator}
append=true /
+delete file=${tomcat.dist}/bin/tcnative-1.dll/
/target
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=677507r1=677506r2=677507view=diff
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Wed Jul 16 23:14:31 2008
@@ -95,7 +95,7 @@
LangString DESC_SecTomcat ${LANG_ENGLISH} Install the Tomcat Servlet
container.
LangString DESC_SecTomcatCore ${LANG_ENGLISH} Install the
DO NOT REPLY [Bug 45406] Decoding URI encoded in UTF-16 does not work correctly.
https://issues.apache.org/bugzilla/show_bug.cgi?id=45406 --- Comment #9 from Ran Rubinstein [EMAIL PROTECTED] 2008-07-17 01:17:48 PST --- (In reply to comment #8) Of course, whether or not that is a good idea is another question. So yes, if a server needs to support these kinds of URIs, it needs to workaround the limitations of the servlet engine (another way would be to use getRequestURI(), and parse that directly). Using getRequestURI() and parsing myself is the simple part. Since the parameter map in the HttpServletRequest is immutable, I need to use my own subclass for the request and use it throughout my application (and it can't be forwarded to external web applications). That solution is not very elegant. I'm not in a place to judge whether encoding URL's with non-ascii-superset encodings is legal or not, but: If non-ascii-superset-encoded URIs are legal, I think tomcat should support them. Tomcat has the APIs to setCharacterEncoding() and useBodyEncodingForURI's, which don't limit the encoding to an ascii superset. It's looks like a simple matter of changing how URI's are decoded, to be compliant with the %-encoding rules. If these URI's are illegal, perhaps tomcat should throw some kind of exception when when setCharacterEncoding is called with an 'illegal' encoding, and useBodyEncodingForURI is true. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Feedback for Bayeux contribution
On Wed, Jul 16, 2008 at 9:47 PM, Filip Hanik - Dev Lists [EMAIL PROTECTED] wrote: I'd like some feedback on the contribution, before I call for a vote for inclusion thanks Filip [EMAIL PROTECTED] wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=45413 I'm happy to welcome this contribution. It's refreshingly cool. Yoav - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Feedback for Bayeux contribution
On Thu, 2008-07-17 at 07:39 -0400, Yoav Shapira wrote: On Wed, Jul 16, 2008 at 9:47 PM, Filip Hanik - Dev Lists [EMAIL PROTECTED] wrote: I'd like some feedback on the contribution, before I call for a vote for inclusion thanks Filip [EMAIL PROTECTED] wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=45413 I'm happy to welcome this contribution. It's refreshingly cool. OTOH, I haven't heard anything about bayeux lately. Is it actually picking up enough adoption to be included with Tomcat ? Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Feedback for Bayeux contribution
Costin Manolache wrote: BTW - any docs associated with this ? For example, what's the relation with JMS and other products/APIs ? Briefly looking at the code - it would be nice to include javadocs at least on the public APIs, org.apache.cometd.bayeux is javadoc:ed, that's the public API, nothing but interfaces. and some indication of which are the public / frozen APIs and which are just impl methods that shouln't be used by apps. the separatation is very clear org.apache.cometd.bayeux is public, org.apache.tomcat.bayeux is private A small automated test would be extra nice ( if you really want feedback ) :-) yes, for sure, there is always stuff to do :) Costin On Wed, Jul 16, 2008 at 10:45 PM, Costin Manolache [EMAIL PROTECTED] wrote: I think this is a nice contribution ( haven't reviewed the code in detail yet ), but seems like a separate enough feature to be distributed as a separate/optional package. I can't think of any good reason to include it in the base tomcat distro ( except that a lot of other stuff is there and shouldn't ) - it is not required in order to implement http or servlet specs, seems useful for a relatively narrow user base, etc. Costin On Wed, Jul 16, 2008 at 6:47 PM, Filip Hanik - Dev Lists [EMAIL PROTECTED] wrote: I'd like some feedback on the contribution, before I call for a vote for inclusion thanks Filip [EMAIL PROTECTED] wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=45413 Summary: Contribution of Bayeux implementation for Tomcat Product: Tomcat 6 Version: 6.0.16 Platform: All URL: http://svn.hanik.com/svn/repos/tomcat-bayeux OS/Version: All Status: NEW Severity: enhancement Priority: P2 Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Created an attachment (id=22267) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=22267) Contribution of code The following bugzilla issue is a contribution of a codebase from Filip Hanik(asf:fhanik) and Guy Molinari(individual) Both have ICLAs on file with the ASF. Description: The contribution is two fold 1. The core implementation Core implementation of the Bayeux protocol using Comet and HTTP External dependencies: json.jar from json.org - Apache License 2.0 packages: - org.apache.cometd.bayeux APIs for web application developers derived from a proposed but incomplete API by Dojo Foundation - org.apache.tomcat.bayeux implementation of API classes 2. The sample applications External dependencies: Dojo Toolkit, license: http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE#L13 COPYRIGHT and LICENSE files included. The contribution is a full environment, to be able to download and build distributions. We don't expect everything to be merged in, instead we expect that the source code be integrated into tomcat/trunk and we can then modify the existing build scripts to fit into the Tomcat build/distribution scheme - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] No virus found in this incoming message. Checked by AVG. Version: 7.5.526 / Virus Database: 270.5.0/1556 - Release Date: 7/16/2008 4:56 PM - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Feedback for Bayeux contribution
Remy Maucherat wrote: On Thu, 2008-07-17 at 07:39 -0400, Yoav Shapira wrote: On Wed, Jul 16, 2008 at 9:47 PM, Filip Hanik - Dev Lists [EMAIL PROTECTED] wrote: I'd like some feedback on the contribution, before I call for a vote for inclusion thanks Filip [EMAIL PROTECTED] wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=45413 I'm happy to welcome this contribution. It's refreshingly cool. OTOH, I haven't heard anything about bayeux lately. Is it actually picking up enough adoption to be included with Tomcat ? I'd follow Costin's advice, have it be a separate component, if it does become popular, it can be considered for inclusion then Filip 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: Feedback for Bayeux contribution
On Thu, Jul 17, 2008 at 7:00 AM, Filip Hanik - Dev Lists [EMAIL PROTECTED] wrote: Remy Maucherat wrote: On Thu, 2008-07-17 at 07:39 -0400, Yoav Shapira wrote: On Wed, Jul 16, 2008 at 9:47 PM, Filip Hanik - Dev Lists [EMAIL PROTECTED] wrote: I'd like some feedback on the contribution, before I call for a vote for inclusion thanks Filip [EMAIL PROTECTED] wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=45413 I'm happy to welcome this contribution. It's refreshingly cool. OTOH, I haven't heard anything about bayeux lately. Is it actually picking up enough adoption to be included with Tomcat ? I'd follow Costin's advice, have it be a separate component, if it does become popular, it can be considered for inclusion then Great, thank you. I assume the first step is to check in the code in tomcat ( based on the bug layout - looks like separate dir, which is probably better in this case ). After that it'll follow the normal process for a release - and I hope you'll add more to README at least before release. Few more questions: I would guess that only part of it is specific to tomcat ( connector interface ) - do you plan to have it support other servlet engines as well ( wouldn't be a bad idea if you want adoption for your API - or bayeux ) ? What kind of config is needed - and if any, is it in server.xml or can it be done via web.xml in apps that use it ? What kind of monitoring do you have/plan - didn't see any JMX. I guess it'll affect the number of open connections. Costin Filip 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]
Feedback on new startup class
Following Filip's example :-) Please check http://people.apache.org/~costin/startup/ for a new class I would like to add to tomcat(head), and an associated example/unit test. It allows a jetty-like mode of programmatic loading/config of tomcat, without any config file. I know the 'official' way to run tomcat is using server.xml, and embedding via JMX - but this mode is quite convenient in many cases. Any problems with naming the class 'Tomcat' ? Easy to rename, but since this will be directly used I like to keep it with this name. If no strong objection - I'll submit it, and then you can make any adjustments to the API (method names, etc) if you have other preferences. Costin
DO NOT REPLY [Bug 45419] New: Return Accept-Ranges from DefaultServlet
https://issues.apache.org/bugzilla/show_bug.cgi?id=45419 Summary: Return Accept-Ranges from DefaultServlet Product: Tomcat 6 Version: unspecified Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Currently the DefaultServlet accepts the Ranges request header, but doesn't indicate this in its response by returning Accept-Ranges: bytes. Although this is not required in HTTP/1.1, setting the header is required in order for the Adobe Acrobat plugin to correctly handle Linearized PDF's (which can speed download by allowing random access to a PDF file). Although it's not strictly necessary according to the specification I can't think of any reason why this header is not safe to set in a response from DefaultServlet, which is always dealing with static files, and not doing so has a negative impact on serving large PDF files - so I'm filing it as a bug rather than an RFE. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Feedback on new startup class
On Thu, Jul 17, 2008 at 10:37 AM, Costin Manolache [EMAIL PROTECTED] wrote: Please check http://people.apache.org/~costin/startup/ for a new class I would like to add to tomcat(head), and an associated example/unit test. It allows a jetty-like mode of programmatic loading/config of tomcat, without any config file. I like it, +1. I keep hearing from people that they want something like this. Yoav - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Feedback for Bayeux contribution
Costin Manolache wrote: On Thu, Jul 17, 2008 at 7:00 AM, Filip Hanik - Dev Lists [EMAIL PROTECTED] wrote: Remy Maucherat wrote: On Thu, 2008-07-17 at 07:39 -0400, Yoav Shapira wrote: On Wed, Jul 16, 2008 at 9:47 PM, Filip Hanik - Dev Lists [EMAIL PROTECTED] wrote: I'd like some feedback on the contribution, before I call for a vote for inclusion thanks Filip [EMAIL PROTECTED] wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=45413 I'm happy to welcome this contribution. It's refreshingly cool. OTOH, I haven't heard anything about bayeux lately. Is it actually picking up enough adoption to be included with Tomcat ? I'd follow Costin's advice, have it be a separate component, if it does become popular, it can be considered for inclusion then Great, thank you. I assume the first step is to check in the code in tomcat ( based on the bug layout - looks like separate dir, which is probably better in this case ). After that it'll follow the normal process for a release - and I hope you'll add more to README at least before release. of course, as well as documentation. but one has to start somewhere. Few more questions: I would guess that only part of it is specific to tomcat ( connector interface ) - do you plan to have it support other servlet engines as well ( wouldn't be a bad idea if you want adoption for your API - or bayeux ) ? this can of course be implemented as a regular servlet, but would be less resource efficient. doing it through comet, allows it to use the async io features. But I think it would be good to implement the service() method of BayeuxServlet, and then it would be portable What kind of config is needed - and if any, is it in server.xml or can it be done via web.xml in apps that use it ? web.xml only What kind of monitoring do you have/plan - didn't see any JMX. I guess it'll affect the number of open connections. number of open connections should be monitored at the tomcat level, but JMX should be on the road map in terms of what clients are connected, what channels they are subscribed to etc Filip Costin Filip 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] No virus found in this incoming message. Checked by AVG. Version: 7.5.526 / Virus Database: 270.5.0/1556 - Release Date: 7/16/2008 4:56 PM - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45392] No OCSP support for client SSL verification
https://issues.apache.org/bugzilla/show_bug.cgi?id=45392 Aristotelis [EMAIL PROTECTED] changed: What|Removed |Added Attachment #22253|0 |1 is obsolete|| --- Comment #8 from Aristotelis [EMAIL PROTECTED] 2008-07-17 07:52:26 PST --- Created an attachment (id=22272) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=22272) OCSP support for apache tomcat Added the APR support. (for the socket communication). Hopefully things are setting into place :) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45419] Return Accept-Ranges from DefaultServlet
https://issues.apache.org/bugzilla/show_bug.cgi?id=45419 --- Comment #1 from Will Rowe [EMAIL PROTECTED] 2008-07-17 08:02:53 PST --- We might have lost sight of the issue here; this issue is not whether or not it's possible to encode utf-16-le, it's that the URI was not encoded in that character set. As I pointed out above, in the similar -be encoding, we need 16 bits to transmit each character, This particular browser sent 8 bit octets. That is not utf-16. Two escaped characters does not constitute a utf-16 request, it's a utf-16 fragment within an ASCII/ISO-8859/UTF-8/whatever bytestream. I would recommend no change whatsoever in Tomcat's code on this issue. As far as working around it, it might be nice if one could deploy a Valve that was triggered based on User-Agent, that would probably be the most elegant hack for this browser flaw. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45419] Return Accept-Ranges from DefaultServlet
https://issues.apache.org/bugzilla/show_bug.cgi?id=45419 --- Comment #2 from Will Rowe [EMAIL PROTECTED] 2008-07-17 08:09:48 PST --- Ignore comment #1; bugzilla navigation bites again; this relates to another issue. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45406] Decoding URI encoded in UTF-16 does not work correctly.
https://issues.apache.org/bugzilla/show_bug.cgi?id=45406 --- Comment #10 from Will Rowe [EMAIL PROTECTED] 2008-07-17 08:11:57 PST --- We might have lost sight of the issue here; this issue is not whether or not it's possible to encode utf-16-le, it's that the URI was not encoded in that character set. As I pointed out above, in the similar -be encoding, we need 16 bits to transmit each character, This particular browser sent 8 bit octets. That is not utf-16. Two escaped characters does not constitute a utf-16 request, it's a utf-16 fragment within an ASCII/ISO-8859/UTF-8/whatever bytestream. I would recommend no change whatsoever in Tomcat's URI parsing code on this issue, although you do raise an interesting observation w.r.t. useBodyEncodingForURI. As far as working around it, it might be nice if one could deploy a Valve that was triggered based on User-Agent, that would probably be the most elegant hack for you to work around this browser error. Certainly not for core tomcat. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Feedback on new startup class
Costin Manolache wrote: Following Filip's example :-) Please check http://people.apache.org/~costin/startup/ for a new class I would like to add to tomcat(head), and an associated example/unit test. It allows a jetty-like mode of programmatic loading/config of tomcat, without any config file. I know the 'official' way to run tomcat is using server.xml, and embedding via JMX - but this mode is quite convenient in many cases. Any problems with naming the class 'Tomcat' ? Easy to rename, but since this will be directly used I like to keep it with this name. If no strong objection - I'll submit it, and then you can make any adjustments to the API (method names, etc) if you have other preferences. +1, I like it and I like the name too, Filip Costin No virus found in this incoming message. Checked by AVG. Version: 7.5.526 / Virus Database: 270.5.0/1556 - Release Date: 7/16/2008 4:56 PM - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 42727] CoyoteReader readLine returns null for some post request bodies that are a multiple of MAX_LINE_LENGTH in size
https://issues.apache.org/bugzilla/show_bug.cgi?id=42727 --- Comment #4 from gui [EMAIL PROTECTED] 2008-07-17 08:29:57 PST --- Any chance of getting this fix in tomcat 5.5 ? After a few hours of debugging my application, i finally discovered this bug was the root cause. It's still there in Tomcat 5.5.26. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Feedback for Bayeux contribution
Thanks, my +1 on committing it to tomcat, seems like a good start and a good example on how to use the async stuff. Costin On Thu, Jul 17, 2008 at 7:50 AM, Filip Hanik - Dev Lists [EMAIL PROTECTED] wrote: Costin Manolache wrote: On Thu, Jul 17, 2008 at 7:00 AM, Filip Hanik - Dev Lists [EMAIL PROTECTED] wrote: Remy Maucherat wrote: On Thu, 2008-07-17 at 07:39 -0400, Yoav Shapira wrote: On Wed, Jul 16, 2008 at 9:47 PM, Filip Hanik - Dev Lists [EMAIL PROTECTED] wrote: I'd like some feedback on the contribution, before I call for a vote for inclusion thanks Filip [EMAIL PROTECTED] wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=45413 I'm happy to welcome this contribution. It's refreshingly cool. OTOH, I haven't heard anything about bayeux lately. Is it actually picking up enough adoption to be included with Tomcat ? I'd follow Costin's advice, have it be a separate component, if it does become popular, it can be considered for inclusion then Great, thank you. I assume the first step is to check in the code in tomcat ( based on the bug layout - looks like separate dir, which is probably better in this case ). After that it'll follow the normal process for a release - and I hope you'll add more to README at least before release. of course, as well as documentation. but one has to start somewhere. Few more questions: I would guess that only part of it is specific to tomcat ( connector interface ) - do you plan to have it support other servlet engines as well ( wouldn't be a bad idea if you want adoption for your API - or bayeux ) ? this can of course be implemented as a regular servlet, but would be less resource efficient. doing it through comet, allows it to use the async io features. But I think it would be good to implement the service() method of BayeuxServlet, and then it would be portable What kind of config is needed - and if any, is it in server.xml or can it be done via web.xml in apps that use it ? web.xml only What kind of monitoring do you have/plan - didn't see any JMX. I guess it'll affect the number of open connections. number of open connections should be monitored at the tomcat level, but JMX should be on the road map in terms of what clients are connected, what channels they are subscribed to etc Filip Costin Filip 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] No virus found in this incoming message. Checked by AVG. Version: 7.5.526 / Virus Database: 270.5.0/1556 - Release Date: 7/16/2008 4:56 PM - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r677640 - in /tomcat/trunk: java/org/apache/catalina/startup/Tomcat.java test/org/apache/catalina/startup/ test/org/apache/catalina/startup/TomcatStartupAPITest.java
Author: costin
Date: Thu Jul 17 10:14:47 2008
New Revision: 677640
URL: http://svn.apache.org/viewvc?rev=677640view=rev
Log:
Add a non-config starter for tomcat. All you need is the classpath including
tomcat and the servlets - no config file.
There is a requirement for a temp directory - the spec requires that webapps
are provided with one I believe.
It is possible to remove this or do it lazily or have some default in /tmp, if
anyone wants to.
Also adding a context requires some base dir ( can be an empty one ) - so the
default servlets points to something.
This can also be eliminated by setting a different default servlet - needs to
be done if wanted.
It is also pretty fast - the unit tests show startup + first request in ~1 sec.
Added:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (with props)
tomcat/trunk/test/org/apache/catalina/startup/
tomcat/trunk/test/org/apache/catalina/startup/TomcatStartupAPITest.java
(with props)
Added: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=677640view=auto
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (added)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Jul 17
10:14:47 2008
@@ -0,0 +1,791 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.catalina.startup;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+
+import org.apache.catalina.Container;
+import org.apache.catalina.Context;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Realm;
+import org.apache.catalina.connector.Connector;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.core.StandardEngine;
+import org.apache.catalina.core.StandardHost;
+import org.apache.catalina.core.StandardServer;
+import org.apache.catalina.core.StandardService;
+import org.apache.catalina.core.StandardWrapper;
+import org.apache.catalina.deploy.LoginConfig;
+import org.apache.catalina.realm.GenericPrincipal;
+import org.apache.catalina.realm.RealmBase;
+import org.apache.catalina.session.StandardManager;
+
+// TODO: lazy init for the temp dir - only when a JSP is compiled or
+// get temp dir is called we need to create it. This will avoid the
+// need for the baseDir
+
+// TODO: allow contexts without a base dir - i.e.
+// only programmatic. This would disable the default servlet.
+
+/**
+ * Minimal tomcat starter for embedding/unit tests.
+ *
+ * Tomcat supports multiple styles of configuration and
+ * startup - the most common and stable is server.xml-based,
+ * implemented in org.apache.catalina.startup.Bootstrap.
+ *
+ * This class is for use in apps that embed tomcat.
+ * Requirements:
+ *
+ * - all tomcat classes and possibly servlets are in the classpath.
+ * ( for example all is in one big jar, or in eclipse CP, or in any other
+ * combination )
+ *
+ * - we need one temporary directory for work files
+ *
+ * - no config file is required. This class provides methods to
+ * use if you have a webapp with a web.xml file, but it is
+ * optional - you can use your own servlets.
+ *
+ * This class provides a main() and few simple CLI arguments,
+ * see setters for doc. It can be used for simple tests and
+ * demo.
+ *
+ * @see TomcatStartupAPITest for examples on how to use this
+ * @author Costin Manolache
+ */
+public class Tomcat {
+// Single engine, service, server, connector - few cases need more,
+// they can use server.xml
+protected StandardServer server;
+protected StandardService service;
+protected StandardEngine engine;
+protected Connector connector; // for more - customize the classes
+
+// To make it a bit easier to config
DO NOT REPLY [Bug 45421] New: security audit refers to version 5
https://issues.apache.org/bugzilla/show_bug.cgi?id=45421 Summary: security audit refers to version 5 Product: Tomcat 6 Version: unspecified Platform: PC URL: http://tomcat.apache.org/tomcat-6.0-doc/security- manager-howto.html OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Documentation AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] The documentation for version 6 says: A security audit have been conducted using the Tomcat 5 codebase. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45421] security audit refers to version 5
https://issues.apache.org/bugzilla/show_bug.cgi?id=45421 Mark Thomas [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas [EMAIL PROTECTED] 2008-07-17 13:06:20 PST --- The audit was on TC5 not TC6. The docs are correct. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45422] New: typo corrections, ssl-howto
https://issues.apache.org/bugzilla/show_bug.cgi?id=45422 Summary: typo corrections, ssl-howto Product: Tomcat 6 Version: 6.0.16 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Documentation AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Created an attachment (id=22273) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=22273) patchfile (generated using SVN Tortoise) Typo corrections, patch attached. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r677709 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 17 13:29:25 2008
New Revision: 677709
URL: http://svn.apache.org/viewvc?rev=677709view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42678
Only ignore docBase it it really is a subdir of appBase. Patch provided by
juergen.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=677709r1=677708r2=677709view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 17 13:29:25 2008
@@ -48,13 +48,6 @@
+1: fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42678
- Only ignore docBase it it really is a subdir of appBase
- Patch provided by juergen
- http://svn.apache.org/viewvc?rev=675650view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42565
Make EL ternary expression without space before colon work
Patch provided by Lucas Galfaso
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=677709r1=677708r2=677709view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Thu
Jul 17 13:29:25 2008
@@ -607,7 +607,8 @@
docBase = new File(appBase(), context.getDocBase());
}
// If external docBase, register .xml as redeploy first
-if
(!docBase.getCanonicalPath().startsWith(appBase().getAbsolutePath())) {
+if (!docBase.getCanonicalPath().startsWith(
+appBase().getAbsolutePath() + File.separator)) {
isExternal = true;
deployedApp.redeployResources.put
(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=677709r1=677708r2=677709view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jul 17 13:29:25 2008
@@ -35,6 +35,10 @@
section name=Tomcat 6.0.18 (remm)
subsection name=Cataina
changelog
+ fix
+bug42678/bug: Only ignore docBase it it really is a subdir of
+appBase. Patch provided by juergen. (markt)
+ /fix
update
bug45285/bug: Look for annotations in class hierarchy. (markt)
/update
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r677714 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 17 13:37:29 2008
New Revision: 677714
URL: http://svn.apache.org/viewvc?rev=677714view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42722
Possible NPE in CGI Servlet
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=677714r1=677713r2=677714view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 17 13:37:29 2008
@@ -56,12 +56,6 @@
+1: markt, remm, fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42722
- Possible NPE in CGI Servlet
- http://people.apache.org/~markt/patches/2008-07-15-bug42722.patch
- +1: markt, remm, fhanik
- -1:
-
* Fix comet behavior
Invoke READ when there is a body and make sure END is called if
CometEvent.close is called during an invokation
http://svn.apache.org/viewvc?rev=677473view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=677714r1=677713r2=677714view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu
Jul 17 13:37:29 2008
@@ -1727,15 +1727,20 @@
}
}
} //replacement for Process.waitFor()
-
-// Close the output stream used
-cgiOutput.close();
}
catch (IOException e){
log (Caught exception + e);
throw e;
}
finally{
+// Close the output stream if used
+if (cgiOutput != null) {
+try {
+cgiOutput.close();
+} catch (IOException ioe) {
+log (Exception closing output stream + ioe);
+}
+}
if (debug 4) {
log (Running finally block);
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=677714r1=677713r2=677714view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jul 17 13:37:29 2008
@@ -39,6 +39,9 @@
bug42678/bug: Only ignore docBase it it really is a subdir of
appBase. Patch provided by juergen. (markt)
/fix
+ fix
+bug42722/bug: Possible NPE in CGI Servlet. (markt)
+ /fix
update
bug45285/bug: Look for annotations in class hierarchy. (markt)
/update
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45422] typo corrections, ssl-howto
https://issues.apache.org/bugzilla/show_bug.cgi?id=45422 --- Comment #1 from David Barnes [EMAIL PROTECTED] 2008-07-17 13:39:46 PST --- Created an attachment (id=22274) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=22274) second patch file -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45423] New: typo corrections, Tomcat home page
https://issues.apache.org/bugzilla/show_bug.cgi?id=45423 Summary: typo corrections, Tomcat home page Product: Tomcat 6 Version: 6.0.16 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Documentation AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Created an attachment (id=22275) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=22275) patchfile (generated using SVN Tortoise) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r677728 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/el/parser/ELParser.jjt webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 17 14:09:35 2008
New Revision: 677728
URL: http://svn.apache.org/viewvc?rev=677728view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42565
Make EL ternary expression without space before colon work. Patch provided by
Lucas Galfaso.
This is just the jjt patch. The changes to generated code will follow.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=677728r1=677727r2=677728view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 17 14:09:35 2008
@@ -48,14 +48,6 @@
+1: fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42565
- Make EL ternary expression without space before colon work
- Patch provided by Lucas Galfaso
- This is just the jjt patch. There will also be changes to generated code
- http://svn.apache.org/viewvc?rev=675726view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix comet behavior
Invoke READ when there is a body and make sure END is called if
CometEvent.close is called during an invokation
http://svn.apache.org/viewvc?rev=677473view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt?rev=677728r1=677727r2=677728view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt Thu Jul 17
14:09:35 2008
@@ -31,7 +31,7 @@
NODE_DEFAULT_VOID=true;
JAVA_UNICODE_ESCAPE=false;
UNICODE_INPUT=true;
- BUILD_NODE_FILES=true;
+ BUILD_NODE_FILES=false;
}
/* == Parser Declaration == */
@@ -274,20 +274,19 @@
*/
void Function() #Function :
{
- Token t0 = null;
- Token t1 = null;
+ Token tx = null;
}
{
- (t0=NAMESPACE)? t1=IDENTIFIER
+ (tx=FUNCTION_CALL) (Expression() (COMMA Expression())*)? RPAREN
{
- if (t0 != null) {
- jjtThis.setPrefix(t0.image.substring(0,
t0.image.length() - 1));
- jjtThis.setLocalName(t1.image);
+ int split = tx.image.indexOf(:);
+ if (split!=-1) {
+ jjtThis.setPrefix(tx.image.substring(0, split));
+ jjtThis.setLocalName(tx.image.substring(split + 1,
tx.image.length() - 1));
} else {
- jjtThis.setLocalName(t1.image);
+ jjtThis.setLocalName(tx.image.substring(0,
tx.image.length() - 1));
}
}
- LPAREN (Expression() (COMMA Expression())*)? RPAREN
}
/*
@@ -428,7 +427,9 @@
| MOD0 : %
| MOD1 : mod
| IDENTIFIER : (LETTER|IMPL_OBJ_START) (LETTER|DIGIT)*
-|NAMESPACE : (IDENTIFIER (IDENTIFIER|MINUS|DOT)* COLON)
+| #NAMESPACE : ( NAMESPACE_NAME COLON)
+| #NAMESPACE_NAME: (IDENTIFIER (LETTER|DIGIT|MINUS|DOT)*)
+| FUNCTION_CALL: (NAMESPACE)? IDENTIFIER LPAREN
| FUNCTIONSUFFIX : (IDENTIFIER)
| #IMPL_OBJ_START: #
| #LETTER:
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=677728r1=677727r2=677728view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jul 17 14:09:35 2008
@@ -47,6 +47,14 @@
/update
/changelog
/subsection
+ subsection name=Jasper
+changelog
+ fix
+bug42565/bug: Make EL ternary expression without space before colon
+work. Patch provided by Lucas Galfaso. (markt)
+ /fix
+/changelog
+ /subsection
subsection name=Webapps
changelog
update
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r677729 - in /tomcat/tc6.0.x/trunk/java/org/apache/el/parser: ELParser.java ELParserConstants.java ELParserTokenManager.java
Author: markt
Date: Thu Jul 17 14:16:37 2008
New Revision: 677729
URL: http://svn.apache.org/viewvc?rev=677729view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42565
Make EL ternary expression without space before colon work.
Update the generated code.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParserConstants.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java?rev=677729r1=677728r2=677729view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java Thu Jul 17
14:16:37 2008
@@ -963,7 +963,7 @@
case NULL:
case LPAREN:
case IDENTIFIER:
-case NAMESPACE:
+case FUNCTION_CALL:
Value();
break;
default:
@@ -1033,7 +1033,7 @@
break;
case LPAREN:
case IDENTIFIER:
-case NAMESPACE:
+case FUNCTION_CALL:
NonLiteral();
break;
default:
@@ -1176,25 +1176,9 @@
/[EMAIL PROTECTED](jjtree) Function */
AstFunction jjtn000 = new AstFunction(JJTFUNCTION);
boolean jjtc000 = true;
-jjtree.openNodeScope(jjtn000);Token t0 = null;
-Token t1 = null;
+jjtree.openNodeScope(jjtn000);Token tx = null;
try {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case NAMESPACE:
-t0 = jj_consume_token(NAMESPACE);
-break;
- default:
-jj_la1[30] = jj_gen;
-;
- }
- t1 = jj_consume_token(IDENTIFIER);
-if (t0 != null) {
-jjtn000.setPrefix(t0.image.substring(0,
t0.image.length() - 1));
-jjtn000.setLocalName(t1.image);
-} else {
-jjtn000.setLocalName(t1.image);
-}
- jj_consume_token(LPAREN);
+ tx = jj_consume_token(FUNCTION_CALL);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
@@ -1208,7 +1192,7 @@
case EMPTY:
case MINUS:
case IDENTIFIER:
- case NAMESPACE:
+ case FUNCTION_CALL:
Expression();
label_10:
while (true) {
@@ -1217,7 +1201,7 @@
;
break;
default:
-jj_la1[31] = jj_gen;
+jj_la1[30] = jj_gen;
break label_10;
}
jj_consume_token(COMMA);
@@ -1225,10 +1209,19 @@
}
break;
default:
-jj_la1[32] = jj_gen;
+jj_la1[31] = jj_gen;
;
}
jj_consume_token(RPAREN);
+ jjtree.closeNodeScope(jjtn000, true);
+ jjtc000 = false;
+int split = tx.image.indexOf(:);
+if (split!=-1) {
+jjtn000.setPrefix(tx.image.substring(0, split));
+jjtn000.setLocalName(tx.image.substring(split + 1,
tx.image.length() - 1));
+} else {
+jjtn000.setLocalName(tx.image.substring(0,
tx.image.length() - 1));
+}
} catch (Throwable jjte000) {
if (jjtc000) {
jjtree.clearNodeScope(jjtn000);
@@ -1273,7 +1266,7 @@
Null();
break;
default:
- jj_la1[33] = jj_gen;
+ jj_la1[32] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1310,7 +1303,7 @@
}
break;
default:
- jj_la1[34] = jj_gen;
+ jj_la1[33] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1405,34 +1398,61 @@
}
final private boolean jj_3R_11() {
+if (jj_scan_token(FUNCTION_CALL)) return true;
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(54)) jj_scanpos = xsp;
-if (jj_scan_token(IDENTIFIER)) return true;
-if (jj_scan_token(LPAREN)) return true;
-xsp = jj_scanpos;
if (jj_3R_12()) jj_scanpos = xsp;
if (jj_scan_token(RPAREN)) return true;
return false;
}
- final private boolean jj_3R_20() {
-if (jj_3R_21()) return true;
+ final private boolean jj_3R_28() {
+if (jj_3R_34()) return true;
+Token xsp;
+while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_35()) { jj_scanpos = xsp; break; }
+}
return false;
}
- final private boolean jj_3R_44() {
+ final private boolean jj_3R_37() {
+if (jj_scan_token(MINUS)) return true;
+return false;
+ }
+
+ final private boolean jj_3R_29() {
+Token xsp;
+xsp = jj_scanpos;
+if (jj_3R_36()) {
+jj_scanpos = xsp;
+if (jj_3R_37()) return true;
+}
+return false;
+ }
+
+ final private boolean jj_3R_36() {
+if (jj_scan_token(PLUS))
svn commit: r677736 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Jul 17 14:29:46 2008 New Revision: 677736 URL: http://svn.apache.org/viewvc?rev=677736view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=677736r1=677735r2=677736view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 17 14:29:46 2008 @@ -45,7 +45,7 @@ * Add in startup options, so that cluster can be started in TCP mode only, when using static membership Also document the multicast recovery options http://svn.apache.org/viewvc?rev=674125view=rev - +1: fhanik + +1: fhanik, markt -1: * Fix comet behavior - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r677759 - /tomcat/trunk/java/org/apache/catalina/connector/CoyoteReader.java
Author: markt
Date: Thu Jul 17 15:09:18 2008
New Revision: 677759
URL: http://svn.apache.org/viewvc?rev=677759view=rev
Log:
Fix bug 42727. Handle request lines that are exact multiples of 4096 in length.
Patch provided by Will Pugh.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteReader.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteReader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteReader.java?rev=677759r1=677758r2=677759view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteReader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteReader.java Thu Jul
17 15:09:18 2008
@@ -153,7 +153,7 @@
while ((pos MAX_LINE_LENGTH) (end 0)) {
int nRead = read(lineBuffer, pos, MAX_LINE_LENGTH - pos);
if (nRead 0) {
-if (pos == 0) {
+if (pos == 0 aggregator == null) {
return null;
}
end = pos;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r677760 - in /tomcat: current/tc5.5.x/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Jul 17 15:12:43 2008 New Revision: 677760 URL: http://svn.apache.org/viewvc?rev=677760view=rev Log: (empty) Modified: tomcat/current/tc5.5.x/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=677760r1=677759r2=677760view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Thu Jul 17 15:12:43 2008 @@ -233,3 +233,10 @@ http://people.apache.org/~markt/patches/2008-06-21-SSL-docs.patch +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42727 + Correctly handle request lines that are exact multiples of 4096 in length. + Patch provided by Will Pugh. + http://svn.apache.org/viewvc?rev=677759view=rev + +1: markt + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=677760r1=677759r2=677760view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 17 15:12:43 2008 @@ -53,3 +53,10 @@ http://svn.apache.org/viewvc?rev=677473view=rev +1: fhanik -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42727 + Correctly handle request lines that are exact multiples of 4096 in length. + Patch provided by Will Pugh. + http://svn.apache.org/viewvc?rev=677759view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 42727] CoyoteReader readLine returns null for some post request bodies that are a multiple of MAX_LINE_LENGTH in size
https://issues.apache.org/bugzilla/show_bug.cgi?id=42727 --- Comment #5 from Mark Thomas [EMAIL PROTECTED] 2008-07-17 15:14:32 PST --- Thanks for the patch. It has been applied to trunk and proposed for 6.0.x and 5.5.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r677773 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Author: markt Date: Thu Jul 17 16:12:03 2008 New Revision: 63 URL: http://svn.apache.org/viewvc?rev=63view=rev Log: Remove pre-loading of inner class that was removed as part of r605000. Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=63r1=62r2=63view=diff == --- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java (original) +++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Thu Jul 17 16:12:03 2008 @@ -64,9 +64,6 @@ core.ContainerBase$PrivilegedAddChild); loader.loadClass (basePackage + - core.StandardWrapper$1); -loader.loadClass - (basePackage + core.ApplicationHttpRequest$AttributeNamesEnumerator); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Release build 6.0.17
Mark Thomas wrote: There is something screwy with my TC6 build environment. On a different machine I can't reproduce this. I suspect my related patch is bad too. I'll do some more testing tonight with my main environment. In the meantime, I withdraw my Beta vote. I got to the bottom of this with a clean build and some digging through the archives. My patch was required, but only for trunk. The patch that caused this issue was not ported to 6.0.x. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
