Merge branch 'master' into feat/windows-benchmark

kibertoad · Jun 8, 2020 · c62eccb · c62eccb
2 parents 4d7e556 + df40dac
commit c62eccb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/docs/Server.md b/docs/Server.md
@@ -194,6 +194,8 @@ fastify.addHook('onResponse', (req, reply, done) => {
 })
 ```
 
+Please note that this setting will also disable an error log written by the the default `onResponse` hook on reply callback errors.
+
 <a name="custom-http-server"></a>
 ### `serverFactory`
 You can pass a custom http server to Fastify by using the `serverFactory` option.<br/>

diff --git a/package.json b/package.json
@@ -105,7 +105,7 @@
     "ajv-i18n": "^3.5.0",
     "ajv-merge-patch": "^4.1.0",
     "ajv-pack": "^0.3.1",
-    "autocannon": "^4.0.0",
+    "autocannon": "^5.0.0",
     "branch-comparer": "^1.0.2",
     "concurrently": "^5.0.2",
     "cors": "^2.8.5",