Winstone Servlet Container

Update of /cvsroot/winstone/winstone/src/java/winstone
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6529/src/java/winstone

Modified Files:
	RequestHandlerThread.java 
Log Message:
fix session error on redirect

Index: RequestHandlerThread.java
===================================================================
RCS file: /cvsroot/winstone/winstone/src/java/winstone/RequestHandlerThread.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RequestHandlerThread.java	17 Aug 2005 06:08:44 -0000	1.8
--- RequestHandlerThread.java	18 Aug 2005 15:03:42 -0000	1.9
***************
*** 129,132 ****
--- 129,133 ----
                              continue;
                          }
+                         req.setWebAppConfig(webAppConfig);
  
                          // Now we've verified it's in the right webapp, send
***************
*** 190,193 ****
--- 191,197 ----
                      this.listener.deallocateRequestResponse(this, req, rsp,
                              inData, outData);
+                 } catch (Throwable errClose) {
+                 }
+                 try {
                      this.listener.releaseSocket(this.socket, inSocket,
                              outSocket); // shut sockets

Update of /cvsroot/winstone/winstone/src/java/winstone
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6247/src/java/winstone

Modified Files:
	StaticResourceServlet.java 
Log Message:
fixed small bug in static servlet so that forwarding to static pages works as expected

Index: StaticResourceServlet.java
===================================================================
RCS file: /cvsroot/winstone/winstone/src/java/winstone/StaticResourceServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StaticResourceServlet.java	12 Aug 2005 04:04:39 -0000	1.5
--- StaticResourceServlet.java	18 Aug 2005 02:28:11 -0000	1.6
***************
*** 88,93 ****
          if (isInclude)
              path = (String) request.getAttribute(INCLUDE_PATH_INFO);
-         else if (isForward)
-             path = (String) request.getAttribute(FORWARD_PATH_INFO);
          else if (request.getPathInfo() != null)
              path = request.getPathInfo();
--- 88,91 ----
***************
*** 121,130 ****
  
          // Check we are not below the web-inf
!         else if (!isInclude && isDescendant(new File(this.webRoot, "WEB-INF"), res, this.webRoot)) 
              response.sendError(HttpServletResponse.SC_NOT_FOUND, this.resources
                      .getString("StaticResourceServlet.PathInvalid", path));
  
          // Check we are not below the meta-inf
!         else if (!isInclude && isDescendant(new File(this.webRoot, "META-INF"), res, this.webRoot)) 
              response.sendError(HttpServletResponse.SC_NOT_FOUND, this.resources
                      .getString("StaticResourceServlet.PathInvalid", path));
--- 119,128 ----
  
          // Check we are not below the web-inf
!         else if (!isInclude && !isForward && !isDescendant(new File(this.webRoot, "WEB-INF"), res, this.webRoot)) 
              response.sendError(HttpServletResponse.SC_NOT_FOUND, this.resources
                      .getString("StaticResourceServlet.PathInvalid", path));
  
          // Check we are not below the meta-inf
!         else if (!isInclude && !isForward && isDescendant(new File(this.webRoot, "META-INF"), res, this.webRoot)) 
              response.sendError(HttpServletResponse.SC_NOT_FOUND, this.resources
                      .getString("StaticResourceServlet.PathInvalid", path));