move server defaults, delete defer cancel() in stream.go
diff --git a/rpc_util.go b/rpc_util.go
index 36af31f..35f6dbf 100644
--- a/rpc_util.go
+++ b/rpc_util.go
@@ -483,17 +483,6 @@
Methods map[string]MethodConfig
}
-// SupportPackageIsVersion4 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the grpc package.
-//
-// This constant may be renamed in the future if a change in the generated code
-// requires a synchronised update of grpc-go and protoc-gen-go. This constant
-// should not be referenced from any other code.
-const SupportPackageIsVersion4 = true
-
-// Version is the current grpc version.
-const Version = "1.3.0-dev"
-
func min(a, b *int) *int {
if *a < *b {
return a
@@ -514,4 +503,15 @@
return doptMax
}
+// SupportPackageIsVersion4 is referenced from generated protocol buffer files
+// to assert that that code is compatible with this version of the grpc package.
+//
+// This constant may be renamed in the future if a change in the generated code
+// requires a synchronised update of grpc-go and protoc-gen-go. This constant
+// should not be referenced from any other code.
+const SupportPackageIsVersion4 = true
+
+// Version is the current grpc version.
+const Version = "1.3.0-dev"
+
const grpcUA = "grpc-go/" + Version
diff --git a/server.go b/server.go
index e4433cf..3c8bd69 100644
--- a/server.go
+++ b/server.go
@@ -61,6 +61,11 @@
"google.golang.org/grpc/transport"
)
+const (
+ defaultServerMaxReceiveMessageSize = 1024 * 1024 * 4
+ defaultServerMaxSendMessageSize = 1024 * 1024 * 4
+)
+
type methodHandler func(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor UnaryServerInterceptor) (interface{}, error)
// MethodDesc represents an RPC service's method specification.
diff --git a/stream.go b/stream.go
index 8dcd062..ee68bbf 100644
--- a/stream.go
+++ b/stream.go
@@ -119,9 +119,7 @@
}
if mc.Timeout != nil && *mc.Timeout >= 0 {
- var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, *mc.Timeout)
- defer cancel()
}
opts = append(cc.dopts.callOptions, opts...)
