You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/06/01 16:47:48 UTC
[1/2] airavata-php-gateway git commit: custom change to TSocket file
to work with TLS
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 6b3c8f2c0 -> e80f2a241
custom change to TSocket file to work with TLS
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/13840224
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/13840224
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/13840224
Branch: refs/heads/develop
Commit: 13840224964e018e2e69c8d3d588343629803ba5
Parents: cfdd539
Author: scnakandala <su...@gmail.com>
Authored: Wed Jun 1 12:46:39 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jun 1 12:46:39 2016 -0400
----------------------------------------------------------------------
app/libraries/Thrift/Transport/TSocket.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/13840224/app/libraries/Thrift/Transport/TSocket.php
----------------------------------------------------------------------
diff --git a/app/libraries/Thrift/Transport/TSocket.php b/app/libraries/Thrift/Transport/TSocket.php
index 3ad3bf7..f23a05a 100644
--- a/app/libraries/Thrift/Transport/TSocket.php
+++ b/app/libraries/Thrift/Transport/TSocket.php
@@ -261,7 +261,7 @@ class TSocket extends TTransport {
$readable = @stream_select($read, $null, $null, $this->recvTimeoutSec_, $this->recvTimeoutUsec_);
if ($readable > 0) {
- $data = @stream_socket_recvfrom($this->handle_, $len);
+ $data = @fread($this->handle_, $len);
if ($data === false) {
throw new TTransportException('TSocket: Could not read '.$len.' bytes from '.
$this->host_.':'.$this->port_);
@@ -294,7 +294,7 @@ class TSocket extends TTransport {
$writable = @stream_select($null, $write, $null, $this->sendTimeoutSec_, $this->sendTimeoutUsec_);
if ($writable > 0) {
// write buffer to stream
- $written = @stream_socket_sendto($this->handle_, $buf);
+ $written = @fwrite($this->handle_, $buf);
if ($written === -1 || $written === false) {
throw new TTransportException('TSocket: Could not write '.TStringFuncFactory::create()->strlen($buf).' bytes '.
$this->host_.':'.$this->port_);
[2/2] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/e80f2a24
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e80f2a24
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e80f2a24
Branch: refs/heads/develop
Commit: e80f2a2419e8c94c9e03219f4146490bd2bc6456
Parents: 1384022 6b3c8f2
Author: scnakandala <su...@gmail.com>
Authored: Wed Jun 1 12:47:45 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jun 1 12:47:45 2016 -0400
----------------------------------------------------------------------
app/controllers/AdminController.php | 12 +-
app/libraries/AdminUtilities.php | 14 +-
app/libraries/CommonUtilities.php | 99 +++++++----
app/views/admin/manage-notices.blade.php | 172 +++++++++++--------
app/views/experiment/browse.blade.php | 1 -
app/views/layout/basic.blade.php | 1 +
.../compute-resource-preferences.blade.php | 1 +
public/css/bootstrap.min.css | 18 +-
public/js/time-conversion.js | 5 +-
9 files changed, 199 insertions(+), 124 deletions(-)
----------------------------------------------------------------------