Merge pull request #11541 from murgatroid99/node_1.3_backport_fixes

Backport a couple of Node bugfixes into 1.3.x and bump patch version

BUILD

@@ -42,7 +42,7 @@ g_stands_for = "gentle"
 
 core_version = "3.0.0"
 
-version = "1.3.8"
+version = "1.3.9"
 
 grpc_cc_library(
     name = "gpr",

CMakeLists.txt

@@ -39,7 +39,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(PACKAGE_NAME      "grpc")
-set(PACKAGE_VERSION   "1.3.8")
+set(PACKAGE_VERSION   "1.3.9")
 set(PACKAGE_STRING    "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_TARNAME   "${PACKAGE_NAME}-${PACKAGE_VERSION}")
 set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")

Makefile

@@ -420,8 +420,8 @@ Q = @
 endif
 
 CORE_VERSION = 3.0.0
-CPP_VERSION = 1.3.8
-CSHARP_VERSION = 1.3.8
+CPP_VERSION = 1.3.9
+CSHARP_VERSION = 1.3.9
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

build.yaml

@@ -14,7 +14,7 @@ settings:
   '#10': See the expand_version.py for all the quirks here
   core_version: 3.0.0
   g_stands_for: gentle
-  version: 1.3.8
+  version: 1.3.9
 filegroups:
 - name: census
   public_headers:

gRPC-Core.podspec

@@ -37,7 +37,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-Core'
-  version = '1.3.8'
+  version = '1.3.9'
   s.version  = version
   s.summary  = 'Core cross-platform gRPC library, written in C'
   s.homepage = 'http://www.grpc.io'

gRPC-ProtoRPC.podspec

@@ -36,7 +36,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-ProtoRPC'
-  version = '1.3.8'
+  version = '1.3.9'
   s.version  = version
   s.summary  = 'RPC library for Protocol Buffers, based on gRPC'
   s.homepage = 'http://www.grpc.io'

gRPC-RxLibrary.podspec

@@ -36,7 +36,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-RxLibrary'
-  version = '1.3.8'
+  version = '1.3.9'
   s.version  = version
   s.summary  = 'Reactive Extensions library for iOS/OSX.'
   s.homepage = 'http://www.grpc.io'

gRPC.podspec

@@ -35,7 +35,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC'
-  version = '1.3.8'
+  version = '1.3.9'
   s.version  = version
   s.summary  = 'gRPC client library for iOS/OSX'
   s.homepage = 'http://www.grpc.io'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "http://www.grpc.io/",

package.xml

@@ -13,8 +13,8 @@
  <date>2017-05-05</date>
  <time>16:06:07</time>
  <version>
-  <release>1.3.8</release>
-  <api>1.3.8</api>
+  <release>1.3.9</release>
+  <api>1.3.9</api>
  </version>
  <stability>
   <release>beta</release>

src/cpp/common/version_cc.cc

@@ -37,5 +37,5 @@
 #include <grpc++/grpc++.h>
 
 namespace grpc {
-grpc::string Version() { return "1.3.8"; }
+grpc::string Version() { return "1.3.9"; }
 }

src/csharp/Grpc.Core/Version.csproj.include

@@ -1,7 +1,7 @@
 <!-- This file is generated -->
 <Project>
   <PropertyGroup>
-    <GrpcCsharpVersion>1.3.8</GrpcCsharpVersion>
+    <GrpcCsharpVersion>1.3.9</GrpcCsharpVersion>
     <GoogleProtobufVersion>3.2.0</GoogleProtobufVersion>
   </PropertyGroup>
 </Project>

src/csharp/Grpc.Core/VersionInfo.cs

@@ -48,11 +48,11 @@ namespace Grpc.Core
         /// <summary>
         /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
         /// </summary>
-        public const string CurrentAssemblyFileVersion = "1.3.8.0";
+        public const string CurrentAssemblyFileVersion = "1.3.9.0";
 
         /// <summary>
         /// Current version of gRPC C#
         /// </summary>
-        public const string CurrentVersion = "1.3.8";
+        public const string CurrentVersion = "1.3.9";
     }
 }

src/csharp/build_packages_dotnetcli.bat

@@ -28,7 +28,7 @@
 @rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 @rem Current package versions
-set VERSION=1.3.8
+set VERSION=1.3.9
 
 @rem Adjust the location of nuget.exe
 set NUGET=C:\nuget\nuget.exe

src/csharp/build_packages_dotnetcli.sh

@@ -70,7 +70,7 @@ dotnet pack --configuration Release Grpc.Auth --output ../../../artifacts
 dotnet pack --configuration Release Grpc.HealthCheck --output ../../../artifacts
 dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts
 
-nuget pack Grpc.nuspec -Version "1.3.8" -OutputDirectory ../../artifacts
-nuget pack Grpc.Tools.nuspec -Version "1.3.8" -OutputDirectory ../../artifacts
+nuget pack Grpc.nuspec -Version "1.3.9" -OutputDirectory ../../artifacts
+nuget pack Grpc.Tools.nuspec -Version "1.3.9" -OutputDirectory ../../artifacts
 
 (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)

src/node/health_check/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grpc-health-check",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "author": "Google Inc.",
   "description": "Health check service for use with gRPC",
   "repository": {
@@ -15,7 +15,7 @@
     }
   ],
   "dependencies": {
-    "grpc": "^1.3.8",
+    "grpc": "^1.3.9",
     "lodash": "^3.9.3",
     "google-protobuf": "^3.0.0"
   },

src/node/src/client.js

@@ -105,6 +105,7 @@ function _write(chunk, encoding, callback) {
     /* Once a write fails, just call the callback immediately to let the caller
        flush any pending writes. */
     setImmediate(callback);
+    return;
   }
   try {
     message = this.serialize(chunk);
@@ -116,6 +117,7 @@ function _write(chunk, encoding, callback) {
        programmer a useful error and to stop the stream properly */
     this.call.cancelWithStatus(grpc.status.INTERNAL, 'Serialization failure');
     callback(e);
+    return;
   }
   if (_.isFinite(encoding)) {
     /* Attach the encoding if it is a finite number. This is the closest we

src/node/src/protobuf_js_6_common.js

@@ -59,7 +59,7 @@ exports.deserializeCls = function deserializeCls(cls, options) {
    * @return {cls} The resulting object
    */
   return function deserialize(arg_buf) {
-    return cls.decode(arg_buf).toObject(conversion_options);
+    return cls.toObject(cls.decode(arg_buf), conversion_options);
   };
 };
 

src/node/tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grpc-tools",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "author": "Google Inc.",
   "description": "Tools for developing with gRPC on Node.js",
   "homepage": "http://www.grpc.io/",

src/objective-c/!ProtoCompiler-gRPCPlugin.podspec

@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler-gRPCPlugin'
-  v = '1.3.8'
+  v = '1.3.9'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
   s.description = <<-DESC

src/objective-c/GRPCClient/private/version.h

@@ -38,4 +38,4 @@
 // `tools/buildgen/generate_projects.sh`.
 
 
-#define GRPC_OBJC_VERSION_STRING @"1.3.8"
+#define GRPC_OBJC_VERSION_STRING @"1.3.9"

src/php/composer.json

@@ -2,7 +2,7 @@
   "name": "grpc/grpc-dev",
   "description": "gRPC library for PHP - for Developement use only",
   "license": "BSD-3-Clause",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "require": {
     "php": ">=5.5.0",
     "google/protobuf": "^v3.1.0"

src/python/grpcio/grpc_version.py

@@ -29,4 +29,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
 
-VERSION='1.3.8'
+VERSION='1.3.9'

src/python/grpcio_health_checking/grpc_version.py

@@ -29,4 +29,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
 
-VERSION='1.3.8'
+VERSION='1.3.9'

src/python/grpcio_reflection/grpc_version.py

@@ -29,4 +29,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
 
-VERSION='1.3.8'
+VERSION='1.3.9'

src/python/grpcio_tests/grpc_version.py

@@ -29,4 +29,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
 
-VERSION='1.3.8'
+VERSION='1.3.9'

src/ruby/lib/grpc/version.rb

@@ -29,5 +29,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.3.8'
+  VERSION = '1.3.9'
 end

src/ruby/tools/version.rb

@@ -29,6 +29,6 @@
 
 module GRPC
   module Tools
-    VERSION = '1.3.8'
+    VERSION = '1.3.9'
   end
 end

tools/distrib/python/grpcio_tools/grpc_version.py

@@ -29,4 +29,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION='1.3.8'
+VERSION='1.3.9'

tools/doxygen/Doxyfile.c++

@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.3.8
+PROJECT_NUMBER         = 1.3.9
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

tools/doxygen/Doxyfile.c++.internal

@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.3.8
+PROJECT_NUMBER         = 1.3.9
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a