Merge branch 'master' of github.com:miekg/dns

This commit is contained in:
Miek Gieben 2012-08-24 08:35:12 +02:00
commit 20cc171789
1 changed files with 2 additions and 1 deletions

View File

@ -315,6 +315,7 @@ func (c *conn) close() {
// Serve a new connection.
func (c *conn) serve() {
// for block to make it easy to break out to close the tcp connection
for {
// Request has been read in ServeUDP or ServeTCP
w := new(response)
@ -343,7 +344,7 @@ func (c *conn) serve() {
if c.hijacked {
return
}
break // TODO(mg) Why is this a loop anyway?
break
}
if c._TCP != nil {
c.close() // Listen and Serve is closed then