Christophe (OpenERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-proxymode-chs into lp:openobject-server.
Requested reviews: OpenERP Core Team (openerp) For more details, see: https://code.launchpad.net/~openerp-dev/openobject-server/trunk-proxymode-chs/+merge/91041 -- https://code.launchpad.net/~openerp-dev/openobject-server/trunk-proxymode-chs/+merge/91041 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/trunk-proxymode-chs.
=== modified file 'openerp/tools/config.py' --- openerp/tools/config.py 2012-01-20 15:00:50 +0000 +++ openerp/tools/config.py 2012-02-01 10:31:21 +0000 @@ -3,6 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). +# Copyright (C) 2010-2012 OpenERP s.a. (<http://openerp.com>). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -116,6 +117,8 @@ help="specify the TCP port for the XML-RPC protocol", type="int") group.add_option("--no-xmlrpc", dest="xmlrpc", action="store_false", my_default=True, help="disable the XML-RPC protocol") + group.add_option("--proxy-mode", dest="proxy_mode", action="store_true", my_default=False, + help="Enable correct behavior when behind a reverse proxy") parser.add_option_group(group) # XML-RPC / HTTPS @@ -383,7 +386,7 @@ 'language', 'translate_out', 'translate_in', 'overwrite_existing_translations', 'debug_mode', 'smtp_ssl', 'load_language', 'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog', - 'list_db', 'xmlrpcs', + 'list_db', 'xmlrpcs', 'proxy_mode', 'test_file', 'test_disable', 'test_commit', 'test_report_directory', 'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'virtual_memory_limit', 'virtual_memory_reset', 'cpu_time_limit', 'unaccent', === modified file 'openerp/wsgi.py' --- openerp/wsgi.py 2012-01-20 17:20:18 +0000 +++ openerp/wsgi.py 2012-02-01 10:31:21 +0000 @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2011 OpenERP s.a. (<http://openerp.com>). +# Copyright (C) 2011-2012 OpenERP s.a. (<http://openerp.com>). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -402,6 +402,17 @@ start_response('404 Not Found', [('Content-Type', 'text/plain'), ('Content-Length', str(len(response)))]) return [response] +def init_proxy_mode(): + global application + if config['proxy_mode']: + try: + from werkzeug.contrib.fixers import ProxyFix + except ImportError: + logging.getLogger('wsgi').error('Werkzeug module unavailable. Cannot activate proxy mode') + config['proxy_mode'] = False + else: + application = ProxyFix(application) + # The WSGI server, started by start_server(), stopped by stop_server(). httpd = None @@ -419,15 +430,16 @@ # TODO Change the xmlrpc_* options to http_* interface = config['xmlrpc_interface'] or '0.0.0.0' port = config['xmlrpc_port'] + proxy_msg = ' in proxy mode' if config['proxy_mode'] else '' try: import werkzeug.serving httpd = werkzeug.serving.make_server(interface, port, application, threaded=True) - logging.getLogger('wsgi').info('HTTP service (werkzeug) running on %s:%s', interface, port) + logging.getLogger('wsgi').info('HTTP service (werkzeug) running on %s:%s%s', interface, port, proxy_msg) except ImportError: import wsgiref.simple_server logging.getLogger('wsgi').warn('Werkzeug module unavailable, falling back to wsgiref.') httpd = wsgiref.simple_server.make_server(interface, port, application) - logging.getLogger('wsgi').info('HTTP service (wsgiref) running on %s:%s', interface, port) + logging.getLogger('wsgi').info('HTTP service (wsgiref) running on %s:%s%s', interface, port, proxy_msg) httpd.serve_forever() @@ -436,6 +448,7 @@ The WSGI server can be shutdown with stop_server() below. """ + openerp.wsgi.init_proxy_mode() threading.Thread(target=openerp.wsgi.serve).start() def stop_server(): @@ -457,6 +470,7 @@ #openerp.tools.cache = kill_workers_cache openerp.netsvc.init_logger() openerp.osv.osv.start_object_proxy() + openerp.wsgi.init_proxy_mode() openerp.service.web_services.start_web_services() openerp.modules.module.initialize_sys_path() openerp.modules.loading.open_openerp_namespace()
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp
