merge trunk

bzr revid: nicolas.vanhoren@openerp.com-20131018134553-a7dshmtv8yp70qzp

diff --git a/openerp/http.py b/openerp/http.py
index 4cdf1d1..7bad66c 100644 (file)
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -189,6 +189,8 @@ class WebRequest(object):
 
 def auth_method_user():
     request.uid = request.session.uid
+    if not request.uid:
+        raise SessionExpiredException("Session expired")
 
 def auth_method_admin():
     if not request.db: