From 685e4d958a2da154e01b415ef4ecb3378556d9ac Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Tue, 24 Mar 2015 18:28:28 -0700
Subject: [PATCH] Fixed errors in ActiveCall
---
src/php/lib/Grpc/ActiveCall.php | 8 +++++---
third_party/openssl | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/php/lib/Grpc/ActiveCall.php b/src/php/lib/Grpc/ActiveCall.php
index af4dca50d7..9e048ae03b 100755
--- a/src/php/lib/Grpc/ActiveCall.php
+++ b/src/php/lib/Grpc/ActiveCall.php
@@ -77,7 +77,7 @@ class ActiveCall {
*/
public function read() {
$read_event = $this->call->start_batch([OP_RECV_MESSAGE => true]);
- return $read_event->data;
+ return $read_event->message;
}
/**
@@ -102,7 +102,9 @@ class ActiveCall {
* and array $metadata members
*/
public function getStatus() {
- $status_event = $this->call->start_batch([RECV_STATUS_ON_CLIENT => true]);
- return $status_event->data;
+ $status_event = $this->call->start_batch([
+ OP_RECV_STATUS_ON_CLIENT => true
+ ]);
+ return $status_event->status;
}
}
diff --git a/third_party/openssl b/third_party/openssl
index 3df69d3aef..4ac0329582 160000
--- a/third_party/openssl
+++ b/third_party/openssl
@@ -1 +1 @@
-Subproject commit 3df69d3aefde7671053d4e3c242b228e5d79c83f
+Subproject commit 4ac0329582829f5378d8078c8d314ad37db87736
--
GitLab