diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2015-11-25 14:29:17 -0800 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2015-11-25 14:29:17 -0800 |
| commit | 2b8e9ca49d316a509e811bf927a36bc8c4ac75fe (patch) | |
| tree | 1e0b84271cd172be5aa6a46b4065410f89117d75 | |
| parent | 114f39475fa6f28beb51f1a4265e377aa122fbdb (diff) | |
| parent | b1c41d7b0d8f023df9e05a7e64307889d560bd47 (diff) | |
Merge branch 'release-0_12' of github.com:grpc/grpc into cpp_new_creds_plugin_api
| -rw-r--r-- | include/grpc/grpc_security.h | 3 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/core/security/client_auth_filter.c | 1 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/VersionInfo.cs | 2 | ||||
| -rw-r--r-- | src/csharp/build_packages.bat | 4 |
5 files changed, 7 insertions, 5 deletions
diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h index f4e90a5ef5..655f45a29b 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/package.json b/package.json index 1fd0ffb881..9517c59ace 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/", diff --git a/src/core/security/client_auth_filter.c b/src/core/security/client_auth_filter.c index d822164233..e7057051e0 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); diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs index e9ec30e923..818ddb83b9 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -41,6 +41,6 @@ namespace Grpc.Core /// <summary> /// Current version of gRPC C# /// </summary> - 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 b864a955a8..45f6b26c66 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. |