Merge release-0.12 into master

moemilmeh · Dec 7, 2015 · 944c074 · 944c074
2 parents 42564d1 63b31de
commit 944c074
Show file tree

Hide file tree

Showing 141 changed files with 3,153 additions and 772 deletions.
diff --git a/examples/objective-c/auth_sample/Podfile b/examples/objective-c/auth_sample/Podfile
@@ -2,6  2,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 
 pod 'Protobuf', :path => "../../../third_party/protobuf"
 pod 'BoringSSL', :podspec => "../../../src/objective-c"
 pod 'gRPC', :path => "../../.."
 
 target 'AuthSample' do

diff --git a/examples/objective-c/helloworld/Podfile b/examples/objective-c/helloworld/Podfile
@@ -2,6  2,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 
 pod 'Protobuf', :path => "../../../third_party/protobuf"
 pod 'BoringSSL', :podspec => "../../../src/objective-c"
 pod 'gRPC', :path => "../../.."
 
 target 'HelloWorld' do

diff --git a/examples/objective-c/route_guide/Podfile b/examples/objective-c/route_guide/Podfile
@@ -3,6  3,7 @@ platform :ios, '8.0'
 
 target 'RouteGuideClient' do
   pod 'Protobuf', :path => "../../../third_party/protobuf"
   pod 'BoringSSL', :podspec => "../../../src/objective-c"
   pod 'gRPC', :path => "../../.."
   # Depend on the generated RouteGuide library.
   pod 'RouteGuide', :path => '.'

diff --git a/gRPC.podspec b/gRPC.podspec
@@ -589,7  589,7 @@ Pod::Spec.new do |s|
 
     ss.requires_arc = false
     ss.libraries = 'z'
-    ss.dependency 'OpenSSL', '~> 1.0.204.1'
     ss.dependency 'BoringSSL', '~> 1.0'
 
     # ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w'
   end

diff --git a/src/node/ext/call.cc b/src/node/ext/call.cc
@@ -234,7  234,9 @@ class SendMetadataOp : public Op {
 
 class SendMessageOp : public Op {
  public:
-  SendMessageOp() { send_message = NULL; }
   SendMessageOp() {
     send_message = NULL;
   }
   ~SendMessageOp() {
     if (send_message != NULL) {
       grpc_byte_buffer_destroy(send_message);
@@ -269,7  271,6 @@ class SendMessageOp : public Op {
   std::string GetTypeString() const {
     return "send_message";
   }
-
  private:
   grpc_byte_buffer *send_message;
 };

diff --git a/src/node/src/credentials.js b/src/node/src/credentials.js
@@ -91,7  91,7 @@ exports.createSsl = ChannelCredentials.createSsl;
  */
 exports.createFromMetadataGenerator = function(metadata_generator) {
   return CallCredentials.createFromPlugin(function(service_url, callback) {
-    metadata_generator(service_url, function(error, metadata) {
     metadata_generator({service_url: service_url}, function(error, metadata) {
       var code = grpc.status.OK;
       var message = '';
       if (error) {
@@ -114,7  114,8 @@ exports.createFromMetadataGenerator = function(metadata_generator) {
  * @return {CallCredentials} The resulting credentials object
  */
 exports.createFromGoogleCredential = function(google_credential) {
-  return exports.createFromMetadataGenerator(function(service_url, callback) {
   return exports.createFromMetadataGenerator(function(auth_context, callback) {
     var service_url = auth_context.service_url;
     google_credential.getRequestMetadata(service_url, function(err, header) {
       if (err) {
         callback(err);