Update of /cvsroot/webware/Webware/WebKit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31718/WebKit
Modified Files:
Application.py
Log Message:
Fixing bug in restoring request after an exception occurs in includeURL.
This bug manifested itself in broken behavior when you had three or
more levels of forwarding -- page A forwards to page B, which forwards
to page C.
Index: Application.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Application.py,v
retrieving revision 1.181
retrieving revision 1.182
diff -C2 -d -r1.181 -r1.182
*** Application.py 2 Apr 2004 03:53:58 -0000 1.181
--- Application.py 25 Aug 2004 23:56:33 -0000 1.182
***************
*** 617,631 ****
req.setURLPath(urlPath)
req.addParent(currentServlet)
!
! servlet = self._rootURLParser.findServletForTransaction(trans)
! trans._servlet = servlet
! servlet.runTransaction(trans)
! self.returnServlet(servlet, trans)
! req.setURLPath(currentPath)
! req._serverSidePath = currentServerSidePath
! req._serverSideContextPath = currentServerSideContextPath
! req._contextName = currentContextName
! req.popParent()
! trans._servlet = currentServlet
def resolveInternalRelativePath(self, trans, url, context=None):
--- 617,639 ----
req.setURLPath(urlPath)
req.addParent(currentServlet)
! # We use a try/finally to make sure everything gets restored properly
! # in the event of an exception in an included servlet.
! try:
! servlet = self._rootURLParser.findServletForTransaction(trans)
! trans._servlet = servlet
! # We will interpret an EndResponse in an included page to mean that
! # the current page may continue processing.
! try:
! servlet.runTransaction(trans)
! except EndResponse:
! pass
! self.returnServlet(servlet, trans)
! finally:
! req.popParent()
! req.setURLPath(currentPath)
! req._serverSidePath = currentServerSidePath
! req._serverSideContextPath = currentServerSideContextPath
! req._contextName = currentContextName
! trans._servlet = currentServlet
def resolveInternalRelativePath(self, trans, url, context=None):
|