Imported Upstream version 2012.03.22upstream-weekly/2012.03.22

1 files changed, 90 insertions, 0 deletions

diff --git a/src/cmd/fix/go1rename.go b/src/cmd/fix/go1rename.go
index 4b666720b..9266c749c 100644
--- a/src/cmd/fix/go1rename.go
+++ b/src/cmd/fix/go1rename.go
@@ -74,4 +74,94 @@ var go1renameReplace = []rename{
 		Old:       "runtime.Goroutines",
 		New:       "runtime.NumGoroutine",
 	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.ErrPersistEOF",
+		New:       "httputil.ErrPersistEOF",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.ErrPipeline",
+		New:       "httputil.ErrPipeline",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.ErrClosed",
+		New:       "httputil.ErrClosed",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.ServerConn",
+		New:       "httputil.ServerConn",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.ClientConn",
+		New:       "httputil.ClientConn",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.NewChunkedReader",
+		New:       "httputil.NewChunkedReader",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.NewChunkedWriter",
+		New:       "httputil.NewChunkedWriter",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.ReverseProxy",
+		New:       "httputil.ReverseProxy",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.NewSingleHostReverseProxy",
+		New:       "httputil.NewSingleHostReverseProxy",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.DumpRequest",
+		New:       "httputil.DumpRequest",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.DumpRequestOut",
+		New:       "httputil.DumpRequestOut",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.DumpResponse",
+		New:       "httputil.DumpResponse",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.NewClientConn",
+		New:       "httputil.NewClientConn",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.NewServerConn",
+		New:       "httputil.NewServerConn",
+	},
+	{
+		OldImport: "net/http",
+		NewImport: "net/http/httputil",
+		Old:       "http.NewProxyClientConn",
+		New:       "httputil.NewProxyClientConn",
+	},
 }