From 1db095d4422eb0a724ef34a40a1d1ad87bd23a96 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 19 Nov 2015 11:13:07 -0800 Subject: [PATCH 1/3] bump C# version to 0.12.0 --- src/csharp/Grpc.Core/VersionInfo.cs | 2 +- src/csharp/build_packages.bat | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs index e9ec30e9238..818ddb83b91 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -41,6 +41,6 @@ namespace Grpc.Core /// /// Current version of gRPC C# /// - public const string CurrentVersion = "0.7.1"; + public const string CurrentVersion = "0.12.0"; } } diff --git a/src/csharp/build_packages.bat b/src/csharp/build_packages.bat index b864a955a89..45f6b26c666 100644 --- a/src/csharp/build_packages.bat +++ b/src/csharp/build_packages.bat @@ -1,8 +1,8 @@ @rem Builds gRPC NuGet packages @rem Current package versions -set VERSION=0.7.1 -set CORE_VERSION=0.11.1 +set VERSION=0.12.0 +set CORE_VERSION=0.12.0 set PROTOBUF_VERSION=3.0.0-alpha4 @rem Packages that depend on prerelease packages (like Google.Protobuf) need to have prerelease suffix as well. From f37a90c0d9d1ad23ed448f98fa0060cd89c5ff1d Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Thu, 19 Nov 2015 13:38:35 -0800 Subject: [PATCH 2/3] Updated Node package version to 0.12.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1fd0ffb8814..9517c59aced 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "0.11.1", + "version": "0.12.0", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "http://www.grpc.io/", From eb029c93fb273925102bd25e6972b9d9edf0ccde Mon Sep 17 00:00:00 2001 From: Julien Boeuf Date: Wed, 25 Nov 2015 13:47:56 -0800 Subject: [PATCH 3/3] Better documentation of the method_name field. Also passing empty string as opposed to NULL when the method name is not found. This is much less error-prone. --- include/grpc/grpc_security.h | 3 ++- src/core/security/client_auth_filter.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h index f4e90a5ef58..655f45a29b9 100644 --- a/include/grpc/grpc_security.h +++ b/include/grpc/grpc_security.h @@ -247,7 +247,8 @@ typedef struct { const char *service_url; /* The method name of the RPC being called (not fully qualified). - Can be NULL if no method name was found. */ + The fully qualified method name can be built from the service_url: + full_qualified_method_name = ctx->service_url + '/' + ctx->method_name. */ const char *method_name; /* The auth_context of the channel which gives the server's identity. */ diff --git a/src/core/security/client_auth_filter.c b/src/core/security/client_auth_filter.c index d822164233d..e7057051e0a 100644 --- a/src/core/security/client_auth_filter.c +++ b/src/core/security/client_auth_filter.c @@ -146,6 +146,7 @@ void build_auth_metadata_context(grpc_security_connector *sc, *last_slash = '\0'; method_name = gpr_strdup(last_slash + 1); } + if (method_name == NULL) method_name = gpr_strdup(""); gpr_asprintf(&service_url, "%s://%s%s", sc->url_scheme == NULL ? "" : sc->url_scheme, grpc_mdstr_as_c_string(calld->host), service);