Merge pull request #780 from plone/http11

Fixing #779 by settings http protocol and allowing to set keep alive …

CHANGELOG.rst

@@ -5,6 +5,8 @@ CHANGELOG
 6.0.0a2 (unreleased)
 --------------------
 
+- Adapt to HTTP1.1 protocol on uvicorn by default
+  [bloodbare]
 - PatchField: added operation "multi"
   [masipcat]
 - @duplicate: added option to reset acl

guillotina/_settings.py

@@ -91,5 +91,6 @@
     "search_parser": "default",
     "object_reader": "guillotina.db.reader.reader",
     "thread_pool_workers": 32,
+    "server_settings": {"uvicorn": {"timeout_keep_alive": 5, "http": "h11"}},
 }
 default_settings = copy.deepcopy(app_settings)

guillotina/commands/server.py

@@ -17,6 +17,7 @@ def get_parser(self):
         )
         parser.add_argument("--port", help="Override port to run this server on", default=None, type=int)
         parser.add_argument("--host", help="Override host to run this server on", default=None)
+
         parser.add_argument("--asgi-server", default="uvicorn", type=str)
         return parser
 
@@ -27,11 +28,17 @@ def run(self, arguments, settings, app):
         if arguments.asgi_server == "uvicorn":
             import uvicorn  # type: ignore
 
-            config = uvicorn.Config(app, host=host, port=port, reload=arguments.reload, access_log=False)
+            config = uvicorn.Config(
+                app,
+                host=host,
+                port=port,
+                reload=arguments.reload,
+                access_log=False,
+                **settings["server_settings"]["uvicorn"],
+            )
             server = uvicorn.Server(config)
             self.loop.run_until_complete(server.serve())
 
-            # uvicorn.run(app, host=host, port=port, reload=arguments.reload, access_log=False, loop=self.loop)
         elif arguments.asgi_server == "hypercorn":
             import asyncio
 

guillotina/contrib/dbusers/services/__init__.py

@@ -1,6 +1,6 @@
 from . import groups  # noqa
-from . import users  # noqa
 from . import roles  # noqa
+from . import users  # noqa
 from guillotina import configure
 from guillotina.api.content import DefaultPOST
 from guillotina.contrib.dbusers.content.groups import IGroupManager

guillotina/contrib/dbusers/services/roles.py

@@ -9,7 +9,7 @@
     name="@available-roles",
     permission="guillotina.ManageUsers",
     summary="Get available roles on guillotina container",
-    method="GET"
+    method="GET",
 )
 class AvailableRoles(Service):
     async def __call__(self):