diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py index 9bfb9397d190d7f5303159c7b1018f0795ada5e2..57fe21d8fea2194c19b02297c4d72cd66c20633b 100644 --- a/openerp/service/http_server.py +++ b/openerp/service/http_server.py @@ -246,7 +246,6 @@ class XMLRPCRequestHandler(FixSendError,HttpLogHandler,SimpleXMLRPCServer.Simple self.connection = dummyconn() self.rpc_paths = map(lambda s: '/%s' % s, netsvc.ExportService._services.keys()) - def init_xmlrpc(): if tools.config.get('xmlrpc', False): # Example of http file serving: @@ -260,50 +259,6 @@ def init_xmlrpc(): reg_http_service('/xmlrpc/', XMLRPCRequestHandler, secure_only=True) logging.getLogger("web-services").info("Registered XML-RPC over HTTPS only") -class StaticHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler): - _logger = logging.getLogger('httpd') - _HTTP_OPTIONS = { 'Allow': ['OPTIONS', 'GET', 'HEAD'] } - - def __init__(self,request, client_address, server): - HTTPHandler.__init__(self,request,client_address,server) - document_root = tools.config.get('static_http_document_root', False) - assert document_root, "Please specify static_http_document_root in configuration, or disable static-httpd!" - self.__basepath = document_root - - def translate_path(self, path): - """Translate a /-separated PATH to the local filename syntax. - - Components that mean special things to the local file system - (e.g. drive or directory names) are ignored. (XXX They should - probably be diagnosed.) - - """ - # abandon query parameters - path = path.split('?',1)[0] - path = path.split('#',1)[0] - path = posixpath.normpath(urllib.unquote(path)) - words = path.split('/') - words = filter(None, words) - path = self.__basepath - for word in words: - if word in (os.curdir, os.pardir): continue - path = os.path.join(path, word) - return path - -def init_static_http(): - if not tools.config.get('static_http_enable', False): - return - - document_root = tools.config.get('static_http_document_root', False) - assert document_root, "Document root must be specified explicitly to enable static HTTP service (option --static-http-document-root)" - - base_path = tools.config.get('static_http_url_prefix', '/') - - reg_http_service(base_path, StaticHTTPHandler) - - logging.getLogger("web-services").info("Registered HTTP dir %s for %s" % \ - (document_root, base_path)) - import security class OpenERPAuthProvider(AuthProvider): diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 69155f99966d1e3619dc1bd0afee0e3076ba62f6..94660939af89001e8663eb24d9ab9b982f073ebc 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -143,13 +143,6 @@ class configmanager(object): help="disable the NETRPC protocol") parser.add_option_group(group) - # Static HTTP - group = optparse.OptionGroup(parser, "Static HTTP service") - group.add_option("--static-http-enable", dest="static_http_enable", action="store_true", my_default=False, help="enable static HTTP service for serving plain HTML files") - group.add_option("--static-http-document-root", dest="static_http_document_root", help="specify the directory containing your static HTML files (e.g '/var/www/')") - group.add_option("--static-http-url-prefix", dest="static_http_url_prefix", help="specify the URL root prefix where you want web browsers to access your static HTML files (e.g '/')") - parser.add_option_group(group) - # Testing Group group = optparse.OptionGroup(parser, "Testing Configuration") group.add_option("--test-file", dest="test_file", my_default=False, @@ -341,7 +334,6 @@ class configmanager(object): 'netrpc', 'xmlrpc', 'syslog', 'without_demo', 'timezone', 'xmlrpcs_interface', 'xmlrpcs_port', 'xmlrpcs', 'secure_cert_file', 'secure_pkey_file', - 'static_http_enable', 'static_http_document_root', 'static_http_url_prefix' ] for arg in keys: