From dbe8c6ed11cf1a1cfc7bf7b6181f81326836aeb0 Mon Sep 17 00:00:00 2001
From: iamqizhao <toqizhao@gmail.com>
Date: Thu, 19 Feb 2015 13:55:18 -0800
Subject: [PATCH] Remove port when assignning to CallHdr.Host

---
 call.go   | 7 ++++++-
 stream.go | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/call.go b/call.go
index b9da0b2a..5099846c 100644
--- a/call.go
+++ b/call.go
@@ -35,6 +35,7 @@ package grpc
 
 import (
 	"io"
+	"net"
 
 	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/context"
@@ -114,8 +115,12 @@ func Invoke(ctx context.Context, method string, args, reply proto.Message, cc *C
 			o.after(&c)
 		}
 	}()
+	host, _, err := net.SplitHostPort(cc.target)
+	if err != nil {
+		return toRPCErr(err)
+	}
 	callHdr := &transport.CallHdr{
-		Host:   cc.target,
+		Host:   host,
 		Method: method,
 	}
 	topts := &transport.Options{
diff --git a/stream.go b/stream.go
index c0266eeb..ba0ff259 100644
--- a/stream.go
+++ b/stream.go
@@ -36,6 +36,7 @@ package grpc
 import (
 	"fmt"
 	"io"
+	"net"
 
 	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/context"
@@ -95,8 +96,12 @@ type ClientStream interface {
 // by generated code.
 func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (ClientStream, error) {
 	// TODO(zhaoq): CallOption is omitted. Add support when it is needed.
+	host, _, err := net.SplitHostPort(cc.target)
+	if err != nil {
+		return nil, toRPCErr(err)
+	}
 	callHdr := &transport.CallHdr{
-		Host:   cc.target,
+		Host:   host,
 		Method: method,
 	}
 	t, _, err := cc.wait(ctx, 0)