svn commit: r1056889 - /tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java

2011-01-09 Thread kkolinko
Author: kkolinko
Date: Sun Jan  9 08:07:02 2011
New Revision: 1056889

URL: http://svn.apache.org/viewvc?rev=1056889&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
Serve the error page regardless of "Range" header in the original request.

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1056889&r1=1056888&r2=1056889&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Sun Jan  
9 08:07:02 2011
@@ -883,7 +883,8 @@ public class DefaultServlet
 
 }
 
-if ( (cacheEntry.context != null) 
+if ( (cacheEntry.context != null)
+|| isError
 || ( ((ranges == null) || (ranges.isEmpty()))
 && (request.getHeader("Range") == null) )
 || (ranges == FULL) ) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1056890 - in /tomcat/trunk: test/org/apache/catalina/servlets/TestDefaultServlet.java webapps/docs/changelog.xml

2011-01-09 Thread kkolinko
Author: kkolinko
Date: Sun Jan  9 08:10:33 2011
New Revision: 1056890

URL: http://svn.apache.org/viewvc?rev=1056890&view=rev
Log:
Enable testcase for 50413#c6, now that the issue is fixed with r1056889.
Update changelog.

Modified:
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1056890&r1=1056889&r2=1056890&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Sun 
Jan  9 08:10:33 2011
@@ -220,8 +220,47 @@ public class TestDefaultServlet extends 
 client.connect();
 client.processRequest();
 assertTrue(client.isResponse404());
-// FIXME: The following currently fails
-// assertEquals("It is 404.html", client.getResponseBody());
+assertEquals("It is 404.html", client.getResponseBody());
+}
+
+/**
+ * Test what happens if a custom 404 page is configured,
+ * but its file is actually missing.
+ */
+public void testCustomErrorPageMissing() throws Exception {
+File appDir = new File(getTemporaryDirectory(), "MyApp");
+new File(appDir, "WEB-INF").mkdirs();
+Writer w = new OutputStreamWriter(new FileOutputStream(new File(appDir,
+"WEB-INF/web.xml")), "UTF-8");
+try {
+w.write("\n"
++ "\n"
++ "\n404\n"
++ "/404-absent.html\n\n"
++ "\n");
+w.flush();
+} finally {
+w.close();
+}
+
+Tomcat tomcat = getTomcatInstance();
+String contextPath = "/MyApp";
+tomcat.addWebapp(null, contextPath, appDir.getAbsolutePath());
+tomcat.start();
+
+TestCustomErrorClient client = new TestCustomErrorClient();
+client.setPort(getPort());
+
+client.reset();
+client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.0" + CRLF
++ CRLF });
+client.connect();
+client.processRequest();
+assertTrue(client.isResponse404());
 }
 
 public static int getUrl(String path, ByteChunk out,

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1056890&r1=1056889&r2=1056890&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Jan  9 08:10:33 2011
@@ -165,7 +165,7 @@
   
   
 50413: Ensure 304 responses are not returned when using
-static files as error pages. (markt)
+static files as error pages. (markt/kkolinko)
   
   
 50448: Fix possible IllegalStateException



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1056891 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt

2011-01-09 Thread kkolinko
Author: kkolinko
Date: Sun Jan  9 08:15:11 2011
New Revision: 1056891

URL: http://svn.apache.org/viewvc?rev=1056891&view=rev
Log:
propose additional patch for bug 50413

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1056891&r1=1056890&r2=1056891&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Jan  9 08:15:11 2011
@@ -85,6 +85,13 @@ PATCHES PROPOSED TO BACKPORT:
but it can be addressed separately, after applying the patch.
   -1:
 
+  Additional patch:
+  Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
+  http://svn.apache.org/viewvc?rev=1056889&view=rev
+  Serve the error page regardless of "Range" header in the original request.
+  +1: kkolinko
+  -1:
+
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43960
   Expose available property of StandardWrapper via JMX
   http://people.apache.org/~markt/patches/2010-12-13-bug43960-tc5.patch

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1056891&r1=1056890&r2=1056891&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jan  9 08:15:11 2011
@@ -143,3 +143,10 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1056569&view=rev
   +1: kkolinko
   -1:
+
+* Additional patch for bug 50413:
+  Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
+  Serve the error page regardless of "Range" header in the original request.
+  http://svn.apache.org/viewvc?rev=1056889&view=rev
+  +1: kkolinko
+  -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 50413] Tomcat returns 304 instead of 404 response for static custom 404 error file

2011-01-09 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50413

--- Comment #7 from Konstantin Kolinko  2011-01-09 
03:17:24 EST ---
(In reply to comment #6)
This is fixed by r1056889 in 7.0 - will be in 7.0.6.
Proposed as an additional patch for this issue for 6.0 and 5.5.

-- 
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 47255] Improve Tomcat6W display; allow easy setup of security manager

2011-01-09 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47255

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas  2011-01-09 04:00:22 EST ---
Tomcat6w.exe is provided by the commons daemon project. This issue needs to be
raised there.

Tomcat always uses the latest release of that component.

-- 
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 45731] Enhancement request : pluggable httpsession cache provider

2011-01-09 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45731

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME

--- Comment #1 from Mark Thomas  2011-01-09 04:12:10 EST ---
Provided via the Manager and/or Store interfaces.

-- 
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



Re: Help to Join

2011-01-09 Thread Mark Thomas
On 09/01/2011 06:27, Iman Reihanian wrote:
> Dear Guys,
> 
> I read your email address from tomcat developer mailing list,
> I am very very interested in to join tomcat committers, and it's one of the
> my dream in developer world.
> I read all of the tomcat site and wiki then checkout latest tomcat version
> from svn repository and build it,
> but i don't know from where can i start to develop in tomcat and send patch,
> because tomcat is enterprise and big project,
> would you please help me to start?

Sure,

If there isn't a particular feature you'd like to see or a particular
bug you'd like to fix (that is how most folks get started) then I'd
suggest reading through the open Tomcat bugs (including the
enhancements), pick one that you find interesting and write a patch.

Some of them will already have patches but the older the patch is, the
more likely it is not to apply cleanly. If you find a bug you are
interested in and it has a patch then you could check if it applies
cleanly and if not, provide an updated patch for the appropriate Tomcat
versions (bugs usually need patches for 7.0.x, 6.0.x, and 5.5.x,
enhancements usually need patches for 7.0.x and 6.0.x).

If you want somewhere simple to start, I'd suggest the following (in no
particular order)
45428 - If Tomcat is forcibly stopped, trigger a thread dump first to
show what was keeping it running
47281 - Make JDBCStore more efficient
50175 - Making memory leak detection optional on shut down

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Bug report for Taglibs [2011/01/09]

2011-01-09 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field   |
|38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)|
|42413|New|Enh|2007-05-14|[PATCH] Log Taglib enhancements   |
|46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l|
|48333|New|Enh|2009-12-02|TLD generator |
+-+---+---+--+--+
| Total5 bugs   |
+---+

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Bug report for Tomcat 5 [2011/01/09]

2011-01-09 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat|
|28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn  |
|29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi|
|33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis|
|33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps|
|33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na|
|34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a|
|34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern|
|34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that|
|35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc|
|36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi|
|36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's   |
|36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re|
|37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token|
|37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis|
|38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations |
|38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti|
|38546|Inf|Enh|2006-02-07|Google bot sends invalid If-Modifed-Since Header, |
|38577|Inf|Enh|2006-02-08|Enhance logging of security failures  |
|38916|Inf|Enh|2006-03-10|HttpServletRequest cannot handle multipart request|
|39053|Inf|Enh|2006-03-21|include Tomcat embedded sample|
|39740|New|Enh|2006-06-07|semi-colon ; isn't allowed as a query argument sep|
|39862|Inf|Enh|2006-06-22|provide support for protocol-independent GenericSe|
|40211|Inf|Enh|2006-08-08|Compiled JSP don't indent HTML code   |
|40402|New|Enh|2006-09-03|Manager should display Exceptions |
|40510|New|Enh|2006-09-14|installer does not create shortcuts for all users |
|40712|New|Enh|2006-10-10|Realm admin error.|
|40728|Inf|Enh|2006-10-11|Catalina MBeans use non-serializable classes  |
|40766|New|Enh|2006-10-16|Using an unsecure jsessionid with mod_proxy_ajp ov|
|40881|Opn|Enh|2006-11-02|Unable to receive message through  TCP channel -> |
|41007|Opn|Enh|2006-11-20|Can't define customized 503 error page|
|41179|New|Enh|2006-12-15|400 Bad Request response during auto re-deployment|
|41227|Opn|Enh|2006-12-21|When the jasper compiler fails to compile a JSP, i|
|41337|Opn|Enh|2007-01-10|Display an error page if no cert is available on C|
|41496|New|Enh|2007-01-30|set a security provider for jsse in a connector co|
|41498|New|Enh|2007-01-30|allRolesMode Realm configuration option not docume|
|41539|Inf|Enh|2007-02-05|NullPointerException during Embedded tomcat restar|
|41673|New|Enh|2007-02-21|Jasper output the message of compiling error using|
|41697|Ver|Enh|2007-02-25|make visible in debug output if charset from brows|
|41709|Inf|Enh|2007-02-26|When calling the API that relates to the buffer af|
|41718|New|Enh|2007-02-27|Status 302 response to GET request has no body whe|
|42416|New|Enh|2007-05-14|Tomcat startup hangs and AJP13 connector port 8009|
|43423|New|Enh|2007-09-18|catalina.sh -force too fast   |
|43538|New|Enh|2007-10-02|[patch] Show the hostname and IP address in the ma|
|43796|Inf|Enh|2007-11-05|Add MIME type mapping for the "log" extension |
|43866|New|Enh|2007-11-14|add support for session attribute propagation with|
|43925|Opn|Enh|2007-11-21|org.apache.jasper.runtime.BodyContentImpl causing |
|43960|New|Enh|2007-11-26|Expose StandardWrapper unavailable and/or availabl|
|43991|New|Enh|2007-11-29|Contributing a URLResourceFactory |
|44216|New|Enh|2008-01-11|Don't reuse session ID even if emptySessionPath=tr|
|44309|New|Enh|2008-01-28|Possible overriding the security state of the conn|
|44897|

Bug report for Tomcat 6 [2011/01/09]

2011-01-09 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|39661|Opn|Enh|2006-05-25|Please document JULI FileHandler configuration pro|
|41128|Inf|Enh|2006-12-07|Reference to java Thread name from RequestProcesso|
|41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat|
|41883|Ass|Enh|2007-03-18|use abstract wrapper instead of plain X509Certific|
|41992|New|Enh|2007-03-30|Need ability to set OS process title  |
|42463|New|Enh|2007-05-20|"crossContext" and classloader issues - pls amend |
|43001|New|Enh|2007-07-30|JspC lacks setMappedFile and setDie for use in Ant|
|43400|New|Enh|2007-09-14|enum support for tag libs |
|43497|New|Enh|2007-09-26|Add ability to escape rendered output of JSP expre|
|43548|Opn|Enh|2007-10-04|xml schema for tomcat-users.xml   |
|43682|New|Enh|2007-10-23|JULI: web-inf/classes/logging.properties to suppor|
|43742|New|Enh|2007-10-30|.tag compiles  performed one at a time -- extremel|
|43790|Ass|Enh|2007-11-03|concurrent access issue on TagHandlerPool |
|43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output |
|44047|New|Enh|2007-12-10|Provide a way for Tomcat to serve up error pages w|
|44199|New|Enh|2008-01-10|expose current backlog queue size |
|44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f|
|44264|New|Enh|2008-01-18|Clustering - Support for disabling multicasting an|
|44284|New|Enh|2008-01-23|Support java.lang.Iterable in c:forEach tag   |
|44294|New|Enh|2008-01-25|Support for EL functions with varargs |
|44299|New|Enh|2008-01-26|Provider manager app with a log out button|
|44312|New|Enh|2008-01-28|Warn when overwritting docBase of the default Host|
|44598|New|Enh|2008-03-13|JAASRealm is suppressing Exceptions   |
|44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam|
|44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt|
|44818|New|Enh|2008-04-13|tomcat hangs with GET when content-length is defin|
|45014|New|Enh|2008-05-15|Request and Response classes should have wrappers |
|45282|New|Enh|2008-06-25|NioReceiver doesn't close cleanly, leaving sockets|
|45283|Opn|Enh|2008-06-25|Provide a JSR196 implementation   |
|45428|New|Enh|2008-07-18|warn if the tomcat stop doesn't complete  |
|45654|New|Enh|2008-08-19|use static methods and attributes in a direct way!|
|45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks|
|45871|New|Enh|2008-09-23|Support for salted and digested patches in DataSou|
|45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or |
|45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE|
|45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output|
|45995|New|Enh|2008-10-13|RFE - MIME type extension not case sensitive  |
|46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c|
|46263|New|Enh|2008-11-21|Tomcat reloading of context does not update contex|
|46264|New|Enh|2008-11-21|Shutting down tomcat with large number of contexts|
|46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl|
|46350|New|Enh|2008-12-05|Maven repository should contain source bundles|
|46451|New|Enh|2008-12-30|Configure svn:bugtraq properties  |
|46461|New|Enh|2009-01-01|fail graceful on dns changes for connectors/hosts |
|46497|New|Enh|2009-01-08|Install Tomcat Deployer/ANT on Windows Platform   |
|46655|New|Enh|2009-02-03|keystore's password handler   |
|46727|New|Enh|2009-02-17|DefaultServlet - serving multiple encodings   |
|46819|New|Enh|2009-03-07|Remove redundant object instantiations in JspRunti|
|46902|New|Enh|2009-03-24|LoginValve to bypass restrictions of j_security_ch|
|47061|New|Enh|2009-04-21|JDBCStore for saving sessions doesn't support data|
|47214|New|Enh|2009-05-17|Inner classes that are explicitly referenced - sho|
|47230|

Bug report for Tomcat 7 [2011/01/09]

2011-01-09 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|48550|Inf|Enh|2010-01-14|Update examples and default server.xml to use UTF-|
|48870|New|Enh|2010-03-08|avoid parallel arrays of base types   |
|48892|New|Enh|2010-03-11|Use URIEncoding from server.xml for decoding post |
|49122|Opn|Enh|2010-04-14|Update of ROOT application index.html |
|49159|New|Enh|2010-04-20|Improve ThreadLocal memory leak clean-up  |
|49165|New|Enh|2010-04-21|Enhancement - Allow %{TIME_FORMAT}t As Configurati|
|49284|New|Enh|2010-05-12|Implement SSL renegotiation for the NIO connector |
|49290|New|Enh|2010-05-14|Using a JarScanner with scanAllDirectories=true ca|
|49318|New|Enh|2010-05-20|add a Negotiate (Kerberos/NTLM) authenticator / in|
|49395|New|Enh|2010-06-06|manager.findLeaks : display the date when the leak|
|49589|New|Enh|2010-07-12|Tag handlers with constant attribute values are al|
|49591|New|Enh|2010-07-13|Custom error page always uses Transfer-Encoding: c|
|49683|New|Nor|2010-08-01|Separate keep-alive and connection timeout with AP|
|49711|New|Enh|2010-08-05|HttpServletRequest#getParts() does not work in a F|
|49785|New|Enh|2010-08-19|Enabling TLS for JNDIRealm|
|49821|New|Enh|2010-08-25|Tomcat CLI|
|50019|New|Enh|2010-09-28|Adding JNDI "lookup-name" support In XML and Resou|
|50175|New|Enh|2010-10-28|Enhance memory leak detection by selectively apply|
|50205|New|Enh|2010-11-03|Add deployIgnorePaths attribute to StandardHost   |
|50234|New|Enh|2010-11-08|JspC use servlet 3.0 features |
|50306|New|Enh|2010-11-19|Detect stuck threads  |
|50325|New|Enh|2010-11-24|Update Tomcat to use JRE provided solutions for CV|
|50353|New|Enh|2010-11-27|Calling asyncContext.getResponse() returns null af|
|50405|Inf|Nor|2010-12-02|Null Pointer Exception at Coyote Adapter  |
|50504|New|Enh|2010-12-21|Allow setting query string character set trough re|
|50526|New|Enh|2010-12-28|Clarify that JavaMail Session JNDI resource factor|
|50535|New|Enh|2011-01-01|Support resources serving from /WEB-INF/classes/ME|
+-+---+---+--+--+
| Total   27 bugs   |
+---+

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Bug report for Tomcat Modules [2011/01/09]

2011-01-09 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers |
|48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite  |
|48861|New|Nor|2010-03-04|Files without AL headers  |
|49685|New|Nor|2010-08-02|Unsafe synchronization in class ManagedBean   |
|49686|New|Nor|2010-08-02|Using an instance lock to protect static shared da|
|49953|Opn|Nor|2010-09-17|Missing @Override annotations |
|49954|New|Nor|2010-09-17|Code tidyup   |
|50333|New|Nor|2010-11-25|IllegalArgumentException occurs when setting maxAc|
+-+---+---+--+--+
| Total8 bugs   |
+---+

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Bug report for Tomcat Connectors [2011/01/09]

2011-01-09 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo|
|35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName|
|36155|Opn|Nor|2005-08-12|tomcat chooses wrong host if using mod_jk |
|39967|Inf|Nor|2006-07-05|mod_jk gives segmentation fault when apache is sta|
|40208|Inf|Nor|2006-08-08|Request-Dump when ErrorDocument in httpd.conf is a|
|41923|Opn|Nor|2007-03-21|Tomcat doesnt recognized client abort |
|42366|Inf|Nor|2007-05-09|Memory leak in newer mod_jk version when connectio|
|42554|Opn|Nor|2007-05-31|mod_ssl + mod_jk with status_worker does not work |
|43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn|
|43968|New|Enh|2007-11-26|[patch] support ipv6 with mod_jk  |
|44290|New|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan|
|44349|New|Maj|2008-02-04|mod_jk/1.2.26 module does not read worker.status.s|
|44379|New|Enh|2008-02-07|convert the output of strftime into UTF-8 |
|44454|New|Nor|2008-02-19|busy count reported in mod_jk inflated, causes inc|
|44571|New|Enh|2008-03-10|Limits busy per worker to a threshold |
|45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff|
|45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so|
|45395|New|Min|2008-07-14|MsgAjp dump method does not dump packet when being|
|46337|New|Nor|2008-12-04|real worker name is wrong |
|46406|New|Enh|2008-12-16|Supporting relative paths in isapi_redirect.proper|
|46676|New|Enh|2009-02-09|Configurable test request for Watchdog thread |
|46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca|
|47038|New|Enh|2009-04-15|USE_FLOCK_LK redefined compiler warning when using|
|47327|New|Enh|2009-06-07|remote_user not logged in apache logfile  |
|47617|New|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err|
|47678|New|Cri|2009-08-11|Unable to allocate shared memory when using isapi_|
|47679|New|Nor|2009-08-11|Not all headers get passed to Tomcat server from i|
|47692|New|Reg|2009-08-12|Can not compile mod_jk with apache2.0.63 and tomca|
|47714|New|Cri|2009-08-20|Reponse mixed between users   |
|47750|New|Maj|2009-08-27|Loss of worker settings when changing via jkstatus|
|47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit|
|47840|Inf|Min|2009-09-14|A broken worker name is written in the log file.  |
|48191|New|Maj|2009-11-13|Problem with mod_jk 1.2.28 - Can not render up the|
|48460|New|Nor|2009-12-30|mod_proxy_ajp document has three misleading portio|
|48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert|
|48513|New|Enh|2010-01-09|IIS Quick setup instructions  |
|48564|New|Nor|2010-01-18|Unable to turn off retries for LB worker  |
|48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv|
|48891|Opn|Enh|2010-03-11|Missing EOL-style settings in tomcat/jk/trunk |
|48940|New|Maj|2010-03-18|IIS to Tomcat occasionally fails on POST with T-E |
|49035|New|Maj|2010-04-01|data lost when post a multipart/form-data form|
|49048|New|Nor|2010-04-05|ACL not applied to redirect URLs  |
|49063|New|Enh|2010-04-07|Please add JkStripSession status in jk-status work|
|49135|New|Enh|2010-04-16|SPDY Connector for The Tomcat |
|49413|Opn|Reg|2010-06-09|Apache Mod_jk 1.2.30 is shutting down communicatio|
|49469|New|Enh|2010-06-19|Workers status page has negative number of connect|
|49732|Opn|Nor|2010-08-10|reply_timeout can't wait forever. |
|49822|New|Enh|2010-08-25|Add hash lb worker method |
|49903|New|Enh|2010-09-09|Make workers file reloadable  |
|50186|New|Nor|2010-10-31|Wrong documentation of connection_pool_timeout / c|
|50233|New|Cri|2010-11-08|support long URLs (more than 2048)|
|50304|

Bug report for Tomcat Native [2011/01/09]

2011-01-09 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|45392|New|Nor|2008-07-14|No OCSP support for client SSL verification   |
|46179|Opn|Maj|2008-11-10|apr ssl client authentication |
|48655|New|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown|
|49038|Inf|Nor|2010-04-02|Crash in tcnative |
|49595|New|Cri|2010-07-15|Tomcat crashes in tcnative-1.dll frequently   |
|49795|New|Nor|2010-08-22|Crash in Socket.destroy   |
|49796|New|Nor|2010-08-22|Crash in SSLSocket.handshake()|
|50394|New|Nor|2010-12-01|InternalAprInputBuffer.fill() doesn't deal correct|
+-+---+---+--+--+
| Total8 bugs   |
+---+

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1056946 - in /tomcat/trunk/java: javax/mail/ org/apache/naming/factory/

2011-01-09 Thread markt
Author: markt
Date: Sun Jan  9 14:48:08 2011
New Revision: 1056946

URL: http://svn.apache.org/viewvc?rev=1056946&view=rev
Log:
Fix a handful of warnings

Modified:
tomcat/trunk/java/javax/mail/Authenticator.java
tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
tomcat/trunk/java/org/apache/naming/factory/Constants.java
tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java
tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java
tomcat/trunk/java/org/apache/naming/factory/OpenEjbFactory.java
tomcat/trunk/java/org/apache/naming/factory/ResourceEnvFactory.java
tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java
tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java
tomcat/trunk/java/org/apache/naming/factory/TransactionFactory.java

Modified: tomcat/trunk/java/javax/mail/Authenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/mail/Authenticator.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==
--- tomcat/trunk/java/javax/mail/Authenticator.java (original)
+++ tomcat/trunk/java/javax/mail/Authenticator.java Sun Jan  9 14:48:08 2011
@@ -17,5 +17,7 @@
 package javax.mail;
 
 public class Authenticator {
-// Dummy implementation
+protected PasswordAuthentication getPasswordAuthentication() {
+return null;
+}
 }

Modified: tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java Sun Jan  9 
14:48:08 2011
@@ -107,6 +107,7 @@ public class BeanFactory
  * 
  * @param obj The reference object describing the Bean
  */
+@Override
 public Object getObjectInstance(Object obj, Name name, Context nameCtx,
 Hashtable environment)
 throws NamingException {
@@ -169,7 +170,8 @@ public class BeanFactory
 valueArray[0] = value;
 } else if (propType.equals(Character.class) 
|| propType.equals(char.class)) {
-valueArray[0] = new Character(value.charAt(0));
+valueArray[0] =
+Character.valueOf(value.charAt(0));
 } else if (propType.equals(Byte.class) 
|| propType.equals(byte.class)) {
 valueArray[0] = new Byte(value);

Modified: tomcat/trunk/java/org/apache/naming/factory/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/Constants.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/Constants.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/Constants.java Sun Jan  9 
14:48:08 2011
@@ -54,8 +54,6 @@ public final class Constants {
 public static final String OPENEJB_EJB_FACTORY = 
 Package + ".OpenEjbFactory";
 
-public static final String OBJECT_FACTORIES = "";
-
 public static final String FACTORY = "factory";
 
 }

Modified: tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java Sun Jan  9 
14:48:08 2011
@@ -61,6 +61,7 @@ public class EjbFactory
  * 
  * @param obj The reference object describing the DataSource
  */
+@Override
 public Object getObjectInstance(Object obj, Name name, Context nameCtx,
 Hashtable environment)
 throws Exception {

Modified: tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java 
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java Sun Jan 
 9 14:48:08 2011
@@ -89,6 +89,7 @@ public class MailSessionFactory implemen
  *
  * @exception Exception if an erro

svn commit: r1056947 - /tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java

2011-01-09 Thread markt
Author: markt
Date: Sun Jan  9 14:52:31 2011
New Revision: 1056947

URL: http://svn.apache.org/viewvc?rev=1056947&view=rev
Log:
Fix checkstyle warnings

Modified:
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java

Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1056947&r1=1056946&r2=1056947&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Sun 
Jan  9 14:52:31 2011
@@ -16,8 +16,6 @@
  */
 package org.apache.catalina.servlets;
 
-import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -40,7 +38,8 @@ import org.apache.tomcat.util.buf.ByteCh
 public class TestDefaultServlet extends TomcatBaseTest {
 
 /**
- * Test attempting to access special paths (WEB-INF/META-INF) using 
DefaultServlet 
+ * Test attempting to access special paths (WEB-INF/META-INF) using
+ * DefaultServlet. 
  */
 public void testGetSpecials() throws Exception {
 Tomcat tomcat = getTomcatInstance();
@@ -187,8 +186,8 @@ public class TestDefaultServlet extends 
 client.setPort(getPort());
 
 client.reset();
-client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.0" + CRLF
-+ CRLF });
+client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.0" +
+SimpleHttpClient.CRLF + SimpleHttpClient.CRLF });
 client.connect();
 client.processRequest();
 assertTrue(client.isResponse404());
@@ -203,9 +202,12 @@ public class TestDefaultServlet extends 
 // https://issues.apache.org/bugzilla/show_bug.cgi?id=50413
 //
 client.reset();
-client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.1" + CRLF
-+ "Host: localhost" + CRLF + "Connection: close" + CRLF
-+ "If-Modified-Since: " + tomorrow + CRLF + CRLF });
+client.setRequest(new String[] {
+"GET /MyApp/missing HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost" + SimpleHttpClient.CRLF +
+"Connection: close" + SimpleHttpClient.CRLF +
+"If-Modified-Since: " + tomorrow + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF });
 client.connect();
 client.processRequest();
 assertTrue(client.isResponse404());
@@ -214,9 +216,12 @@ public class TestDefaultServlet extends 
 // https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
 //
 client.reset();
-client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.1" + CRLF
-+ "Host: localhost" + CRLF + "Connection: close" + CRLF
-+ "Range: bytes=0-100" + CRLF + CRLF });
+client.setRequest(new String[] {
+"GET /MyApp/missing HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost" + SimpleHttpClient.CRLF +
+"Connection: close" + SimpleHttpClient.CRLF +
+"Range: bytes=0-100" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF });
 client.connect();
 client.processRequest();
 assertTrue(client.isResponse404());
@@ -256,8 +261,8 @@ public class TestDefaultServlet extends 
 client.setPort(getPort());
 
 client.reset();
-client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.0" + CRLF
-+ CRLF });
+client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.0" +
+SimpleHttpClient.CRLF + SimpleHttpClient.CRLF });
 client.connect();
 client.processRequest();
 assertTrue(client.isResponse404());



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1056957 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-01-09 Thread markt
Author: markt
Date: Sun Jan  9 15:00:54 2011
New Revision: 1056957

URL: http://svn.apache.org/viewvc?rev=1056957&view=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=1056957&r1=1056956&r2=1056957&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jan  9 15:00:54 2011
@@ -148,5 +148,5 @@ PATCHES PROPOSED TO BACKPORT:
   Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
   Serve the error page regardless of "Range" header in the original request.
   http://svn.apache.org/viewvc?rev=1056889&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1056947 - /tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java

2011-01-09 Thread Konstantin Kolinko
2011/1/9  :
> Author: markt
> Date: Sun Jan  9 14:52:31 2011
> New Revision: 1056947
>
> URL: http://svn.apache.org/viewvc?rev=1056947&view=rev
> Log:
> Fix checkstyle warnings
>
> Modified:
>    tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
>
> Modified: 
> tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1056947&r1=1056946&r2=1056947&view=diff
> ==
> --- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java 
> (original)
> +++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java 
> Sun Jan  9 14:52:31 2011
> @@ -16,8 +16,6 @@
>  */
>  package org.apache.catalina.servlets;
>
> -import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
> -

(...)
> -client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.0" + CRLF
> -+ CRLF });
> +client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.0" +
> +SimpleHttpClient.CRLF + SimpleHttpClient.CRLF });


Is there a reason why Checkstyle does not like "static import"s ?

Can it be configured to like them?
(or it is not worth as you think that with those explicit
"SimpleHttpClient.CRLF" etc. are more readable)?


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1056947 - /tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java

2011-01-09 Thread Mark Thomas
On 09/01/2011 20:51, Konstantin Kolinko wrote:
> Is there a reason why Checkstyle does not like "static import"s ?

[1] explains the reasoning. Generally they are bad, but usually OK for
constants (as in this case).

> Can it be configured to like them?
> (or it is not worth as you think that with those explicit
> "SimpleHttpClient.CRLF" etc. are more readable)?

Worth adding an exception for this one. It was more readable before the
change.

I'm working on Jira at the moment but if I get that working I'll take a
look at this unless you get there before me.

Mark

[1] http://checkstyle.sourceforge.net/config_imports.html

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1057100 - in /tomcat/trunk: res/checkstyle/checkstyle.xml test/org/apache/catalina/servlets/TestDefaultServlet.java

2011-01-09 Thread markt
Author: markt
Date: Mon Jan 10 07:43:34 2011
New Revision: 1057100

URL: http://svn.apache.org/viewvc?rev=1057100&view=rev
Log:
Configure Checkstyle to allow limited static imports and revert most of r1056947

Modified:
tomcat/trunk/res/checkstyle/checkstyle.xml
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java

Modified: tomcat/trunk/res/checkstyle/checkstyle.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1057100&r1=1057099&r2=1057100&view=diff
==
--- tomcat/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/checkstyle.xml Mon Jan 10 07:43:34 2011
@@ -37,7 +37,10 @@
 
 
 
-
+
+
+
 
 
 

Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1057100&r1=1057099&r2=1057100&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Mon 
Jan 10 07:43:34 2011
@@ -30,6 +30,8 @@ import java.util.TimeZone;
 
 import javax.servlet.http.HttpServletResponse;
 
+import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
+
 import org.apache.catalina.startup.SimpleHttpClient;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -186,8 +188,8 @@ public class TestDefaultServlet extends 
 client.setPort(getPort());
 
 client.reset();
-client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.0" +
-SimpleHttpClient.CRLF + SimpleHttpClient.CRLF });
+client.setRequest(new String[] {
+"GET /MyApp/missing HTTP/1.0" +CRLF + CRLF });
 client.connect();
 client.processRequest();
 assertTrue(client.isResponse404());
@@ -203,11 +205,10 @@ public class TestDefaultServlet extends 
 //
 client.reset();
 client.setRequest(new String[] {
-"GET /MyApp/missing HTTP/1.1" + SimpleHttpClient.CRLF +
-"Host: localhost" + SimpleHttpClient.CRLF +
-"Connection: close" + SimpleHttpClient.CRLF +
-"If-Modified-Since: " + tomorrow + SimpleHttpClient.CRLF +
-SimpleHttpClient.CRLF });
+"GET /MyApp/missing HTTP/1.1" + CRLF +
+"Host: localhost" + CRLF +
+"Connection: close" + CRLF +
+"If-Modified-Since: " + tomorrow + CRLF + CRLF });
 client.connect();
 client.processRequest();
 assertTrue(client.isResponse404());
@@ -217,11 +218,10 @@ public class TestDefaultServlet extends 
 //
 client.reset();
 client.setRequest(new String[] {
-"GET /MyApp/missing HTTP/1.1" + SimpleHttpClient.CRLF +
-"Host: localhost" + SimpleHttpClient.CRLF +
-"Connection: close" + SimpleHttpClient.CRLF +
-"Range: bytes=0-100" + SimpleHttpClient.CRLF +
-SimpleHttpClient.CRLF });
+"GET /MyApp/missing HTTP/1.1" + CRLF +
+"Host: localhost" + CRLF +
+"Connection: close" + CRLF +
+"Range: bytes=0-100" + CRLF + CRLF });
 client.connect();
 client.processRequest();
 assertTrue(client.isResponse404());
@@ -261,8 +261,8 @@ public class TestDefaultServlet extends 
 client.setPort(getPort());
 
 client.reset();
-client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.0" +
-SimpleHttpClient.CRLF + SimpleHttpClient.CRLF });
+client.setRequest(new String[] {
+"GET /MyApp/missing HTTP/1.0" + CRLF + CRLF });
 client.connect();
 client.processRequest();
 assertTrue(client.isResponse404());



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org