diff options
| author |  Robbie Shade <rjshade@google.com> | 2015-09-14 13:18:14 -0400 |
|---|---|---|
| committer | Robbie Shade <rjshade@google.com> | 2015-09-14 13:18:14 -0400 |
| commit | f798b779fc35e0be603f07589f3f27efa316da7f (patch) | |
| tree | 7c9e0b908218f6ed6207139c2065c6b78358fa5a /src/php/lib/Grpc/BaseStub.php | |
| parent | 780b07e6442b06039a936382ce10fe0c4a30f4af (diff) | |
| parent | 261666696496174f824d9e43a60559040eda3055 (diff) | |
Merge remote-tracking branch 'upstream/master' into rename_callback
Diffstat (limited to 'src/php/lib/Grpc/BaseStub.php')
| -rwxr-xr-x | src/php/lib/Grpc/BaseStub.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/php/lib/Grpc/BaseStub.php b/src/php/lib/Grpc/BaseStub.php index 2e980c5eed..381b114399 100755 --- a/src/php/lib/Grpc/BaseStub.php +++ b/src/php/lib/Grpc/BaseStub.php @@ -168,7 +168,8 @@ class BaseStub { public function _simpleRequest($method, $argument, callable $deserialize, - $metadata = array()) { + $metadata = array(), + $options = array()) { list($actual_metadata, $timeout) = $this->_extract_timeout_from_metadata($metadata); $call = new UnaryCall($this->channel, $method, $deserialize, $timeout); $jwt_aud_uri = $this->_get_jwt_aud_uri($method); @@ -177,7 +178,7 @@ class BaseStub { $actual_metadata, $jwt_aud_uri); } - $call->start($argument, $actual_metadata); + $call->start($argument, $actual_metadata, $options); return $call; } @@ -193,7 +194,6 @@ class BaseStub { * @return ClientStreamingSurfaceActiveCall The active call object */ public function _clientStreamRequest($method, - $arguments, callable $deserialize, $metadata = array()) { list($actual_metadata, $timeout) = $this->_extract_timeout_from_metadata($metadata); @@ -204,7 +204,7 @@ class BaseStub { $actual_metadata, $jwt_aud_uri); } - $call->start($arguments, $actual_metadata); + $call->start($actual_metadata); return $call; } @@ -221,7 +221,8 @@ class BaseStub { public function _serverStreamRequest($method, $argument, callable $deserialize, - $metadata = array()) { + $metadata = array(), + $options = array()) { list($actual_metadata, $timeout) = $this->_extract_timeout_from_metadata($metadata); $call = new ServerStreamingCall($this->channel, $method, $deserialize, $timeout); $jwt_aud_uri = $this->_get_jwt_aud_uri($method); @@ -230,7 +231,7 @@ class BaseStub { $actual_metadata, $jwt_aud_uri); } - $call->start($argument, $actual_metadata); + $call->start($argument, $actual_metadata, $options); return $call; } |