From 5404b8b4e728c61af4c764b8d3867ed9b13cab3a Mon Sep 17 00:00:00 2001 From: Jordi Ballester Alomar Date: Sun, 18 Feb 2018 01:02:51 +0100 Subject: [PATCH 1/4] [FIX] doc: update default values limit_memory_soft and limit_memory_hard had values default different that the ones written in the documentation Introduced at 3ef93918a Closes #23131 --- doc/reference/cmdline.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst index e223e4a50b7..0e9094a898f 100644 --- a/doc/reference/cmdline.rst +++ b/doc/reference/cmdline.rst @@ -54,7 +54,7 @@ Running the server Maximum allowed virtual memory per worker. If the limit is exceeded, the worker is killed and recycled at the end of the current request. - Defaults to 640MB. + Defaults to 2048MB. .. option:: --limit-memory-hard @@ -62,7 +62,7 @@ Running the server immediately killed without waiting for the end of the current request processing. - Defaults to 768MB. + Defaults to 2560MB. .. option:: --limit-time-cpu From 965f49201812cc3cca319a3b5b93331272dd2288 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 15 Feb 2018 15:44:07 +0100 Subject: [PATCH 2/4] [FIX] website: don't include empty keyword & description metas Apparently, SEO audit thingies (possibly google's own? unclear) don't ignore *empty* keyword or description meta tags, then complain that they're duplicated (there's a use case for SQL-like nulls). So remove the keyword & description metas entirely if the corresponding fields are empty. OPW-815492 --- addons/website/views/website_templates.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 6a67acf7dc5..81a860ad21b 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -104,12 +104,15 @@ - - + + + + + From ca36c0542cc7835ff95822010bfffcf535b5ecc9 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Mon, 19 Feb 2018 11:14:39 +0100 Subject: [PATCH 3/4] [CLA] signature for XOE and blaggacao Backport of de803378f10c4cc912e1bdcd8520ea1f4122b3ed from 10.0, in order to allow PRs in 9.0 Closes #19210 --- doc/cla/corporate/xoe-corp.md | 15 +++++++++++++++ doc/cla/individual/blaggacao.md | 12 ++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 doc/cla/corporate/xoe-corp.md create mode 100644 doc/cla/individual/blaggacao.md diff --git a/doc/cla/corporate/xoe-corp.md b/doc/cla/corporate/xoe-corp.md new file mode 100644 index 00000000000..ef449e25d72 --- /dev/null +++ b/doc/cla/corporate/xoe-corp.md @@ -0,0 +1,15 @@ +Colombia, 2016-04-20 + +Xoe Corp SAS. agrees to the terms of the Odoo Corporate Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +David Arnold dar@xoe.solutions https://github.com/blaggacao + +List of contributors: + +David Arnold dar@devco.co https://github.com/blaggacao diff --git a/doc/cla/individual/blaggacao.md b/doc/cla/individual/blaggacao.md new file mode 100644 index 00000000000..30b2fee69a0 --- /dev/null +++ b/doc/cla/individual/blaggacao.md @@ -0,0 +1,12 @@ +Colombia, 2017-09-01 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +David Arnold dar@xoe.solutions https://github.com/blaggacao + From 5d086cea9b97cec4fe8d07bf6cb06b3d7ee28af7 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Mon, 19 Feb 2018 11:14:39 +0100 Subject: [PATCH 4/4] [FIX] rpc: correctly handle xmlrpclib.Fault The error string was always missing, despite being provided. Backport in #22276 courtesy of Yenthe V.G Fixes #13111 Closes #21741 Closes #22276 --- openerp/service/wsgi_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/service/wsgi_server.py b/openerp/service/wsgi_server.py index 8bbcc18030e..a743475b865 100644 --- a/openerp/service/wsgi_server.py +++ b/openerp/service/wsgi_server.py @@ -65,7 +65,7 @@ def xmlrpc_return(start_response, service, method, params, string_faultcode=Fals def xmlrpc_handle_exception_int(e): if isinstance(e, openerp.exceptions.UserError): - fault = xmlrpclib.Fault(RPC_FAULT_CODE_WARNING, openerp.tools.ustr(e.value)) + fault = xmlrpclib.Fault(RPC_FAULT_CODE_WARNING, openerp.tools.ustr(e.name)) response = xmlrpclib.dumps(fault, allow_none=False, encoding=None) elif isinstance(e, openerp.exceptions.RedirectWarning): fault = xmlrpclib.Fault(RPC_FAULT_CODE_WARNING, str(e))