Commit Graph

22 Commits

Author SHA1 Message Date
murgatroid99 231617f5ba Update to nan 2.0 2015-09-17 13:56:25 -07:00
Julien Boeuf 6fefd91642 Adding void* at then end of security related method in order to have a stable ABI. 2015-08-25 17:47:55 -07:00
Jan Tattermusch f5fa08c907 Merge pull request #2696 from murgatroid99/node_client_connectivity
Wrap connectivity API, expose it to client as waitForReady
2015-08-14 09:19:38 -07:00
murgatroid99 46a8476501 Modified watchState functions to match C API 2015-08-13 11:24:34 -07:00
murgatroid99 843510793d Resolved merge conflicts with master 2015-08-13 10:58:53 -07:00
Nicolas "Pixel" Noble 5cb7853f37 Fixing merge failures. 2015-08-12 20:07:54 +02:00
Nicolas "Pixel" Noble eecc28c9b3 Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown
Conflicts:
	src/node/ext/call.cc
	src/node/ext/channel.cc
2015-08-12 19:53:03 +02:00
Nicolas "Pixel" Noble 54cd2a30f1 Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown
Conflicts:
	include/grpc/grpc.h
	src/core/surface/channel.c
	src/core/surface/channel_create.c
	src/core/surface/completion_queue.c
	src/cpp/client/channel.cc
	src/cpp/client/insecure_credentials.cc
	src/csharp/ext/grpc_csharp_ext.c
	src/node/ext/call.cc
	src/node/ext/channel.cc
	src/php/ext/grpc/call.c
	src/php/ext/grpc/channel.c
	src/python/grpcio/grpc/_adapter/_c/types/channel.c
	src/ruby/ext/grpc/rb_channel.c
	test/core/end2end/dualstack_socket_test.c
	test/core/end2end/fixtures/chttp2_fullstack.c
	test/core/end2end/fixtures/chttp2_fullstack_compression.c
	test/core/end2end/fixtures/chttp2_fullstack_uds_posix.c
	test/core/end2end/fixtures/chttp2_fullstack_with_poll.c
	test/core/end2end/multiple_server_queues_test.c
	test/core/end2end/no_server_test.c
	test/core/end2end/tests/bad_hostname.c
	test/core/end2end/tests/cancel_after_accept.c
	test/core/end2end/tests/cancel_after_accept_and_writes_closed.c
	test/core/end2end/tests/cancel_after_invoke.c
	test/core/end2end/tests/cancel_before_invoke.c
	test/core/end2end/tests/cancel_in_a_vacuum.c
	test/core/end2end/tests/census_simple_request.c
	test/core/end2end/tests/disappearing_server.c
	test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c
	test/core/end2end/tests/empty_batch.c
	test/core/end2end/tests/graceful_server_shutdown.c
	test/core/end2end/tests/invoke_large_request.c
	test/core/end2end/tests/max_concurrent_streams.c
	test/core/end2end/tests/max_message_length.c
	test/core/end2end/tests/ping_pong_streaming.c
	test/core/end2end/tests/registered_call.c
	test/core/end2end/tests/request_response_with_binary_metadata_and_payload.c
	test/core/end2end/tests/request_response_with_metadata_and_payload.c
	test/core/end2end/tests/request_response_with_payload.c
	test/core/end2end/tests/request_response_with_payload_and_call_creds.c
	test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c
	test/core/end2end/tests/request_with_compressed_payload.c
	test/core/end2end/tests/request_with_flags.c
	test/core/end2end/tests/request_with_large_metadata.c
	test/core/end2end/tests/request_with_payload.c
	test/core/end2end/tests/server_finishes_request.c
	test/core/end2end/tests/simple_delayed_request.c
	test/core/end2end/tests/simple_request.c
	test/core/end2end/tests/simple_request_with_high_initial_sequence_number.c
	test/core/fling/client.c
	test/core/fling/server.c
	test/core/surface/lame_client_test.c
2015-08-08 01:45:38 +02:00
Nicolas "Pixel" Noble 2a4657d30a Working on node. 2015-08-07 20:46:01 +02:00
murgatroid99 ad3334967a Exposed host parameter in Call constructor, don't save it in Channel object 2015-08-03 15:17:53 -07:00
murgatroid99 ae7c9cc2bb Resolved merge conflicts 2015-07-30 16:24:06 -07:00
murgatroid99 c6d3cb0dfe Wrap connectivity API, expose it to client as waitForReady 2015-07-28 15:18:57 -07:00
murgatroid99 954538063c Made credentials an explicit required argument to channels 2015-07-27 14:56:40 -07:00
Craig Tiller 33beb6fc96 Merge github.com:grpc/grpc into elliptic-orange-chamelion
Conflicts:
	src/csharp/ext/grpc_csharp_ext.c
2015-07-26 12:55:47 -07:00
murgatroid99 7693e6676b Exposed channel target and call peer in Node wrapper 2015-07-24 10:43:27 -07:00
Craig Tiller 8f3e14210e C++ is also a language that can be insecure 2015-07-21 18:11:44 -07:00
Alexander Staubo 95894e9f7d Remove unused references to malloc.h (which is non-standard, Linux-specific and generally deprecated; use <cstdlib> instead). 2015-04-05 01:27:58 -04:00
murgatroid99 1008c5a730 The library now compiles with Node 0.11+ and all versions of io.js 2015-03-04 14:42:31 -08:00
murgatroid99 1fc959e5c4 Fixed TLS host resolution problems 2015-02-25 10:38:34 -08:00
Craig Tiller da0983d56a Add missing new-lines at end of file 2015-02-18 09:23:38 -08:00
Craig Tiller 42af13c956 Update copyright to 2015 2015-02-18 08:34:56 -08:00
murgatroid99 0bd4b5a17c Moved extension and JS files to separate directories 2015-01-26 17:16:57 -08:00