From be827a813a53d0be5d521975ebcb06513b04e6a1 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 8 Sep 2011 11:44:38 +0200 Subject: [FIX] document_webdav: make sure the headers is a dict. bzr revid: vmt@openerp.com-20110908094438-rpqz2k5xn0pmhigx --- addons/document_webdav/webdav_server.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'addons/document_webdav/webdav_server.py') diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index e23daab9f66..e92c7f1994c 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -174,11 +174,11 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): pass elif self.close_connection == 1: # close header already sent pass - else: - if headers is None: - headers = {} - if self.headers.get('Connection',False) == 'Keep-Alive': - headers['Connection'] = 'keep-alive' + elif headers and self.headers.get('Connection',False) == 'Keep-Alive': + headers['Connection'] = 'keep-alive' + + if headers is None: + headers = {} DAVRequestHandler.send_body(self, DATA, code=code, msg=msg, desc=desc, ctype=ctype, headers=headers) -- cgit v1.2.3 From 1a40e512944c8562bc3e2ecb4d742e990b6e8720 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 8 Sep 2011 14:31:15 +0200 Subject: [REF] document_webdav: reg_http_service accepts the HTTPDir arguments, renamed auth_proxy to auth_provider. bzr revid: vmt@openerp.com-20110908123115-meorb9rnc2j0rb40 --- addons/document_webdav/webdav_server.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'addons/document_webdav/webdav_server.py') diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index e92c7f1994c..eb4ab86fc1e 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -40,7 +40,7 @@ from dav_fs import openerp_dav_handler from tools.config import config from DAV.WebDAVServer import DAVRequestHandler from service import http_server -from service.websrv_lib import HTTPDir, FixSendError, HttpOptions +from service.websrv_lib import FixSendError, HttpOptions from BaseHTTPServer import BaseHTTPRequestHandler import urlparse import urllib @@ -572,7 +572,7 @@ try: conf = OpenDAVConfig(**_dc) handler._config = conf - reg_http_service(HTTPDir(directory,DAVHandler,DAVAuthProvider())) + reg_http_service(directory, DAVHandler, DAVAuthProvider()) logging.getLogger('webdav').info("WebDAV service registered at path: %s/ "% directory) if not (config.get_misc('webdav', 'no_root_hack', False)): @@ -592,9 +592,7 @@ try: # the StaticHttpHandler can find its dir_path. config.misc.setdefault('static-http',{})['dir_path'] = dir_path - if reg_http_service(HTTPDir('/', DAVStaticHandler)): - logging.getLogger("web-services").info("WebDAV registered HTTP dir %s for /" % \ - (dir_path)) + reg_http_service('/', DAVStaticHandler) except Exception, e: logging.getLogger('webdav').error('Cannot launch webdav: %s' % e) @@ -613,8 +611,7 @@ def init_well_known(): reps['/'+uri] = path if int(num_svcs): - if http_server.reg_http_service(HTTPDir('/.well-known', RedirectHTTPHandler)): - logging.getLogger("web-services").info("Registered HTTP redirect handler at /.well-known" ) + reg_http_service('/.well-known', RedirectHTTPHandler) init_well_known() @@ -641,7 +638,7 @@ def init_principals_redirect(): dbname = config.get('db_name', False) if dbname: PrincipalsRedirect.redirect_paths[''] = '/webdav/%s/principals' % dbname - reg_http_service(HTTPDir('/principals', PrincipalsRedirect)) + reg_http_service('/principals', PrincipalsRedirect) logging.getLogger("web-services").info( "Registered HTTP redirect handler for /principals to the %s db.", dbname) -- cgit v1.2.3 From 6ba60770b84671d63cac494909032a361f17dd5b Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 9 Sep 2011 14:30:05 +0200 Subject: [FIX] websrv_lib: commit associated to a change in the server: revno 3548, revid vmt@openerp.com-20110909122856-29uhsjfe193fqdi8 bzr revid: vmt@openerp.com-20110909123005-aqbixbe7xj0nwlc9 --- addons/document_webdav/webdav_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/document_webdav/webdav_server.py') diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index eb4ab86fc1e..aeff0a23f25 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -572,7 +572,7 @@ try: conf = OpenDAVConfig(**_dc) handler._config = conf - reg_http_service(directory, DAVHandler, DAVAuthProvider()) + reg_http_service(directory, DAVHandler, DAVAuthProvider) logging.getLogger('webdav').info("WebDAV service registered at path: %s/ "% directory) if not (config.get_misc('webdav', 'no_root_hack', False)): -- cgit v1.2.3