0
Fork 0
mirror of https://github.com/verdaccio/verdaccio.git synced 2024-12-30 22:34:10 -05:00

Merge remote-tracking branch 'origin/master' into 4.x

# Conflicts:
#	CHANGELOG.md
#	package.json
#	yarn.lock
This commit is contained in:
Juan Picado @jotadeveloper 2019-02-07 19:35:35 +01:00
commit c4747d0260
No known key found for this signature in database
GPG key ID: 18AC54485952D158
3 changed files with 24 additions and 2 deletions

View file

@ -66,6 +66,28 @@ All notable changes to this project will be documented in this file. See [standa
* replaced lunr by lunr-mutable ([#915](https://github.com/verdaccio/verdaccio/issues/915)) ([1602840](https://github.com/verdaccio/verdaccio/commit/1602840))
* verdaccio update notification on CLI ([#988](https://github.com/verdaccio/verdaccio/issues/988)) ([#998](https://github.com/verdaccio/verdaccio/issues/998)) ([bc04703](https://github.com/verdaccio/verdaccio/commit/bc04703))
<a name="3.11.3"></a>
## [3.11.3](https://github.com/verdaccio/verdaccio/compare/v3.11.2...v3.11.3) (2019-02-07)
### Bug Fixes
* server keepAliveTimeout is in milliseconds, config value in seconds. ([7f79c77](https://github.com/verdaccio/verdaccio/commit/7f79c77))
<a name="3.11.2"></a>
## [3.11.2](https://github.com/verdaccio/verdaccio/compare/v3.11.1...v3.11.2) (2019-02-05)
### Bug Fixes
* lodash vulnerability ([c35486d](https://github.com/verdaccio/verdaccio/commit/c35486d))
<a name="3.11.1"></a>
## [3.11.1](https://github.com/verdaccio/verdaccio/compare/v3.11.0...v3.11.1) (2019-01-31)

View file

@ -15,7 +15,7 @@
"verdaccio": "./bin/verdaccio"
},
"dependencies": {
"@verdaccio/file-locking": "0.0.7",
"@verdaccio/file-locking": "0.0.8",
"@verdaccio/local-storage": "2.0.0-beta.1",
"@verdaccio/streams": "2.0.0-beta.0",
"JSONStream": "1.3.4",

View file

@ -50,7 +50,7 @@ function startVerdaccio(config: any, cliListen: string, configPath: string, pkgV
}
if (config.server && config.server.keepAliveTimeout) {
// $FlowFixMe library definition for node is not up to date (doesn't contain recent 8.0 changes)
webServer.keepAliveTimeout = config.server.keepAliveTimeout;
webServer.keepAliveTimeout = config.server.keepAliveTimeout * 1000;
}
unlinkAddressPath(addr);