diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-10-30T10·00+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-10-30T10·00+0100 |
| commit | f9686885be54a9b0f8947713a414de4ad3182037 (patch) | |
| tree | b8aa21aa92e361cd32d559504291ad994a78be4a | |
| parent | 049322702b5629c1058249370d38ae8d23f47bdd (diff) | |
enable-http2 -> http2
| -rw-r--r-- | src/libexpr/primops.cc | 2 | ||||
| -rw-r--r-- | src/libstore/globals.hh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index a01af05e3c7c..22925ba4de19 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -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); diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 880527322794..538273b546be 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -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", |