Use http.NewRequest

diff --git a/src/server.go b/src/server.go
index 571561029e9357f6e22260442b1ef611a01edff3..508da5ad12f908bb819cd85bdea4788cca5e4a4b 100644 (file)
--- a/src/server.go
+++ b/src/server.go
@@ -138,16 +138,17 @@ func performProxy(url_ *url.URL, response http.ResponseWriter, origRequest *http
                return err
        }
        client := http.NewClientConn(conn, nil)
-       var request http.Request
-       request.URL = url_
-       request.Method = "GET"
+       request, err := http.NewRequest("GET", url_.String(), nil)
+       if err != nil {
+               return err
+       }
        request.Header.Set("User-Agent", origRequest.UserAgent())
-       err = client.Write(&request)
+       err = client.Write(request)
        if err != nil {
                return err
        }
        var proxyResponse *http.Response
-       proxyResponse, err = client.Read(&request)
+       proxyResponse, err = client.Read(request)
        if err != nil && err != http.ErrPersistEOF {
                return err
        }

diff --git a/src/tv_rename.go b/src/tv_rename.go
index 9d0eeabfacc163471a258d792170c331ae00577c..62cfd930d27b97d757754c8d5ad102c06cb41e93 100644 (file)
--- a/src/tv_rename.go
+++ b/src/tv_rename.go
@@ -127,15 +127,16 @@ func performLookup(urlString string) (*http.Response, os.Error) {
 
        // Perform the HTTP request.
        client := http.NewClientConn(conn, nil)
-       var request http.Request
-       request.URL = url_
-       request.Method = "GET"
+       request, err := http.NewRequest("GET", urlString, nil)
+       if err != nil {
+               return nil, err
+       }
        request.Header.Set("User-Agent", "Armadillo File Manager")
-       err = client.Write(&request)
+       err = client.Write(request)
        if err != nil {
                return nil, err
        }
-       return client.Read(&request)
+       return client.Read(request)
 }
 
 // Parses the HTTP response from performLookup().