diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-10-03 16:03:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 16:03:15 -0400 |
| commit | 8f91c777559748fa6e857d9fc1f4ae079a532813 (patch) | |
| tree | 190f7cef373764a0d47a91045fdb486ee3d6781d /vendor/gopkg.in/yaml.v2 | |
| parent | 5f8e5c401bd96cba9a98b2db02d72f9cbacb0103 (diff) | |
| download | chat-8f91c777559748fa6e857d9fc1f4ae079a532813.tar.gz chat-8f91c777559748fa6e857d9fc1f4ae079a532813.tar.bz2 chat-8f91c777559748fa6e857d9fc1f4ae079a532813.zip | |
Adding ability to serve TLS directly from Mattermost server (#4119)
Diffstat (limited to 'vendor/gopkg.in/yaml.v2')
| -rw-r--r-- | vendor/gopkg.in/yaml.v2/decode.go | 2 | ||||
| -rw-r--r-- | vendor/gopkg.in/yaml.v2/decode_test.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/vendor/gopkg.in/yaml.v2/decode.go b/vendor/gopkg.in/yaml.v2/decode.go index 085cddc44..b13ab9f07 100644 --- a/vendor/gopkg.in/yaml.v2/decode.go +++ b/vendor/gopkg.in/yaml.v2/decode.go @@ -251,7 +251,7 @@ func (d *decoder) callUnmarshaler(n *node, u Unmarshaler) (good bool) { // // If n holds a null value, prepare returns before doing anything. func (d *decoder) prepare(n *node, out reflect.Value) (newout reflect.Value, unmarshaled, good bool) { - if n.tag == yaml_NULL_TAG || n.kind == scalarNode && n.tag == "" && (n.value == "null" || n.value == "") { + if n.tag == yaml_NULL_TAG || n.kind == scalarNode && n.tag == "" && (n.value == "null" || n.value == "" && n.implicit) { return out, false, false } again := true diff --git a/vendor/gopkg.in/yaml.v2/decode_test.go b/vendor/gopkg.in/yaml.v2/decode_test.go index c159760b6..3da6fadf8 100644 --- a/vendor/gopkg.in/yaml.v2/decode_test.go +++ b/vendor/gopkg.in/yaml.v2/decode_test.go @@ -660,6 +660,7 @@ var unmarshalerTests = []struct { {`_: BAR!`, "!!str", "BAR!"}, {`_: "BAR!"`, "!!str", "BAR!"}, {"_: !!foo 'BAR!'", "!!foo", "BAR!"}, + {`_: ""`, "!!str", ""}, } var unmarshalerResult = map[int]error{} |