1.1 --- a/WebStack/Adapters/Webware.py Thu Nov 17 19:21:34 2005 +0000
1.2 +++ b/WebStack/Adapters/Webware.py Sat Nov 19 23:59:54 2005 +0000
1.3 @@ -158,21 +158,24 @@
1.4 """
1.5
1.6 new_trans = WebStack.Webware.Transaction(trans)
1.7 - if self.webstack_authenticator is None or self.webstack_authenticator.authenticate(new_trans):
1.8 - try:
1.9 - self.webstack_resource.respond(new_trans)
1.10 - except EndOfResponse:
1.11 - pass
1.12 - except:
1.13 - if self.handle_errors:
1.14 - new_trans.set_response_code(500) # Internal error
1.15 - else:
1.16 - raise
1.17 - else:
1.18 - new_trans.set_response_code(401) # Unauthorized
1.19 - new_trans.set_header_value("WWW-Authenticate", '%s realm="%s"' % (
1.20 - self.webstack_authenticator.get_auth_type(), self.webstack_authenticator.get_realm()))
1.21
1.22 - new_trans.commit()
1.23 + try:
1.24 + if self.webstack_authenticator is None or self.webstack_authenticator.authenticate(new_trans):
1.25 + try:
1.26 + self.webstack_resource.respond(new_trans)
1.27 + except EndOfResponse:
1.28 + pass
1.29 + except:
1.30 + if self.handle_errors:
1.31 + new_trans.set_response_code(500) # Internal error
1.32 + else:
1.33 + raise
1.34 + else:
1.35 + new_trans.set_response_code(401) # Unauthorized
1.36 + new_trans.set_header_value("WWW-Authenticate", '%s realm="%s"' % (
1.37 + self.webstack_authenticator.get_auth_type(), self.webstack_authenticator.get_realm()))
1.38 +
1.39 + finally:
1.40 + new_trans.commit()
1.41
1.42 # vim: tabstop=4 expandtab shiftwidth=4