Merge pull request cloudfoundry#222 from fraenkel/closeBody

Close the response body
haydonryan · Jul 25, 2014 · a835edf · a835edf
2 parents e2e5938 + 5f7da91
commit a835edf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/cf/api/buildpack_bits.go b/cf/api/buildpack_bits.go
@@ -5,20 +5,21 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"github.com/cloudfoundry/cli/cf/app_files"
-	"github.com/cloudfoundry/cli/cf/configuration"
-	"github.com/cloudfoundry/cli/cf/errors"
-	. "github.com/cloudfoundry/cli/cf/i18n"
-	"github.com/cloudfoundry/cli/cf/models"
-	"github.com/cloudfoundry/cli/cf/net"
-	"github.com/cloudfoundry/gofileutils/fileutils"
 	"io"
 	"mime/multipart"
 	"net/http"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
+
+	"github.com/cloudfoundry/cli/cf/app_files"
+	"github.com/cloudfoundry/cli/cf/configuration"
+	"github.com/cloudfoundry/cli/cf/errors"
+	. "github.com/cloudfoundry/cli/cf/i18n"
+	"github.com/cloudfoundry/cli/cf/models"
+	"github.com/cloudfoundry/cli/cf/net"
+	"github.com/cloudfoundry/gofileutils/fileutils"
 )
 
 type BuildpackBitsRepository interface {
@@ -199,6 +200,7 @@ func (repo CloudControllerBuildpackBitsRepository) downloadBuildpack(url string,
 			cb(nil, err)
 			return
 		}
+		defer response.Body.Close()
 
 		io.Copy(tempfile, response.Body)
 		tempfile.Seek(0, 0)

diff --git a/cf/api/curl.go b/cf/api/curl.go
@@ -3,15 +3,16 @@ package api
 import (
 	"bufio"
 	"fmt"
-	"github.com/cloudfoundry/cli/cf/configuration"
-	"github.com/cloudfoundry/cli/cf/errors"
-	. "github.com/cloudfoundry/cli/cf/i18n"
-	"github.com/cloudfoundry/cli/cf/net"
 	"io/ioutil"
 	"net/http"
 	"net/http/httputil"
 	"net/textproto"
 	"strings"
+
+	"github.com/cloudfoundry/cli/cf/configuration"
+	"github.com/cloudfoundry/cli/cf/errors"
+	. "github.com/cloudfoundry/cli/cf/i18n"
+	"github.com/cloudfoundry/cli/cf/net"
 )
 
 type CurlRepository interface {
@@ -52,6 +53,7 @@ func (repo CloudControllerCurlRepository) Request(method, path, headerString, bo
 	if err != nil {
 		return
 	}
+	defer res.Body.Close()
 
 	headerBytes, _ := httputil.DumpResponse(res, false)
 	resHeaders = string(headerBytes)

diff --git a/cf/net/gateway.go b/cf/net/gateway.go
@@ -227,6 +227,7 @@ func (gateway Gateway) performRequestForResponseBytes(request *Request) (bytes [
 	if apiErr != nil {
 		return
 	}
+	defer rawResponse.Body.Close()
 
 	bytes, err := ioutil.ReadAll(rawResponse.Body)
 	if err != nil {
@@ -269,6 +270,7 @@ func (gateway Gateway) PerformPollingRequestForJSONResponse(request *Request, re
 	if apiErr != nil {
 		return
 	}
+	defer rawResponse.Body.Close()
 
 	if rawResponse.StatusCode > 203 || strings.TrimSpace(string(bytes)) == "" {
 		return