diff --git a/Gopkg.lock b/Gopkg.lock index 437e0087..eacd1b4f 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -167,7 +167,7 @@ "ipv6", "proxy" ] - revision = "ed29d75add3d7c4bf7ca65aac0c6df3d1420216f" + revision = "32a936f46389aa10549d60bd7833e54b01685d09" [[projects]] branch = "master" @@ -180,7 +180,7 @@ "windows/svc/eventlog", "windows/svc/mgr" ] - revision = "151529c776cdc58ddbe7963ba9af779f3577b419" + revision = "3c6ecd8f22c6f40fbeec94c000a069d7d87c7624" [[projects]] name = "golang.org/x/text" @@ -212,6 +212,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "c2408310ad6e3a3b8987a6b1aeac25d10b74502190596d85af5d27ebbf8896d0" + inputs-digest = "bf791cde66957e983885f1111cfc8ae8ea4680c1e5e2528d8497abb915c984d3" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 1b88072d..ac15356a 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -6,10 +6,6 @@ name = "github.com/VividCortex/ewma" version = "1.1.1" -[[constraint]] - branch = "master" - name = "github.com/VividCortex/godaemon" - [[constraint]] branch = "master" name = "github.com/agl/ed25519" @@ -64,7 +60,7 @@ [[constraint]] name = "github.com/miekg/dns" - version = "1.0.7" + version = "1.0.8" [[constraint]] branch = "master" diff --git a/vendor/golang.org/x/net/http2/server_test.go b/vendor/golang.org/x/net/http2/server_test.go index 02eb0dcc..9c3e549d 100644 --- a/vendor/golang.org/x/net/http2/server_test.go +++ b/vendor/golang.org/x/net/http2/server_test.go @@ -3817,9 +3817,6 @@ func TestServerHandlerConnectionClose(t *testing.T) { } case *HeadersFrame: goth := st.decodeHeader(f.HeaderBlockFragment()) - if !sawGoAway { - t.Fatalf("unexpected Headers frame before GOAWAY: %s, %v", summarizeFrame(f), goth) - } wanth := [][2]string{ {":status", "200"}, {"foo", "bar"}, @@ -3836,6 +3833,9 @@ func TestServerHandlerConnectionClose(t *testing.T) { t.Logf("unexpected frame: %v", summarizeFrame(f)) } } + if !sawGoAway { + t.Errorf("didn't see GOAWAY") + } if !sawRes { t.Errorf("didn't see response") } diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go index b4e42478..7d2a6794 100644 --- a/vendor/golang.org/x/sys/windows/types_windows.go +++ b/vendor/golang.org/x/sys/windows/types_windows.go @@ -94,16 +94,29 @@ const ( FILE_APPEND_DATA = 0x00000004 FILE_WRITE_ATTRIBUTES = 0x00000100 - FILE_SHARE_READ = 0x00000001 - FILE_SHARE_WRITE = 0x00000002 - FILE_SHARE_DELETE = 0x00000004 - FILE_ATTRIBUTE_READONLY = 0x00000001 - FILE_ATTRIBUTE_HIDDEN = 0x00000002 - FILE_ATTRIBUTE_SYSTEM = 0x00000004 - FILE_ATTRIBUTE_DIRECTORY = 0x00000010 - FILE_ATTRIBUTE_ARCHIVE = 0x00000020 - FILE_ATTRIBUTE_NORMAL = 0x00000080 - FILE_ATTRIBUTE_REPARSE_POINT = 0x00000400 + FILE_SHARE_READ = 0x00000001 + FILE_SHARE_WRITE = 0x00000002 + FILE_SHARE_DELETE = 0x00000004 + + FILE_ATTRIBUTE_READONLY = 0x00000001 + FILE_ATTRIBUTE_HIDDEN = 0x00000002 + FILE_ATTRIBUTE_SYSTEM = 0x00000004 + FILE_ATTRIBUTE_DIRECTORY = 0x00000010 + FILE_ATTRIBUTE_ARCHIVE = 0x00000020 + FILE_ATTRIBUTE_DEVICE = 0x00000040 + FILE_ATTRIBUTE_NORMAL = 0x00000080 + FILE_ATTRIBUTE_TEMPORARY = 0x00000100 + FILE_ATTRIBUTE_SPARSE_FILE = 0x00000200 + FILE_ATTRIBUTE_REPARSE_POINT = 0x00000400 + FILE_ATTRIBUTE_COMPRESSED = 0x00000800 + FILE_ATTRIBUTE_OFFLINE = 0x00001000 + FILE_ATTRIBUTE_NOT_CONTENT_INDEXED = 0x00002000 + FILE_ATTRIBUTE_ENCRYPTED = 0x00004000 + FILE_ATTRIBUTE_INTEGRITY_STREAM = 0x00008000 + FILE_ATTRIBUTE_VIRTUAL = 0x00010000 + FILE_ATTRIBUTE_NO_SCRUB_DATA = 0x00020000 + FILE_ATTRIBUTE_RECALL_ON_OPEN = 0x00040000 + FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS = 0x00400000 INVALID_FILE_ATTRIBUTES = 0xffffffff