svn commit: r685094 - /tomcat/servletapi/branches/servlet2.3-jsp1.2-tc4.x/src/share/javax/servlet/http/HttpServlet.java

2008-08-12 Thread markt
Author: markt
Date: Tue Aug 12 01:55:56 2008
New Revision: 685094

URL: http://svn.apache.org/viewvc?rev=685094&view=rev
Log:
Code clean up - no functional change

Modified:

tomcat/servletapi/branches/servlet2.3-jsp1.2-tc4.x/src/share/javax/servlet/http/HttpServlet.java

Modified: 
tomcat/servletapi/branches/servlet2.3-jsp1.2-tc4.x/src/share/javax/servlet/http/HttpServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/servletapi/branches/servlet2.3-jsp1.2-tc4.x/src/share/javax/servlet/http/HttpServlet.java?rev=685094&r1=685093&r2=685094&view=diff
==
--- 
tomcat/servletapi/branches/servlet2.3-jsp1.2-tc4.x/src/share/javax/servlet/http/HttpServlet.java
 (original)
+++ 
tomcat/servletapi/branches/servlet2.3-jsp1.2-tc4.x/src/share/javax/servlet/http/HttpServlet.java
 Tue Aug 12 01:55:56 2008
@@ -36,7 +36,6 @@
 
 
 /**
- *
  * Provides an abstract class to be subclassed to create
  * an HTTP servlet suitable for a Web site. A subclass of
  * HttpServlet must override at least 
@@ -74,16 +73,12 @@
  * Java Tutorial on Multithreaded Programming for more
  * information on handling multiple threads in a Java program.
  *
- * @author Various
- * @version$Version$
- *
+ * @author  Various
+ * @version $Version$
  */
-
-
-
 public abstract class HttpServlet extends GenericServlet
-implements java.io.Serializable
-{
+implements java.io.Serializable {
+
 private static final String METHOD_DELETE = "DELETE";
 private static final String METHOD_HEAD = "HEAD";
 private static final String METHOD_GET = "GET";
@@ -96,24 +91,18 @@
 private static final String HEADER_LASTMOD = "Last-Modified";
 
 private static final String LSTRING_FILE =
-   "javax.servlet.http.LocalStrings";
+"javax.servlet.http.LocalStrings";
 private static ResourceBundle lStrings =
-   ResourceBundle.getBundle(LSTRING_FILE);
-   
-   
+ResourceBundle.getBundle(LSTRING_FILE);

 
 /**
  * Does nothing, because this is an abstract class.
- * 
  */
-
 public HttpServlet() { }
 
 
-
 /**
- *
  * Called by the server (via the service method) to
  * allow a servlet to handle a GET request. 
  *
@@ -156,46 +145,38 @@
  *
  * If the request is incorrectly formatted, doGet
  * returns an HTTP "Bad Request" message.
- * 
- *
- * @param req  an [EMAIL PROTECTED] HttpServletRequest} object that
- * contains the request the client has made
- * of the servlet
- *
- * @param resp an [EMAIL PROTECTED] HttpServletResponse} object that
- * contains the response the servlet sends
- * to the client
- * 
- * @exception IOException  if an input or output error is 
- * detected when the servlet handles
- * the GET request
  *
- * @exception ServletException if the request for the GET
- * could not be handled
+ * @param req   an [EMAIL PROTECTED] HttpServletRequest} object that
+ *  contains the request the client has made
+ *  of the servlet
+ *
+ * @param resp  an [EMAIL PROTECTED] HttpServletResponse} object that
+ *  contains the response the servlet sends
+ *  to the client
+ * 
+ * @exception IOException   if an input or output error is 
+ *  detected when the servlet handles
+ *  the GET request
  *
+ * @exception ServletException  if the request for the GET
+ *  could not be handled
  * 
  * @see javax.servlet.ServletResponse#setContentType
- *
  */
-
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-   throws ServletException, IOException
+throws ServletException, IOException
 {
-   String protocol = req.getProtocol();
-   String msg = lStrings.getString("http.method_get_not_supported");
-   if (protocol.endsWith("1.1")) {
-   resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, msg);
-   } else {
-   resp.sendError(HttpServletResponse.SC_BAD_REQUEST, msg);
-   }
+String protocol = req.getProtocol();
+String msg = lStrings.getString("http.method_get_not_supported");
+if (protocol.endsWith("1.1")) {
+resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, msg);
+} else {
+resp.sendError(HttpServletResponse.SC_BAD_REQUEST, msg);
+}
 }
 
 
-
-
-
 /**
- *
  * Returns the time the HttpServletRequest
  * object was last modified,
  * in milliseconds since midnight January 1, 1970 GMT.
@@ -207,28 +188,21 @@
  * This makes browser and proxy caches work mor

svn commit: r685099 - in /tomcat: container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt current/tc4.1.x/STATUS.txt servletapi/branches/servlet2.3-jsp1.2-tc4.x/src/share/javax/servlet/http/HttpServlet.java

2008-08-12 Thread markt
Author: markt
Date: Tue Aug 12 02:09:39 2008
New Revision: 685099

URL: http://svn.apache.org/viewvc?rev=685099&view=rev
Log:
Fix bug 44562. HEAD requests fail with rd.include(). Patch provided by David 
Jencks.

Modified:
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
tomcat/current/tc4.1.x/STATUS.txt

tomcat/servletapi/branches/servlet2.3-jsp1.2-tc4.x/src/share/javax/servlet/http/HttpServlet.java

Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=685099&r1=685098&r2=685099&view=diff
==
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Tue Aug 12 02:09:39 
2008
@@ -1733,6 +1733,9 @@
 [4.1.38] #41217
  SSO cookies are now marked as secure. This is CVE-2008-0128.
 
+[4.1.38] #44562
+ HEAD requests failed with rd.include(). Patch provided by David 
Jencks.
+
 
 
 Coyote Bug Fixes:

Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=685099&r1=685098&r2=685099&view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Tue Aug 12 02:09:39 2008
@@ -25,12 +25,6 @@
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44562
-  http://svn.apache.org/viewvc?rev=635294&view=rev (prior code clean up)
-  http://svn.apache.org/viewvc?rev=635297&view=rev (the actual fix)
-  +1: markt, yoavs, funkman
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45301
   Remove a JDK 1.4 dep for the few users that still run TC4 on 1.3 JDKs
   http://people.apache.org/~markt/patches/2008-07-07-bug45301-tc4.patch

Modified: 
tomcat/servletapi/branches/servlet2.3-jsp1.2-tc4.x/src/share/javax/servlet/http/HttpServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/servletapi/branches/servlet2.3-jsp1.2-tc4.x/src/share/javax/servlet/http/HttpServlet.java?rev=685099&r1=685098&r2=685099&view=diff
==
--- 
tomcat/servletapi/branches/servlet2.3-jsp1.2-tc4.x/src/share/javax/servlet/http/HttpServlet.java
 (original)
+++ 
tomcat/servletapi/branches/servlet2.3-jsp1.2-tc4.x/src/share/javax/servlet/http/HttpServlet.java
 Tue Aug 12 02:09:39 2008
@@ -723,149 +723,50 @@
 
 
 /*
- * A response that includes no body, for use in (dumb) "HEAD" support.
+ * A response wrapper for use in (dumb) "HEAD" support.
  * This just swallows that body, counting the bytes in order to set
- * the content length appropriately.  All other methods delegate directly
- * to the HTTP Servlet Response object used to construct this one.
+ * the content length appropriately.  All other methods delegate to the
+ * wrapped HTTP Servlet Response object.
  */
 // file private
-class NoBodyResponse implements HttpServletResponse {
-private HttpServletResponse resp;
+class NoBodyResponse extends HttpServletResponseWrapper {
 private NoBodyOutputStream  noBody;
 private PrintWriter writer;
 private boolean didSetContentLength;
 
 // file private
 NoBodyResponse(HttpServletResponse r) {
-resp = r;
+super(r);
 noBody = new NoBodyOutputStream();
 }
 
 // file private
 void setContentLength() {
 if (!didSetContentLength)
-  resp.setContentLength(noBody.getContentLength());
+  super.setContentLength(noBody.getContentLength());
 }
 
 
 // SERVLET RESPONSE interface methods
 
 public void setContentLength(int len) {
-resp.setContentLength(len);
+super.setContentLength(len);
 didSetContentLength = true;
 }
 
-public void setContentType(String type)
-  { resp.setContentType(type); }
-
-public ServletOutputStream getOutputStream() throws IOException
-  { return noBody; }
-
-public String getCharacterEncoding()
-{ return resp.getCharacterEncoding(); }
+public ServletOutputStream getOutputStream() throws IOException {
+return noBody;
+}
 
-public PrintWriter getWriter() throws UnsupportedEncodingException
-{
+public PrintWriter getWriter() throws UnsupportedEncodingException {
 if (writer == null) {
-OutputStreamWriterw;
+OutputStreamWriter w;
 
 w = new OutputStreamWriter(noBody, getCharacterEncoding());
 writer = new PrintWriter(w);
 }
 return writer;
 }
-
-public void setBufferSize(int size) throws IllegalStateException
-  { resp.setBufferSize(size); }
-
-public int getBufferSize()
-  { return resp.getBufferSize(); }
-
-

DO NOT REPLY [Bug 45511] EL "empty" keyword does not work

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45511


Fabrizio Giustina <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]




-- 
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 45619] New: Service Desk Plus with Tomcat

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45619

   Summary: Service Desk Plus with Tomcat
   Product: Tomcat 4
   Version: 4.1.0
  Platform: HP
OS/Version: Windows Server 2003
Status: NEW
  Severity: critical
  Priority: P1
 Component: Installable Packages
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


We have Service Desk Plus(SDP) which has Tomcat service running to host the
Helpdesk pages. 

We have been working with the SDP vendor and not got a solution as of now.

To describe, SDP is a incident management tool of CA.
we get a problem that tickets are not automatically raised by SDP or not able
to add attachement for a ticket.

The log is provided below:
Please help!!!

Thanks.

I get the error "pdm_tomcat.c 378 shutdown_tomcat:
D:\PROGRA~1\CA\SharedComponents\JRE\1.4.2_06\bin\javaw"

more details error log:"pdm_tomcat.c 378 shutdown_tomcat:
D:\PROGRA~1\CA\SharedComponents\JRE\1.4.2_06\bin\javaw
-Djava.net.preferIPv4Stack=true -Xrs -Xmx512M
-Djaas.config=D:\PROGRA~1\CA\SERVIC~1\add-ons\caflow\jaas.config
-Djava.security.auth.login.config=D:\PROGRA~1\CA\SERVIC~1\add-ons\caflow\jaas.config
-Djdbc.baseDriver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-Dsun.io.useCanonCaches=false -Djava.awt.headless=true
-Djava.endorsed.dirs="D:\PROGRA~1\CA\SharedComponents\tomcat\4.1.31\common\endorsed"
-classpath
"D:\PROGRA~1\CA\SharedComponents\tomcat\4.1.31\common\lib\tools.jar;D:\PROGRA~1\CA\SharedComponen"


-- 
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 45619] Service Desk Plus with Tomcat

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45619


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Comment #1 from Mark Thomas <[EMAIL PROTECTED]>  2008-08-12 06:24:53 PST ---
Firstly, Bugzilla is not a support forum. If you need help with Tomcat, you
should be using the users list.

Secondly the users list is very good at helping you to fix Tomcat problems but
this looks like an issue with SDP. Your SDP support service is best placed to
help you.


-- 
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: r685143 - in /tomcat: container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt container/branches/tc4.1.x/catalina/build.xml current/tc4.1.x/STATUS.txt

2008-08-12 Thread markt
Author: markt
Date: Tue Aug 12 06:27:27 2008
New Revision: 685143

URL: http://svn.apache.org/viewvc?rev=685143&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45301
Remove a JDK 1.4 dep for the few users that still run TC4 on 1.3 JDKs

Modified:
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
tomcat/container/branches/tc4.1.x/catalina/build.xml
tomcat/current/tc4.1.x/STATUS.txt

Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=685143&r1=685142&r2=685143&view=diff
==
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Tue Aug 12 06:27:27 
2008
@@ -2006,6 +2006,8 @@
 [4.1.38] CoyoteConnector
  Add additional checks for URI normalization.
 
+[4.1.38] CoyoteConnector
+ Remove JDK 1.4 dependency.
 
 
 Jasper Bug Fixes:

Modified: tomcat/container/branches/tc4.1.x/catalina/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/build.xml?rev=685143&r1=685142&r2=685143&view=diff
==
--- tomcat/container/branches/tc4.1.x/catalina/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/catalina/build.xml Tue Aug 12 06:27:27 
2008
@@ -714,6 +714,13 @@
  value="" />
 
 
+
+
+  
+
+
 



Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=685143&r1=685142&r2=685143&view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Tue Aug 12 06:27:27 2008
@@ -25,8 +25,4 @@
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45301
-  Remove a JDK 1.4 dep for the few users that still run TC4 on 1.3 JDKs
-  http://people.apache.org/~markt/patches/2008-07-07-bug45301-tc4.patch
-  +1: markt, yoavs, funkman
-  -1: 
+



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45301] Tomcat 4.1.37 crashes with JDK 1.3

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45301


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #4 from Mark Thomas <[EMAIL PROTECTED]>  2008-08-12 06:27:38 PST ---
This has been fixed in svn and will be included in 4.1.38 onwards.


-- 
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 45617] Resource is not closed

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45617


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Comment #1 from Mark Thomas <[EMAIL PROTECTED]>  2008-08-12 06:45:43 PST ---
If you aren't sure if you have found a bug, creating a bugzilla entry is not
the place to start. The place to start is usually the users list along with
your test case / profiler report etc.

The example you provide createSubcontext() and destroySubcontext() is not a
valid one. If you trace the code through to FileDirContext you will see why.


-- 
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 45618] Selector is not closed.

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45618


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |NEEDINFO




--- Comment #1 from Mark Thomas <[EMAIL PROTECTED]>  2008-08-12 07:01:06 PST ---
Have you observed a memory leak associated with these objects? If so, in what
circumstances?


-- 
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 45613] use of generics in package org.apache.tomcat.util.http

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45613





--- Comment #1 from Mark Thomas <[EMAIL PROTECTED]>  2008-08-12 07:35:52 PST ---
There is some useful work here but also a few things that need to be fixed
before it can be applied to trunk:

- changes such as the one in MimeMap (Hashtable->Map) may break other users of
this class
- Character.isSpace() is not the same as Character.isWhitespace()  (I got
caught out by this a while back)
- Don't comment out code to remove it - delete it. svn can tell us what has
changed and it makes the new code easier to read
- Where the debug field for logging has been removed, the replacement log
messages should all be log.debug(...)
- Spaces are replaced with a tab in at least one place. Tomcat always uses
spaces

Thanks for your efforts so far.


-- 
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: r685177 - /tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java

2008-08-12 Thread markt
Author: markt
Date: Tue Aug 12 08:10:23 2008
New Revision: 685177

URL: http://svn.apache.org/viewvc?rev=685177&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45608
Use AtomicInteger for countAllocated to prevent race conditions. 

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=685177&r1=685176&r2=685177&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Tue Aug 12 
08:10:23 2008
@@ -25,6 +25,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Stack;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.management.ListenerNotFoundException;
 import javax.management.MBeanNotificationInfo;
@@ -114,7 +115,7 @@
  * The count of allocations that are currently active (even if they
  * are for the same instance, as will be true on a non-STM servlet).
  */
-protected int countAllocated = 0;
+protected AtomicInteger countAllocated = new AtomicInteger(0);
 
 
 /**
@@ -314,7 +315,7 @@
  */
 public int getCountAllocated() {
 
-return (this.countAllocated);
+return (this.countAllocated.get());
 
 }
 
@@ -784,7 +785,7 @@
 // condition with unload. Bug 43683, test case #3
 if (!singleThreadModel) {
 newInstance = true;
-countAllocated++;
+countAllocated.incrementAndGet();
 }
 } catch (ServletException e) {
 throw e;
@@ -802,7 +803,7 @@
 // For new instances, count will have been incremented at the
 // time of creation
 if (!newInstance) {
-countAllocated++;
+countAllocated.incrementAndGet();
 }
 return (instance);
 }
@@ -810,7 +811,7 @@
 
 synchronized (instancePool) {
 
-while (countAllocated >= nInstances) {
+while (countAllocated.get() >= nInstances) {
 // Allocate a new instance if possible, or else wait
 if (nInstances < maxInstances) {
 try {
@@ -832,7 +833,7 @@
 }
 if (log.isTraceEnabled())
 log.trace("  Returning allocated STM instance");
-countAllocated++;
+countAllocated.incrementAndGet();
 return (Servlet) instancePool.pop();
 
 }
@@ -853,13 +854,13 @@
 
 // If not SingleThreadModel, no action is required
 if (!singleThreadModel) {
-countAllocated--;
+countAllocated.decrementAndGet();
 return;
 }
 
 // Unlock and free this instance
 synchronized (instancePool) {
-countAllocated--;
+countAllocated.decrementAndGet();
 instancePool.push(servlet);
 instancePool.notify();
 }
@@ -1250,13 +1251,13 @@
 
 // Loaf a while if the current instance is allocated
 // (possibly more than once if non-STM)
-if (countAllocated > 0) {
+if (countAllocated.get() > 0) {
 int nRetries = 0;
 long delay = unloadDelay / 20;
-while ((nRetries < 21) && (countAllocated > 0)) {
+while ((nRetries < 21) && (countAllocated.get() > 0)) {
 if ((nRetries % 10) == 0) {
 log.info(sm.getString("standardWrapper.waiting",
-  new Integer(countAllocated)));
+  countAllocated.toString()));
 }
 try {
 Thread.sleep(delay);



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-08-12 Thread markt
Author: markt
Date: Tue Aug 12 08:12:12 2008
New Revision: 685178

URL: http://svn.apache.org/viewvc?rev=685178&view=rev
Log:
Propose fix for 45608

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=685178&r1=685177&r2=685178&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Aug 12 08:12:12 2008
@@ -122,3 +122,9 @@
   -1: billbarker The patch is horrible, since it drops connections for no good 
reason, simply to 
  protect against a totally brain-dead miss-configurations.  If 
the check is moved into
  the main except loop, then I can go for -0.
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45608
+  Prevent race condition for allocate/deallocate in StandardWrapper
+  http://svn.apache.org/viewvc?rev=685177&view=rev
+  +1: markt
+  -1: 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45608] Race conditions on field countAllocated of class org.apache.catalina.core.StandardWrapper

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45608





--- Comment #1 from Mark Thomas <[EMAIL PROTECTED]>  2008-08-12 08:12:26 PST ---
This has been fixed in trunk and proposed for 6.0.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]



DO NOT REPLY [Bug 45613] use of generics in package org.apache.tomcat.util.http

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45613





--- Comment #2 from Jens Kapitza <[EMAIL PROTECTED]>  2008-08-12 08:31:15 PST 
---
Created an attachment (id=22430)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=22430)
with fixes (use of isSpace) changed to Spaces in Format

Format changes 
remove unneded comments 


-- 
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 45613] use of generics in package org.apache.tomcat.util.http

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45613


Jens Kapitza <[EMAIL PROTECTED]> changed:

   What|Removed |Added

  Attachment #22427|0   |1
is obsolete||
  Attachment #22430|0   |1
is obsolete||




--- Comment #3 from Jens Kapitza <[EMAIL PROTECTED]>  2008-08-12 09:31:51 PST 
---
Created an attachment (id=22431)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=22431)
formating

last tabs removed 

thanks for the information


-- 
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 45608] Race conditions on field countAllocated of class org.apache.catalina.core.StandardWrapper

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45608


Takayuki Kaneko <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE




--- Comment #2 from Takayuki Kaneko <[EMAIL PROTECTED]>  2008-08-12 09:32:44 
PST ---


*** This bug has been marked as a duplicate of bug 43228 ***


-- 
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 43228] StandardWrapper#countAllocated isn't thread-safe

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=43228


Takayuki Kaneko <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]




--- Comment #10 from Takayuki Kaneko <[EMAIL PROTECTED]>  2008-08-12 09:32:44 
PST ---
*** Bug 45608 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45608] Race conditions on field countAllocated of class org.apache.catalina.core.StandardWrapper

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45608


Takayuki Kaneko <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|DUPLICATE   |




--- Comment #3 from Takayuki Kaneko <[EMAIL PROTECTED]>  2008-08-12 09:35:02 
PST ---
I'm sorry.
I only wanted to notify the related 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45621] New: use of generics in package org.apache.tomcat.util

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45621

   Summary: use of generics in package  org.apache.tomcat.util
   Product: Tomcat 6
   Version: unspecified
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Created an attachment (id=22432)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=22432)
java generics

use of generics and change debug output (log.isDebugEnabled())


-- 
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: r685224 - /tomcat/tc6.0.x/trunk/STATUS.txt

2008-08-12 Thread remm
Author: remm
Date: Tue Aug 12 09:55:31 2008
New Revision: 685224

URL: http://svn.apache.org/viewvc?rev=685224&view=rev
Log:
- Votes.

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=685224&r1=685223&r2=685224&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Aug 12 09:55:31 2008
@@ -52,6 +52,7 @@
   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=677473&view=rev
   +1: fhanik
+   0: remm: no idea if it's better or worse (the fact that it's been closed is 
visible)
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45459
@@ -119,6 +120,7 @@
   Test the SSL socket for cert/cipher compatibility before returning it
   http://svn.apache.org/viewvc?rev=684559&view=rev
   +1: markt
+   0: remm: It does look like a hack indeed, but it detects the problem
   -1: billbarker The patch is horrible, since it drops connections for no good 
reason, simply to 
  protect against a totally brain-dead miss-configurations.  If 
the check is moved into
  the main except loop, then I can go for -0.
@@ -127,4 +129,6 @@
   Prevent race condition for allocate/deallocate in StandardWrapper
   http://svn.apache.org/viewvc?rev=685177&view=rev
   +1: markt
+   0: remm: The only unsafe usage of this field is to implement the gimmick 
loop-wait hack,
+which to me means adding any sort of sync is not worth it.
   -1: 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[Tomcat Wiki] Update of "FAQ/Security" by TimFunk

2008-08-12 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The following page has been changed by TimFunk:
http://wiki.apache.org/tomcat/FAQ/Security

The comment on the change is:
Server header

--
   1. [#Q6 How do I restrict access by ip address or remote host?]
   1. [#Q7 How do I use jsvc/procrun to run Tomcat on port 80 securely?]
   1. [#Q8 Has Tomcat's security been independently analyzed or audited?]
+  1. [#Q9 How do I change the Server header in the response?]
+ 
  == Answers ==
  
  [[Anchor(Q1)]]'''How do I use OpenSSL to set up my own Certificate Authority 
(CA)?'''
@@ -57, +59 @@

  
  Yes, by numerous organizations and individuals, many times. Try 
[http://www.google.com/search?sourceid=navclient&ie=UTF-8&q=is+tomcat+secure 
this Google search] and you'll see many references, guides, and analyses. 
  
+ [[Anchor(Q9)]]'''How do I change the Server header in the response?'''
+ 
+ In server.xml - add a "server" attribute to the Connector element. 
http://tomcat.apache.org/tomcat-6.0-doc/config/http.html
+ 
+  
+ 

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 44705] Tomcat 5.5.26 - cookie with colon in name is parsed incorrectly

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44705





--- Comment #7 from David Lewis <[EMAIL PROTECTED]>  2008-08-12 10:09:10 PST ---
As per comment #5, is there a release date set for Tomcat 5.5.27? We have many
servers that need upgrading - but right now we are still using 5.5.25.


-- 
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 44705] Tomcat 5.5.26 - cookie with colon in name is parsed incorrectly

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44705


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 CC|[EMAIL PROTECTED]|




-- 
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 45613] use of generics in package org.apache.tomcat.util.http

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45613





--- Comment #4 from Mark Thomas <[EMAIL PROTECTED]>  2008-08-12 12:13:11 PST ---
Can you remove the code formatting changes? Your first patch was much easier to
review. The later patches hid all the interesting stuff in amongst a huge
volume of  cosmetic changes.

Generally, we try and keep large cosmetic changes as completely separate
patches so all we have to do to review them is skim them to check no code has
changed. I did notice you were using a format for javadoc parameters that uses
a lot of whitespace. Also, it isn't a format that I am aware of us using
anywhere else in the 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 45621] use of generics in package org.apache.tomcat.util

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45621





--- Comment #1 from Mark Thomas <[EMAIL PROTECTED]>  2008-08-12 12:14:27 PST ---
As with your other patch, can you separate the formatting changes and the code
changes please.


-- 
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 45621] use of generics in package org.apache.tomcat.util

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45621


Jens Kapitza <[EMAIL PROTECTED]> changed:

   What|Removed |Added

  Attachment #22432|0   |1
is obsolete||




--- Comment #2 from Jens Kapitza <[EMAIL PROTECTED]>  2008-08-12 13:14:54 PST 
---
Created an attachment (id=22438)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=22438)
remove format changes


-- 
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 45613] use of generics in package org.apache.tomcat.util.http

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45613


Jens Kapitza <[EMAIL PROTECTED]> changed:

   What|Removed |Added

  Attachment #22431|0   |1
is obsolete||




--- Comment #5 from Jens Kapitza <[EMAIL PROTECTED]>  2008-08-12 13:49:46 PST 
---
Created an attachment (id=22440)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=22440)
remove formating


-- 
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 45624] New: javax.servlet.ServletException exception

2008-08-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45624

   Summary: javax.servlet.ServletException  exception
   Product: Tomcat 4
   Version: 4.1.37
  Platform: Sun
OS/Version: Solaris
Status: NEW
  Severity: critical
  Priority: P1
 Component: Unknown
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
CC: [EMAIL PROTECTED]


I got this error when i was trying to access a new application actitime under
webapps ...!


2008-08-12 17:25:43 WebappLoader[/actitime]: Deploy JAR /WEB-INF/lib/pop3.jar
to /usr/apache-tomcat-4.1.37/webapps/actitime/WEB-INF/lib/pop3.jar
2008-08-12 17:25:43 WebappLoader[/actitime]: Deploy JAR /WEB-INF/lib/smtp.jar
to /usr/apache-tomcat-4.1.37/webapps/actitime/WEB-INF/lib/smtp.jar
2008-08-12 17:25:43 WebappLoader[/actitime]: Deploy JAR
/WEB-INF/lib/sqljdbc.jar to
/usr/apache-tomcat-4.1.37/webapps/actitime/WEB-INF/lib/sqljdbc.jar
2008-08-12 17:25:43 WebappLoader[/actitime]: Deploy JAR /WEB-INF/lib/struts.jar
to /usr/apache-tomcat-4.1.37/webapps/actitime/WEB-INF/lib/struts.jar
2008-08-12 17:25:43 WebappLoader[/actitime]: Deploy JAR
/WEB-INF/lib/xercesImpl.jar to
/usr/apache-tomcat-4.1.37/webapps/actitime/WEB-INF/lib/xercesImpl.jar
2008-08-12 17:25:43 WebappLoader[/actitime]: Deploy JAR
/WEB-INF/lib/xml-apis.jar to
/usr/apache-tomcat-4.1.37/webapps/actitime/WEB-INF/lib/xml-apis.jar
2008-08-12 17:25:45 StandardManager[/actitime]: Seeding random number generator
class java.security.SecureRandom
2008-08-12 17:25:45 StandardManager[/actitime]: Seeding of random number
generator has been completed
2008-08-12 17:25:45 StandardWrapper[/actitime:default]: Loading container
servlet default
2008-08-12 17:25:52 StandardWrapper[/actitime:invoker]: Loading container
servlet invoker

2008-08-12 19:21:37 StandardWrapperValve[action]: Servlet.service() for servlet
action threw exception
javax.servlet.ServletException: Servlet execution threw an exception
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:221)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:145)
at com.actimind.actitime.SystemSettingsFilter.doFilter(Unknown Source)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:165)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:145)
at com.actimind.actitime.CustomerProjectFilter.doFilter(Unknown Source)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:165)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:145)
at com.actimind.actitime.UserInfoFilter.doFilter(Unknown Source)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:165)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:145)
at com.actimind.actitime.CompressionFilter.doFilter(Unknown Source)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:165)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:145)
at com.actimind.actitime.PageEncodingFilter.doFilter(Unknown Source)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:165)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:145)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:210)
at
org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:596)
at
org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:433)
at
org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:955)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:139)
at
org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:596)
at
org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:433)
at
org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:955)
at
org.apache.catalina.core.StandardContext.invoke(StandardContext.java:2460)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:133)
at
org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:596)
at
org.apache.catalina.valves.ErrorDispatcherValve.invoke(ErrorDispatcherValve.java:119)
at
org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:594)
at
org.apache.catalina.valves.ErrorReportValve.invoke(Error