mirror of
				https://github.com/coredns/coredns.git
				synced 2025-10-31 02:03:20 -04:00 
			
		
		
		
	Remove version pinning of thrift, ugoriji/go, and etcd (#2457)
* Remove version pinning of thrift, ugoriji/go, and etcd For incompatibility reasons at one point, we were forced to pining the version of thrift, ugoriji/go, and etcd to very specific versions (some are not versioned commits) to get around the build issues. It looks like those incompatibility issues are gone so we could remove the pinning of thrift, ugoriji/go, and etcd. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> * Update Gopkg.lock Signed-off-by: Yong Tang <yong.tang.github@outlook.com> * Update vendor library Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
		
							
								
								
									
										6
									
								
								vendor/github.com/apache/thrift/lib/go/thrift/binary_protocol.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								vendor/github.com/apache/thrift/lib/go/thrift/binary_protocol.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -448,9 +448,6 @@ func (p *TBinaryProtocol) ReadBinary() ([]byte, error) { | ||||
| 	if size < 0 { | ||||
| 		return nil, invalidDataLength | ||||
| 	} | ||||
| 	if uint64(size) > p.trans.RemainingBytes() { | ||||
| 		return nil, invalidDataLength | ||||
| 	} | ||||
|  | ||||
| 	isize := int(size) | ||||
| 	buf := make([]byte, isize) | ||||
| @@ -481,9 +478,6 @@ func (p *TBinaryProtocol) readStringBody(size int32) (value string, err error) { | ||||
| 	if size < 0 { | ||||
| 		return "", nil | ||||
| 	} | ||||
| 	if uint64(size) > p.trans.RemainingBytes() { | ||||
| 		return "", invalidDataLength | ||||
| 	} | ||||
|  | ||||
| 	var ( | ||||
| 		buf bytes.Buffer | ||||
|   | ||||
							
								
								
									
										6
									
								
								vendor/github.com/apache/thrift/lib/go/thrift/compact_protocol.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								vendor/github.com/apache/thrift/lib/go/thrift/compact_protocol.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -562,9 +562,6 @@ func (p *TCompactProtocol) ReadString() (value string, err error) { | ||||
| 	if length < 0 { | ||||
| 		return "", invalidDataLength | ||||
| 	} | ||||
| 	if uint64(length) > p.trans.RemainingBytes() { | ||||
| 		return "", invalidDataLength | ||||
| 	} | ||||
|  | ||||
| 	if length == 0 { | ||||
| 		return "", nil | ||||
| @@ -591,9 +588,6 @@ func (p *TCompactProtocol) ReadBinary() (value []byte, err error) { | ||||
| 	if length < 0 { | ||||
| 		return nil, invalidDataLength | ||||
| 	} | ||||
| 	if uint64(length) > p.trans.RemainingBytes() { | ||||
| 		return nil, invalidDataLength | ||||
| 	} | ||||
|  | ||||
| 	buf := make([]byte, length) | ||||
| 	_, e = io.ReadFull(p.trans, buf) | ||||
|   | ||||
							
								
								
									
										15
									
								
								vendor/github.com/apache/thrift/lib/go/thrift/server_socket.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								vendor/github.com/apache/thrift/lib/go/thrift/server_socket.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -75,7 +75,9 @@ func (p *TServerSocket) Accept() (TTransport, error) { | ||||
| 		return nil, errTransportInterrupted | ||||
| 	} | ||||
|  | ||||
| 	p.mu.Lock() | ||||
| 	listener := p.listener | ||||
| 	p.mu.Unlock() | ||||
| 	if listener == nil { | ||||
| 		return nil, NewTTransportException(NOT_OPEN, "No underlying server socket") | ||||
| 	} | ||||
| @@ -115,19 +117,20 @@ func (p *TServerSocket) Addr() net.Addr { | ||||
| } | ||||
|  | ||||
| func (p *TServerSocket) Close() error { | ||||
| 	defer func() { | ||||
| 		p.listener = nil | ||||
| 	}() | ||||
| 	var err error | ||||
| 	p.mu.Lock() | ||||
| 	if p.IsListening() { | ||||
| 		return p.listener.Close() | ||||
| 		err = p.listener.Close() | ||||
| 		p.listener = nil | ||||
| 	} | ||||
| 	return nil | ||||
| 	p.mu.Unlock() | ||||
| 	return err | ||||
| } | ||||
|  | ||||
| func (p *TServerSocket) Interrupt() error { | ||||
| 	p.mu.Lock() | ||||
| 	defer p.mu.Unlock() | ||||
| 	p.interrupted = true | ||||
| 	p.mu.Unlock() | ||||
| 	p.Close() | ||||
|  | ||||
| 	return nil | ||||
|   | ||||
							
								
								
									
										1
									
								
								vendor/github.com/apache/thrift/tutorial/cl/ensure-externals.sh
									
									
									
										generated
									
									
										vendored
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								vendor/github.com/apache/thrift/tutorial/cl/ensure-externals.sh
									
									
									
										generated
									
									
										vendored
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../../lib/cl/ensure-externals.sh | ||||
							
								
								
									
										1
									
								
								vendor/github.com/apache/thrift/tutorial/erl/client.sh
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								vendor/github.com/apache/thrift/tutorial/erl/client.sh
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1 +0,0 @@ | ||||
| server.sh | ||||
							
								
								
									
										1
									
								
								vendor/github.com/apache/thrift/tutorial/erl/server.sh
									
									
									
										generated
									
									
										vendored
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								vendor/github.com/apache/thrift/tutorial/erl/server.sh
									
									
									
										generated
									
									
										vendored
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| client.sh | ||||
		Reference in New Issue
	
	Block a user