DO NOT REPLY [Bug 47786] 100<4 in arithmetic evaluation - when 2 variables are used
https://issues.apache.org/bugzilla/show_bug.cgi?id=47786 --- Comment #1 from Henri Yandell 2009-10-08 00:35:22 PDT --- Thanks for the report Vasili. I'll get this into the unit tests for 1.2 to see if that confirms and can then start debugging. Presumably the 100<4 is because it's treating it alphabetically. -- 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47786] 100<4 in arithmetic evaluation - when 2 variables are used
https://issues.apache.org/bugzilla/show_bug.cgi?id=47786 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #2 from Konstantin Kolinko 2009-10-08 01:25:40 PDT --- "100"<"4" is, indeed, true Note, that you use Long.toString() and thus are comparing Strings. If you replace those calls with Long.valueOf(), you will get all those four "false"s that you are expecting. Also, you are reporting this to a wrong product. EL expressions an a page are evaluated by JSP engine that is part of the web server that you are using, and not by any Taglib. -- 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47956] ssl_error_internal_error_alert in firefox only, dependent on jdk version
https://issues.apache.org/bugzilla/show_bug.cgi?id=47956 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Konstantin Kolinko 2009-10-08 02:29:56 PDT --- You are already discussing this at the tomcat-users list: http://markmail.org/thread/6odzvp75fdqskxaz Bugzilla is not a support forum. Please discuss this on users list until it is agreed that it is an error in Tomcat and there is sufficient information to reproduce this issue on a fresh Tomcat installation. -- 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47954] Usage of HTTP NIO or AJP1.3 Protocols using embedded tomcat - is not supported when reading server.xml configuration file
https://issues.apache.org/bugzilla/show_bug.cgi?id=47954 --- Comment #2 from Konstantin Kolinko 2009-10-08 03:54:24 PDT --- Created an attachment (id=24363) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24363) The same as attachment 24356, but as diff -u Patches are better provided as an unified diff, created with "svn diff". I made one from your file. So, the actual complaint is that the method "Connector.setProtocol()" is useless, because it does not change the protocolHandler instance used by the Connector class? How are you reading that server.xml? The o.a.catalina.startup.ConnectorCreateRule class takes care of the "protocol" attribute. How it comes that you are not using it? See Catalina.createStartDigester() that configures the digester. -- 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r823132 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Thu Oct 8 11:31:08 2009 New Revision: 823132 URL: http://svn.apache.org/viewvc?rev=823132&view=rev Log: added missing space after bug numbers Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml 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=823132&r1=823131&r2=823132&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Oct 8 11:31:08 2009 @@ -291,10 +291,10 @@ Perform deserializtion events with context class loader. (fhanik) -47515Correctly replicate timestamp during startup. (fhanik) +47515: Correctly replicate timestamp during startup. (fhanik) -47478Call replication listeners when using BackupManager. (fhanik) +47478: Call replication listeners when using BackupManager. (fhanik) 47369: Reset data diff after replication. (fhanik) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47944] JSTL only accepts constant attribute values
https://issues.apache.org/bugzilla/show_bug.cgi?id=47944 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #1 from Konstantin Kolinko 2009-10-08 04:54:45 PDT --- 1. It works for me with latest 6.0.x code. 2. It looks the same as Bug 45953, that is already fixed in 6.0.20. 3. Could you have provided a more simple JSP page that reproduces the issue? E.g. only with JSTL tags, without all those Faces, and with source code for the beans that were used? E.g., as a war file. I had to modify your page to be able to run it. 4. The correct URL for JSTL Core tags would be "http://java.sun.com/jsp/jstl/core";. The one that you are using is for old JSTL 1.0. See the c.tld file. Of course, you app may be configured to accept both of them, but the new one is better. *** This bug has been marked as a duplicate of bug 45953 *** -- 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 45953] ELSupport.coerceToNumber with Number as type
https://issues.apache.org/bugzilla/show_bug.cgi?id=45953 Konstantin Kolinko changed: What|Removed |Added CC||jma...@salo.com --- Comment #2 from Konstantin Kolinko 2009-10-08 04:54:45 PDT --- *** Bug 47944 has been marked as a duplicate of this bug. *** -- 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47881] org.apache.catalina.startup.Bootstrap's main method handles 'startd' or 'stopd' wrongly
https://issues.apache.org/bugzilla/show_bug.cgi?id=47881 --- Comment #1 from Konstantin Kolinko 2009-10-08 05:31:24 PDT --- Actually, I do not see startd and stopd commands to be documented anywhere. Maybe we can just safely remove them? With startd, Tomcat will exit immediately upon startup. Though it may be useful for testing config files. With stopd ... you cannot stop server that is not running. And if you have an instance of Bootstrap, you can call load/start/stop directly, not relying on how Bootstrap#main() parses the arguments. Regarding the patch: args are not used in "stopd", that line can be omitted completely, or we can do as OP proposes. Regarding "startd": yes, the fix is 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47956] ssl_error_internal_error_alert in firefox only, dependent on jdk version
https://issues.apache.org/bugzilla/show_bug.cgi?id=47956 --- Comment #2 from Nada O'Neal 2009-10-08 07:25:32 PDT --- Thanks for this note. I agree that bugzilla is not a support forum. I'd judged that the discussion on the list was sufficient to establish that there's a bug between 5.5.26, this JDK, and Firefox for SSL, but I'm happy to reply to the message that you've sent to the list (once I can install some later versions of tomcat and configure them), and then re-submit this bug later. -- 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47963] New: HTTP status reason-phrase contains illegal characters in Japanese locale
https://issues.apache.org/bugzilla/show_bug.cgi?id=47963
Summary: HTTP status reason-phrase contains illegal characters
in Japanese locale
Product: Tomcat 5
Version: 5.5.28
Platform: PC
OS/Version: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: i9sg0i...@sneakemail.com
FormAuthenticator.authenticate() can send the client an error response with
Japanese characters. For example:
response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT,
sm.getString("authenticator.sessionExpired"));
This deviates from the HTTP RFC. From
http://www.w3.org/Protocols/rfc2616/rfc2616-sec6.html#sec6.1.1:
Reason-Phrase = *
The TEXT rule is only used for descriptive field contents and values
that are not intended to be interpreted by the message parser. Words
of *TEXT MAY contain characters from character sets other than ISO-
8859-1 [22] only when encoded according to the rules of RFC 2047
[14].
This can cause some problems with some clients. For example, httpclient 3
reads the HTTP status line by looping over the line byte-by-byte, looking for
the "\n" byte. The authenticator.sessionExpired Japanese string happens to
contain a Japanese character for which one of the bytes matches "\n", breaking
this logic.
--
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 42579] [Patch] JNDIRealm fails to parse absolute names
https://issues.apache.org/bugzilla/show_bug.cgi?id=42579 Brandon DuRette changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Comment #5 from Brandon DuRette 2009-10-08 08:55:37 PDT --- I looked at the changes that were made in the 6.0 branch and note that you factored the code in my patch into a method, but then failed to invoke it, so the bug still exists. This is in revision 769402. I didn't go check to see if the same mistake was made in the 5.5 branch. -- 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r823225 - /tomcat/trunk/modules/jdbc-pool/.classpath
Author: fhanik Date: Thu Oct 8 16:40:31 2009 New Revision: 823225 URL: http://svn.apache.org/viewvc?rev=823225&view=rev Log: remove not needed entry Modified: tomcat/trunk/modules/jdbc-pool/.classpath Modified: tomcat/trunk/modules/jdbc-pool/.classpath URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/.classpath?rev=823225&r1=823224&r2=823225&view=diff == --- tomcat/trunk/modules/jdbc-pool/.classpath (original) +++ tomcat/trunk/modules/jdbc-pool/.classpath Thu Oct 8 16:40:31 2009 @@ -7,5 +7,4 @@ - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47954] Usage of HTTP NIO or AJP1.3 Protocols using embedded tomcat - is not supported when reading server.xml configuration file
https://issues.apache.org/bugzilla/show_bug.cgi?id=47954 --- Comment #3 from Reem Halevy 2009-10-08 09:52:20 PDT --- Sorry for the format of the patch supplied - i will try to bring it in a correct format next time . You are correct with your diagnostics of the problem it is the method "Connector.setProtocol()" which is useless in such case. As to the reading of the server.xm file it's done using the digester (See the dump supplied, instanciating a new Connector instance and setting its protocol..) I can send you the actual relevant code if you like. -- 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r823234 [2/2] - in /tomcat/trunk: java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ test/org/apache/ test/or
Added: tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java?rev=823234&view=auto
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
(added)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java Thu
Oct 8 17:08:20 2009
@@ -0,0 +1,131 @@
+/*
+ * 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.connector;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.SimpleHttpClient;
+import org.apache.catalina.startup.TestTomcatBase;
+import org.apache.catalina.startup.Tomcat;
+
+public class TestKeepAliveCount extends TestTomcatBase{
+
+public void testHttp10() throws Exception {
+TestKeepAliveClient client = new TestKeepAliveClient();
+client.doHttp10Request();
+}
+
+public void testHttp11() throws Exception {
+TestKeepAliveClient client = new TestKeepAliveClient();
+client.doHttp11Request();
+}
+
+
+private class TestKeepAliveClient extends SimpleHttpClient {
+
+
+private boolean init;
+
+private synchronized void init() throws Exception {
+if (init) return;
+
+Tomcat tomcat = getTomcatInstance();
+StandardContext root = tomcat.addContext("", TEMP_DIR);
+Tomcat.addServlet(root, "Simple", new SimpleServlet());
+root.addServletMapping("/test", "Simple");
+tomcat.getConnector().setProperty("maxKeepAliveRequests", "5");
+tomcat.getConnector().setProperty("soTimeout", "2");
+tomcat.getConnector().setProperty("keepAliveTimeout", "5");
+tomcat.getConnector().setProperty("port", "8080");
+init = true;
+}
+
+private void doHttp10Request() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+init();
+tomcat.start();
+// Open connection
+connect();
+
+// Send request in two parts
+String[] request = new String[1];
+request[0] =
+"GET /test HTTP/1.0" + CRLF + CRLF;
+setRequest(request);
+processRequest(false); // blocks until response has been read
+boolean passed = (this.readLine()==null);
+// Close the connection
+disconnect();
+reset();
+tomcat.stop();
+assertTrue(passed);
+}
+
+private void doHttp11Request() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+init();
+tomcat.start();
+// Open connection
+connect();
+
+// Send request in two parts
+String[] request = new String[1];
+request[0] =
+"GET /test HTTP/1.1" + CRLF +
+"Host: localhost" + CRLF +
+"Connection: Keep-Alive" + CRLF+
+"Keep-Alive: 300"+ CRLF+ CRLF;
+
+setRequest(request);
+
+for (int i=0; i<5; i++) {
+processRequest(false); // blocks until response has been read
+assertTrue(getResponseLine()!=null &&
getResponseLine().trim().startsWith("HTTP/1.1 200"));
+}
+boolean passed = (this.readLine()==null);
+// Close the connection
+disconnect();
+reset();
+tomcat.stop();
+assertTrue(passed);
+}
+
+@Override
+public boolean isResponseBodyOK() {
+return true;
+}
+
+}
+
+
+private static class SimpleServlet extends HttpServlet {
+
+@Override
+protected void service(HttpServ
Site build note (was Re: svn commit: r822590 [1/2])
Mostly for the archives since I had the first observation below when I had to build the site as well: On Wed, Oct 7, 2009 at 1:24 AM, wrote: > Author: bayard > Date: Wed Oct 7 05:24:06 2009 > New Revision: 822590 > > URL: http://svn.apache.org/viewvc?rev=822590&view=rev > Log: > Adding a Taglibs entry to the Tomcat website under the Apache Tomcat menu item > > Modified: > tomcat/site/trunk/docs/bugreport.html > tomcat/site/trunk/docs/contact.html > tomcat/site/trunk/docs/download-41.html > tomcat/site/trunk/docs/download-55.html > tomcat/site/trunk/docs/download-60.html > tomcat/site/trunk/docs/download-connectors.html > tomcat/site/trunk/docs/download-native.html > tomcat/site/trunk/docs/findhelp.html > tomcat/site/trunk/docs/getinvolved.html > tomcat/site/trunk/docs/heritage.html > tomcat/site/trunk/docs/index.html > tomcat/site/trunk/docs/irc.html > tomcat/site/trunk/docs/legal.html > tomcat/site/trunk/docs/lists.html > tomcat/site/trunk/docs/migration.html > tomcat/site/trunk/docs/resources.html > tomcat/site/trunk/docs/security-3.html > tomcat/site/trunk/docs/security-4.html > tomcat/site/trunk/docs/security-5.html > tomcat/site/trunk/docs/security-6.html > tomcat/site/trunk/docs/security-impact.html > tomcat/site/trunk/docs/security-jk.html > tomcat/site/trunk/docs/security.html > tomcat/site/trunk/docs/svn.html > tomcat/site/trunk/docs/whichversion.html > tomcat/site/trunk/docs/whoweare.html > tomcat/site/trunk/xdocs/stylesheets/project.xml > > Modified: tomcat/site/trunk/docs/bugreport.html > URL: > http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=822590&r1=822589&r2=822590&view=diff > == > --- tomcat/site/trunk/docs/bugreport.html (original) > +++ tomcat/site/trunk/docs/bugreport.html Wed Oct 7 05:24:06 2009 > @@ -3,18 +3,18 @@ > > > Apache Tomcat - Reporting Bugs > - > - > - type="text/css" /> > + > + > + media="print"/> > Changes such as the above are a function of the XSLT impl that kicks in (for example, Sun JDK 1.4 generates the before variant in the diff above and 1.5/1.6 the after). If we continue to build the site with 1.5/1.6, those diffs won't show up anymore. > > Modified: tomcat/site/trunk/docs/download-native.html > URL: > http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=822590&r1=822589&r2=822590&view=diff > == > --- tomcat/site/trunk/docs/download-native.html (original) > +++ tomcat/site/trunk/docs/download-native.html Wed Oct 7 05:24:06 2009 > @@ -1,430 +1,433 @@ > - > - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> > - > - > -Apache Tomcat - Tomcat Native Downloads > - > - type="text/css" /> > - > - bgcolor="#ff"> > - > - > - > - This file shows a much larger diff since its missing eol-style (both xdoc and doc). Will add the props in a minute. -Rahul - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r823297 - in /tomcat/site/trunk: docs/download-native.html xdocs/download-native.xml
Author: rahul Date: Thu Oct 8 19:49:52 2009 New Revision: 823297 URL: http://svn.apache.org/viewvc?rev=823297&view=rev Log: Add missing svn:eol-style property. Modified: tomcat/site/trunk/docs/download-native.html (props changed) tomcat/site/trunk/xdocs/download-native.xml (props changed) Propchange: tomcat/site/trunk/docs/download-native.html -- svn:eol-style = native Propchange: tomcat/site/trunk/xdocs/download-native.xml -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Site build note (was Re: svn commit: r822590 [1/2])
On 08/10/2009, Rahul Akolkar wrote: > Mostly for the archives since I had the first observation below when I > had to build the site as well: > > On Wed, Oct 7, 2009 at 1:24 AM, wrote: > > Author: bayard > > Date: Wed Oct 7 05:24:06 2009 > > New Revision: 822590 > > > > URL: http://svn.apache.org/viewvc?rev=822590&view=rev > > Log: > > Adding a Taglibs entry to the Tomcat website under the Apache Tomcat menu > item > > > > Modified: > >tomcat/site/trunk/docs/bugreport.html > >tomcat/site/trunk/docs/contact.html > >tomcat/site/trunk/docs/download-41.html > >tomcat/site/trunk/docs/download-55.html > >tomcat/site/trunk/docs/download-60.html > >tomcat/site/trunk/docs/download-connectors.html > >tomcat/site/trunk/docs/download-native.html > >tomcat/site/trunk/docs/findhelp.html > >tomcat/site/trunk/docs/getinvolved.html > >tomcat/site/trunk/docs/heritage.html > >tomcat/site/trunk/docs/index.html > >tomcat/site/trunk/docs/irc.html > >tomcat/site/trunk/docs/legal.html > >tomcat/site/trunk/docs/lists.html > >tomcat/site/trunk/docs/migration.html > >tomcat/site/trunk/docs/resources.html > >tomcat/site/trunk/docs/security-3.html > >tomcat/site/trunk/docs/security-4.html > >tomcat/site/trunk/docs/security-5.html > >tomcat/site/trunk/docs/security-6.html > >tomcat/site/trunk/docs/security-impact.html > >tomcat/site/trunk/docs/security-jk.html > >tomcat/site/trunk/docs/security.html > >tomcat/site/trunk/docs/svn.html > >tomcat/site/trunk/docs/whichversion.html > >tomcat/site/trunk/docs/whoweare.html > >tomcat/site/trunk/xdocs/stylesheets/project.xml > > > > Modified: tomcat/site/trunk/docs/bugreport.html > > URL: > http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=822590&r1=822589&r2=822590&view=diff > > > == > > --- tomcat/site/trunk/docs/bugreport.html (original) > > +++ tomcat/site/trunk/docs/bugreport.html Wed Oct 7 05:24:06 2009 > > @@ -3,18 +3,18 @@ > > > > > > Apache Tomcat - Reporting Bugs > > - > > - > > - href="stylesheets/tomcat-printer.css" type="text/css" /> > > + > > + > > + rel="stylesheet" media="print"/> > > > > > Changes such as the above are a function of the XSLT impl that kicks > in (for example, Sun JDK 1.4 generates the before variant in the diff > above and 1.5/1.6 the after). > > If we continue to build the site with 1.5/1.6, those diffs won't show > up anymore. Alternatively, use the same approach as the Jakarta site: 0 xxx.gif rather than > > > > > Modified: tomcat/site/trunk/docs/download-native.html > > URL: > http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=822590&r1=822589&r2=822590&view=diff > > > == > > --- tomcat/site/trunk/docs/download-native.html (original) > > +++ tomcat/site/trunk/docs/download-native.html Wed Oct 7 05:24:06 2009 > > @@ -1,430 +1,433 @@ > > - > > - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> > > - > > - > > -Apache Tomcat - Tomcat Native Downloads > > - > > - href="stylesheets/tomcat-printer.css" type="text/css" /> > > - > > - bgcolor="#ff"> > > - > > - > > - > > - > > > This file shows a much larger diff since its missing eol-style (both > xdoc and doc). Will add the props in a minute. > > -Rahul > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r823351 - in /tomcat/trunk/java/org/apache: coyote/http11/AbstractInputBuffer.java coyote/http11/Http11Processor.java coyote/http11/InternalInputBuffer.java coyote/http11/InternalNioInputB
Author: fhanik
Date: Thu Oct 8 22:37:52 2009
New Revision: 823351
URL: http://svn.apache.org/viewvc?rev=823351&view=rev
Log:
consolidate two input buffers into one, no functional change, just abstract out
exact same code used in two connectors
Added:
tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
Added: tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=823351&view=auto
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java (added)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Thu Oct
8 22:37:52 2009
@@ -0,0 +1,327 @@
+/*
+ * 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.coyote.http11;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.coyote.InputBuffer;
+import org.apache.coyote.Request;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.res.StringManager;
+
+public abstract class AbstractInputBuffer implements InputBuffer{
+
+public abstract boolean parseRequestLine(boolean useAvailableDataOnly)
throws IOException;
+
+public abstract boolean parseHeaders() throws IOException;
+
+protected abstract boolean fill(boolean block) throws IOException;
+
+// -- Constants
+
+
+// --- Constructors
+
+
+
+
+// -- Variables
+
+
+/**
+ * The string manager for this package.
+ */
+protected static StringManager sm =
+StringManager.getManager(Constants.Package);
+
+
+// - Instance Variables
+
+
+/**
+ * Associated Coyote request.
+ */
+protected Request request;
+
+
+/**
+ * Headers of the associated request.
+ */
+protected MimeHeaders headers;
+
+
+/**
+ * State.
+ */
+protected boolean parsingHeader;
+
+
+/**
+ * Swallow input ? (in the case of an expectation)
+ */
+protected boolean swallowInput;
+
+
+/**
+ * Pointer to the current read buffer.
+ */
+protected byte[] buf;
+
+
+/**
+ * Last valid byte.
+ */
+protected int lastValid;
+
+
+/**
+ * Position in the buffer.
+ */
+protected int pos;
+
+
+/**
+ * Pos of the end of the header in the buffer, which is also the
+ * start of the body.
+ */
+protected int end;
+
+
+/**
+ * Underlying input stream.
+ */
+protected InputStream inputStream;
+
+
+/**
+ * Underlying input buffer.
+ */
+protected InputBuffer inputStreamInputBuffer;
+
+
+/**
+ * Filter library.
+ * Note: Filter[0] is always the "chunked" filter.
+ */
+protected InputFilter[] filterLibrary;
+
+
+/**
+ * Active filters (in order).
+ */
+protected InputFilter[] activeFilters;
+
+
+/**
+ * Index of the last active filter.
+ */
+protected int lastActiveFilter;
+
+
+// - Properties
+
+
+/**
+ * Set the underlying socket input stream.
+ */
+public void setInputStream(InputStream inputStream) {
+
+// FIXME: Check for null ?
+
+this.inputStream = inputStream;
+
+}
+
+
+/**
+ * Get the underlying socket input stream.
+ */
+public InputStream getInputStream() {
+
+return inputStream;
+
+}
+
+
+/**
+ * Add an input filter to the filter library.
+ */
+public void addFilter(InputFilter filter) {
+
+// FIXME: Check for null ?
DO NOT REPLY [Bug 47881] org.apache.catalina.startup.Bootstrap's main method handles 'startd' or 'stopd' wrongly
https://issues.apache.org/bugzilla/show_bug.cgi?id=47881
--- Comment #2 from qingyang.xu 2009-10-08 16:20:38 PDT
---
(In reply to comment #1)
> Actually, I do not see startd and stopd commands to be documented anywhere.
> Maybe we can just safely remove them?
>
> With startd, Tomcat will exit immediately upon startup. Though it may be
> useful
> for testing config files.
>
> With stopd ... you cannot stop server that is not running.
>
> And if you have an instance of Bootstrap, you can call load/start/stop
> directly, not relying on how Bootstrap#main() parses the arguments.
>
> Regarding the patch: args are not used in "stopd", that line can be omitted
> completely, or we can do as OP proposes. Regarding "startd": yes, the fix is
> correct.
(In reply to comment #1)
> Actually, I do not see startd and stopd commands to be documented anywhere.
> Maybe we can just safely remove them?
>
> With startd, Tomcat will exit immediately upon startup. Though it may be
> useful
> for testing config files.
>
> With stopd ... you cannot stop server that is not running.
>
> And if you have an instance of Bootstrap, you can call load/start/stop
> directly, not relying on how Bootstrap#main() parses the arguments.
>
> Regarding the patch: args are not used in "stopd", that line can be omitted
> completely, or we can do as OP proposes. Regarding "startd": yes, the fix is
> correct.
The only difference between 'startd' and 'start' is that 'startd' doesn't
invoke Catalina's await() method after the server has been started, or 'startd'
doesn't need to allocate a 'SHUTDOWN' port to listening to be sent a 'SHUTDOWN'
message. 'stopd' is the counterpart of 'stop'. If tomcat is started by
'startd', you must invoke 'stopd' to shutdown it, otherwise the server can't
be stopped, because 'stop' invoke Catalina's stopServer() method, which relies
on the allocated 'SHUTDOWN' port exclusively. On the contrary, 'stopd' invokes
Catalina's stop() method instead, which invoke server's stop() method directly.
Below is the two different methods invoked by 'stop' and 'stopd':
//invoked by 'stop'
public void stopServer() {
stopServer(null);
}
public void stopServer(String[] arguments) {
if (arguments != null) {
arguments(arguments);
}
if( server == null ) {
// Create and execute our Digester
Digester digester = createStopDigester();
digester.setClassLoader(Thread.currentThread().getContextClassLoader());
File file = configFile();
try {
InputSource is =
new InputSource("file://" + file.getAbsolutePath());
FileInputStream fis = new FileInputStream(file);
is.setByteStream(fis);
digester.push(this);
digester.parse(is);
fis.close();
} catch (Exception e) {
log.error("Catalina.stop: ", e);
System.exit(1);
}
}
// Stop the existing server
try {
if (server.getPort()>0) {
String hostAddress =
InetAddress.getByName("localhost").getHostAddress();
Socket socket = new Socket(hostAddress, server.getPort());
OutputStream stream = socket.getOutputStream();
String shutdown = server.getShutdown();
for (int i = 0; i < shutdown.length(); i++)
stream.write(shutdown.charAt(i));
stream.flush();
stream.close();
socket.close();
} else {
log.error(sm.getString("catalina.stopServer"));
System.exit(1);
}
} catch (IOException e) {
log.error("Catalina.stop: ", e);
System.exit(1);
}
}
// invoked by 'stopd'
public void stop() {
try {
// Remove the ShutdownHook first so that server.stop()
// doesn't get invoked twice
if (useShutdownHook) {
Runtime.getRuntime().removeShutdownHook(shutdownHook);
}
} catch (Throwable t) {
// This will fail on JDK 1.2. Ignoring, as Tomcat can run
// fine without the shutdown hook.
}
// Shut down the server
if (server instanceof Lifecycle) {
try {
((Lifecycle) server).stop();
} catch (LifecycleException e) {
log.error("Catalina.stop", e);
}
}
}
My suggestion: We don't need to remove 'startd' and 'stopd', they are useful in
some situations. The only place we need to correct is the Bootstrap's main()
method, as in the patches I have submitted. Thanks!
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
---
Re: svn commit: r823351 - in /tomcat/trunk/java/org/apache: coyote/http11/AbstractInputBuffer.java coyote/http11/Http11Processor.java coyote/http11/InternalInputBuffer.java coyote/http11/InternalNio
2009/10/9 : > Author: fhanik > Date: Thu Oct 8 22:37:52 2009 > New Revision: 823351 > > URL: http://svn.apache.org/viewvc?rev=823351&view=rev > Log: > consolidate two input buffers into one, no functional change, just abstract > out exact same code used in two connectors > > Added: > tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java > Modified: > tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java > tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java > tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java > tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java > AbstractHttp11Processor.java AbstractInputBuffer.java both do not have svn:eol-style and svn:keywords Also, may be 1. The AbstractHttp11Processor to be declared as "abstract" 2. The AbstractInputBuffer#log to be made non-static and use this.getClass().getName() (and remove Http11Processor#log, #sm and Http11NioProcessor#log, #sm) Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
