Merge branch 'develop' into release/v0.7.0

cursor.go

@@ -143,27 +143,28 @@ func (c *Cursor) Next(dest interface{}) bool {
 		return false
 	}
 
+	if !hasMore {
+		c.Close()
+	}
+
 	return hasMore
 }
 
 func (c *Cursor) loadNext(dest interface{}) (bool, error) {
 	for c.lastErr == nil {
 		// Check if response is closed/finished
 		if c.buffer.Len() == 0 && c.responses.Len() == 0 && c.closed {
-
 			return false, errCursorClosed
 		}
 
 		if c.buffer.Len() == 0 && c.responses.Len() == 0 && !c.finished {
-
 			err := c.fetchMore()
 			if err != nil {
 				return false, err
 			}
 		}
 
 		if c.buffer.Len() == 0 && c.responses.Len() == 0 && c.finished {
-
 			return false, nil
 		}
 
@@ -263,6 +264,7 @@ func (c *Cursor) All(result interface{}) error {
 // `One` zeroes the value before scanning in the result.
 func (c *Cursor) One(result interface{}) error {
 	if c.IsNil() {
+		c.Close()
 		return ErrEmptyResult
 	}
 

pool.go

@@ -386,6 +386,9 @@ func (p *Pool) putConn(pc *poolConn, err error) {
 // If a connRequest was fulfilled or the *poolConn was placed in the
 // freeConn list, then true is returned, otherwise false is returned.
 func (p *Pool) putConnPoolLocked(pc *poolConn, err error) bool {
+	if p.maxOpen > 0 && p.numOpen > p.maxOpen {
+		return false
+	}
 	if c := len(p.connRequests); c > 0 {
 		req := p.connRequests[0]
 		// This copy is O(n) but in practice faster than a linked list.