diff options
author | Matthew Holt <mholt@users.noreply.github.com> | 2019-08-22 13:38:37 -0600 |
---|---|---|
committer | Matthew Holt <mholt@users.noreply.github.com> | 2019-08-22 13:38:37 -0600 |
commit | af25f0254e94eb2e2898ba495bfc3de209a49e79 (patch) | |
tree | 79f20651d4fcdb27fe5c3299892576d38e82badb /caddyconfig/httpcaddyfile/global.go | |
parent | a0fd2b6c0abbd9c121ecf779058fd348327b5e0c (diff) |
caddyfile: Support global config block; allow non-empty blocks w/ 0 keys
Diffstat (limited to 'caddyconfig/httpcaddyfile/global.go')
-rw-r--r-- | caddyconfig/httpcaddyfile/global.go | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/caddyconfig/httpcaddyfile/global.go b/caddyconfig/httpcaddyfile/global.go new file mode 100644 index 0000000..067d06e --- /dev/null +++ b/caddyconfig/httpcaddyfile/global.go @@ -0,0 +1,53 @@ +// Copyright 2015 Matthew Holt and The Caddy Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package httpcaddyfile + +import ( + "strconv" + + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" +) + +func parseHTTPPort(d *caddyfile.Dispenser) (int, error) { + var httpPort int + for d.Next() { + var httpPortStr string + if !d.AllArgs(&httpPortStr) { + return 0, d.ArgErr() + } + var err error + httpPort, err = strconv.Atoi(httpPortStr) + if err != nil { + return 0, d.Errf("converting port '%s' to integer value: %v", httpPortStr, err) + } + } + return httpPort, nil +} + +func parseHTTPSPort(d *caddyfile.Dispenser) (int, error) { + var httpsPort int + for d.Next() { + var httpsPortStr string + if !d.AllArgs(&httpsPortStr) { + return 0, d.ArgErr() + } + var err error + httpsPort, err = strconv.Atoi(httpsPortStr) + if err != nil { + return 0, d.Errf("converting port '%s' to integer value: %v", httpsPortStr, err) + } + } + return httpsPort, nil +} |