enable-http2 -> http2

This commit is contained in:
Eelco Dolstra 2017-10-30 11:00:59 +01:00
parent 049322702b
commit f9686885be
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 2 additions and 2 deletions

View file

@ -1937,7 +1937,7 @@ void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
} else
url = state.forceStringNoCtx(*args[0], pos);
if (state.restricted && !expectedHash)
if (state.restricted)
throw Error(format("'%1%' is not allowed in restricted mode") % who);
Path res = getDownloader()->downloadCached(state.store, url, unpack, name, expectedHash);

View file

@ -271,7 +271,7 @@ public:
"Number of parallel HTTP connections.",
{"binary-caches-parallel-connections"}};
Setting<bool> enableHttp2{this, true, "enable-http2",
Setting<bool> enableHttp2{this, true, "http2",
"Whether to enable HTTP/2 support."};
Setting<unsigned int> tarballTtl{this, 60 * 60, "tarball-ttl",