You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jk...@apache.org on 2018/03/06 14:53:44 UTC
[1/2] thrift git commit: THRIFT-4508: Fix node.js to be the desired
version in docker ubuntu-artful image
Repository: thrift
Updated Branches:
refs/heads/master 0eb0b77a3 -> 14991f904
THRIFT-4508: Fix node.js to be the desired version in docker ubuntu-artful image
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/78755f52
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/78755f52
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/78755f52
Branch: refs/heads/master
Commit: 78755f5297ae931b1f2268e9215d041dc4c0dcc7
Parents: 0eb0b77
Author: James E. King III <jk...@apache.org>
Authored: Tue Mar 6 09:50:33 2018 -0500
Committer: James E. King III <jk...@apache.org>
Committed: Tue Mar 6 09:53:12 2018 -0500
----------------------------------------------------------------------
LANGUAGES.md | 2 +-
build/docker/ubuntu-artful/Dockerfile | 2 +-
test/known_failures_Linux.json | 28 ++++++++--------------------
3 files changed, 10 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/78755f52/LANGUAGES.md
----------------------------------------------------------------------
diff --git a/LANGUAGES.md b/LANGUAGES.md
index add3ae5..de37680 100644
--- a/LANGUAGES.md
+++ b/LANGUAGES.md
@@ -233,7 +233,7 @@ The Language/Library Levels indicate the minimum and maximum versions that are u
<td align=left><a href="lib/nodejs/README.md">node.js</a></td>
<!-- Since -----------------><td>0.6.0</td>
<!-- Build Systems ---------><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cred.png" alt=""/></td>
-<!-- Language Levels -------><td>4.2.6</td><td>8.9.1</td>
+<!-- Language Levels -------><td>4.2.6</td><td>8.9.4</td>
<!-- Low-Level Transports --><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td>
<!-- Transport Wrappers ----><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cred.png" alt=""/></td>
<!-- Protocols -------------><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td>
http://git-wip-us.apache.org/repos/asf/thrift/blob/78755f52/build/docker/ubuntu-artful/Dockerfile
----------------------------------------------------------------------
diff --git a/build/docker/ubuntu-artful/Dockerfile b/build/docker/ubuntu-artful/Dockerfile
index fe241c4..0b5b8ed 100644
--- a/build/docker/ubuntu-artful/Dockerfile
+++ b/build/docker/ubuntu-artful/Dockerfile
@@ -55,7 +55,7 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /et
RUN add-apt-repository ppa:haxe/releases -y
# node.js
-RUN curl -sL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
+RUN curl -sL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_8.x artful main" | tee /etc/apt/sources.list.d/nodesource.list
### install general dependencies
http://git-wip-us.apache.org/repos/asf/thrift/blob/78755f52/test/known_failures_Linux.json
----------------------------------------------------------------------
diff --git a/test/known_failures_Linux.json b/test/known_failures_Linux.json
index 6b8aadc..b302ae8 100644
--- a/test/known_failures_Linux.json
+++ b/test/known_failures_Linux.json
@@ -13,22 +13,22 @@
"c_glib-rs_multic_framed-ip",
"cl-c_glib_binary_buffered-ip",
"cl-c_glib_binary_framed-ip",
- "cl-c_glib_multi_buffered-ip",
- "cl-c_glib_multi_framed-ip",
"cl-c_glib_multi-binary_buffered-ip",
"cl-c_glib_multi-binary_framed-ip",
+ "cl-c_glib_multi_buffered-ip",
+ "cl-c_glib_multi_framed-ip",
"cl-go_binary_buffered-ip",
"cl-go_binary_framed-ip",
- "cl-rb_binary_buffered-ip",
- "cl-rb_binary_framed-ip",
"cl-rb_binary-accel_buffered-ip",
"cl-rb_binary-accel_framed-ip",
+ "cl-rb_binary_buffered-ip",
+ "cl-rb_binary_framed-ip",
"cl-rs_binary_buffered-ip",
"cl-rs_binary_framed-ip",
- "cl-rs_multi_buffered-ip",
- "cl-rs_multi_framed-ip",
"cl-rs_multi-binary_buffered-ip",
"cl-rs_multi-binary_framed-ip",
+ "cl-rs_multi_buffered-ip",
+ "cl-rs_multi_framed-ip",
"cpp-dart_binary_http-ip",
"cpp-dart_compact_http-ip",
"cpp-dart_json_http-ip",
@@ -235,32 +235,20 @@
"java-d_compact_framed-ip",
"netcore-csharp_binary_buffered-ip-ssl",
"netcore-csharp_binary_framed-ip-ssl",
- "netcore-csharp_json_framed-ip-ssl",
- "netcore-csharp_json_buffered-ip-ssl",
"netcore-csharp_compact_buffered-ip-ssl",
"netcore-csharp_compact_framed-ip-ssl",
+ "netcore-csharp_json_buffered-ip-ssl",
+ "netcore-csharp_json_framed-ip-ssl",
"nodejs-cpp_binary_http-ip",
"nodejs-cpp_binary_http-ip-ssl",
"nodejs-cpp_compact_http-ip",
"nodejs-cpp_compact_http-ip-ssl",
"nodejs-cpp_json_http-ip",
"nodejs-cpp_json_http-ip-ssl",
- "nodejs-d_binary_buffered-ip",
- "nodejs-d_binary_buffered-ip-ssl",
- "nodejs-d_binary_framed-ip",
- "nodejs-d_binary_framed-ip-ssl",
"nodejs-d_binary_http-ip",
"nodejs-d_binary_http-ip-ssl",
- "nodejs-d_compact_buffered-ip",
- "nodejs-d_compact_buffered-ip-ssl",
- "nodejs-d_compact_framed-ip",
- "nodejs-d_compact_framed-ip-ssl",
"nodejs-d_compact_http-ip",
"nodejs-d_compact_http-ip-ssl",
- "nodejs-d_json_buffered-ip",
- "nodejs-d_json_buffered-ip-ssl",
- "nodejs-d_json_framed-ip",
- "nodejs-d_json_framed-ip-ssl",
"nodejs-d_json_http-ip",
"nodejs-d_json_http-ip-ssl",
"nodejs-dart_binary_buffered-ip",
[2/2] thrift git commit: THRIFT-4354: fix php socket blocking
behavior Patch: Robert Lu Client: php
Posted by jk...@apache.org.
THRIFT-4354: fix php socket blocking behavior
Patch: Robert Lu <ro...@gmail.com>
Client: php
This closes #1384
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/14991f90
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/14991f90
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/14991f90
Branch: refs/heads/master
Commit: 14991f904184cc57b5d3e74a4266a0d6fbaf4832
Parents: 78755f5
Author: James E. King III <jk...@apache.org>
Authored: Tue Mar 6 09:47:33 2018 -0500
Committer: James E. King III <jk...@apache.org>
Committed: Tue Mar 6 09:53:21 2018 -0500
----------------------------------------------------------------------
lib/php/lib/Transport/TSocket.php | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/14991f90/lib/php/lib/Transport/TSocket.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Transport/TSocket.php b/lib/php/lib/Transport/TSocket.php
index 93bd1cf..5147efa 100644
--- a/lib/php/lib/Transport/TSocket.php
+++ b/lib/php/lib/Transport/TSocket.php
@@ -138,6 +138,7 @@ class TSocket extends TTransport
public function setHandle($handle)
{
$this->handle_ = $handle;
+ stream_set_blocking($this->handle_, false);
}
/**