diff options
| author | P. Christeas <p_christ@hol.gr> | 2010-12-23 16:14:03 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2010-12-23 16:14:03 +0200 |
| commit | 6d38e064e22553c980ff7c663779b13e5fec7d3f (patch) | |
| tree | 79c1dfbe69329af65cc8bf9239f8cf61c564e703 /addons/document_webdav/webdav_server.py | |
| parent | 40201bfea2756b5681c8ef265fd8573d6d70726f (diff) | |
doc webdav: revert changes, that would break https
See commit 848c3f9ad2df3. Again, read it a few times.
bzr revid: p_christ@hol.gr-20101223141403-6qbj4ysz06mmvuih
Diffstat (limited to 'addons/document_webdav/webdav_server.py')
| -rw-r--r-- | addons/document_webdav/webdav_server.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index 82268ef8b1e..5b0b418e9a1 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -92,13 +92,14 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): def setup(self): self.davpath = '/'+config.get_misc('webdav','vdir','webdav') addr, port = self.server.server_name, self.server.server_port + server_proto = getattr(self.server,'proto', 'http').lower() try: - addr, port = self.request.getsockname() + if hasattr(self.request, 'getsockname'): + addr, port = self.request.getsockname() except Exception, e: - - self.log_error("Cannot calculate own address:" , e) - self.baseuri = "http://%s:%d/"% (addr, port) - + self.log_error("Cannot calculate own address: %s" , e) + # Too early here to use self.headers + self.baseuri = "%s://%s:%d/"% (server_proto, addr, port) self.IFACE_CLASS = openerp_dav_handler(self, self.verbose) def copymove(self, CLASS): |