Commit Graph

263 Commits

Author SHA1 Message Date
Craig Tiller 61691f92c3 Merge github.com:grpc/grpc into credit 2015-03-02 08:51:52 -08:00
Nicolas "Pixel" Noble 1ff52d5278 Guard headers tool. 2015-03-01 06:18:14 +01:00
Craig Tiller cf133f41f8 Make it possible to compile with gcc4.6 2015-02-26 14:27:05 -08:00
Craig Tiller 7c0f33dea9 Merge github.com:grpc/grpc into credit 2015-02-24 17:02:07 -08:00
Craig Tiller cb0a28eb86 Merge pull request #755 from nicolasnoble/feedback
Second batch of feedback.
2015-02-24 16:59:14 -08:00
Nicolas Noble 085603c112 Second batch of feedback. 2015-02-24 16:52:06 -08:00
Craig Tiller 6e57b9edb1 Add Server.Wait 2015-02-24 15:46:22 -08:00
Craig Tiller 25f6cd7a97 Merge github.com:grpc/grpc into credit
Conflicts:
	examples/pubsub/publisher_test.cc
	examples/pubsub/subscriber_test.cc
	include/grpc++/create_channel.h
	src/cpp/client/create_channel.cc
	test/cpp/end2end/async_end2end_test.cc
	test/cpp/end2end/end2end_test.cc
	test/cpp/util/create_test_channel.cc
2015-02-24 08:12:05 -08:00
Craig Tiller b9d91eb454 Merge github.com:google/grpc into deprecate-c++
Conflicts:
	test/cpp/end2end/async_end2end_test.cc
	test/cpp/end2end/end2end_test.cc
2015-02-23 17:13:40 -08:00
Nicolas Noble 65b0759653 Addressing a first batch of feedback. 2015-02-23 15:38:52 -08:00
Craig Tiller e8eb8a4fd4 Merge github.com:grpc/grpc into credit 2015-02-23 14:56:42 -08:00
Craig Tiller 74ae8f61d9 Merge pull request #710 from jboeuf/default_google_creds
Added support for default credentials.
2015-02-23 14:41:18 -08:00
Craig Tiller e4fe844b67 s/CreateChannel/CreateChannelDeprecated
For the 2-argument version of CreateChannel.

This is a temporary step until #711 is ready to roll out.
2015-02-23 13:55:15 -08:00
Julien Boeuf c66f2a816e Addressing iniitial feedback.
- Renaming default credentials -> google default credentials.
- Various other things in cpp:
  - Adding Cpp wrapping for JWT Tokens.
  - Renaming ComposeCredentials -> CompositeCredentials.
2015-02-23 13:00:36 -08:00
Craig Tiller ad9d0c472d Remove dynamic_cast 2015-02-23 10:53:01 -08:00
Craig Tiller 42bc87c097 Update C++ server with new core API
And reflects the C++ API in ServerBuilder.
2015-02-23 09:58:23 -08:00
Craig Tiller 759026cbf0 Server API simplification
Remove 'secure_serer_create', and instead attach credentials to ports, meaning different ports can serve different credentials.
2015-02-23 09:58:22 -08:00
Craig Tiller 47c83fdaf7 Credentials prototyping
- Remove CredentialsFactory as it's unnecessary
- Effectively make Credentials a channel factory, allowing different credential types to create different channel types - this gives us a hook so that InsecureCredentials can at runtime instantiate a different kind of channel as required - giving us a way of generating an openssl free version of grpc++.
- Server credentials not touched yet, but they'll need to be updated.
2015-02-23 09:58:22 -08:00
Julien Boeuf cd9b1c850d Added support for default credentials.
- Tested with new tool (print_default_creds_token) on:
  - workstation for env var and well known place.
  - GCE for compute engine default creds.
- I'd prefer the grpc_default_credentials_create() API to remain
  synchronous even though there may be an async call for gce detection
  on which we block.
2015-02-21 21:57:42 -08:00
Nicolas "Pixel" Noble b87d176183 Merge branch 'master' of github.com:google/grpc into installed_ssl_roots-patch 2015-02-22 05:41:15 +01:00
Craig Tiller 8883e94e1e Merge pull request #703 from nicolasnoble/win32
Fixing Windows port.
2015-02-21 07:08:22 -08:00
Nicolas "Pixel" Noble 589cba2c7b Factorizing out function split_host_port. 2015-02-20 22:59:49 -08:00
Julien Boeuf 3e001792fa Adding roots.pem from Mozilla and associated logic.
- The roots.pem file has been generated from
  https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/builtins/certdata.txt
  using
  https://github.com/agl/extract-nss-root-certs
2015-02-20 15:55:17 -08:00
Nicolas Noble 2c29920e73 Revert "Adding a constant for a well known place where the SSL roots are installed." 2015-02-19 23:10:10 -08:00
Julien Boeuf d0c0a9d68c Adding a constant for a well known place where the SSL roots are installed. 2015-02-19 22:06:45 -08:00
Julien Boeuf f47a5cb93d Implementing JWT credentials (a.k.a JWT ID Tokens).
- Not tested end to end yet
2015-02-19 17:29:41 -08:00
Yang Gao d9f3dfe7eb Merge pull request #581 from ctiller/an-update-on-c++
Server side cancellation receive support for C++
2015-02-18 16:01:13 -08:00
Craig Tiller 2627e4e0a9 Merge with async unary changes 2015-02-18 15:54:14 -08:00
Craig Tiller 2d11c93ab5 Merge github.com:grpc/grpc into an-update-on-c++ 2015-02-18 15:51:50 -08:00
Craig Tiller e9defd77de Delete symlink to my home directory 2015-02-18 15:49:08 -08:00
Craig Tiller d24d13d6eb Simplify TryPluck 2015-02-18 15:35:32 -08:00
Craig Tiller c7625b0e5f Move header #include 2015-02-18 15:18:58 -08:00
Craig Tiller 8a287d1a1b Merge pull request #588 from yang-g/c++api
Async client api change. Add a ClientAsyncResponseReader.
2015-02-18 14:50:14 -08:00
Yang Gao 68bc778b63 2015 2015-02-18 14:41:40 -08:00
Yang Gao 3a5e5495e5 Async client api change. Add a ClientAsyncResponseReader. Make the api similar to streaming and symmetric to server side. 2015-02-18 14:32:38 -08:00
Nathaniel Manista befd64eace Merge pull request #572 from ctiller/dox7
Clarify completion queue laws
2015-02-18 13:27:45 -08:00
Nathaniel Manista d50bf4d98a Merge pull request #563 from ctiller/dox4
Expand init/destroy documentation
2015-02-18 13:27:04 -08:00
Craig Tiller f01ea7cee8 Merge github.com:grpc/grpc into an-update-on-c++ 2015-02-18 13:21:02 -08:00
Craig Tiller 7326901767 Merge pull request #579 from yang-g/c++api
change metadata getters to return const&
2015-02-18 13:18:53 -08:00
Craig Tiller eaaee49f9b Merge github.com:grpc/grpc into an-update-on-c++ 2015-02-18 13:14:15 -08:00
Craig Tiller 492968f7d9 Server side cancellation receive support 2015-02-18 13:14:03 -08:00
Yang Gao d0d007e6d1 change metadata getters to return const& 2015-02-18 10:28:09 -08:00
Craig Tiller 190d360def Add missing new-lines at end of file 2015-02-18 09:23:38 -08:00
Craig Tiller 645466e089 Initial sketch 2015-02-18 09:18:33 -08:00
Craig Tiller 0605995e55 Update copyright to 2015 2015-02-18 08:34:56 -08:00
Craig Tiller 6d5f42e79a Fix copyright notice 2015-02-18 08:31:24 -08:00
Craig Tiller aface44b34 Merge pull request #573 from yang-g/c++api
Changes to support server metadata.
2015-02-18 07:35:35 -08:00
Yang Gao 2b7f537546 Add metadata test with rpc. Adding/fixing things to make it work 2015-02-18 00:45:53 -08:00
Nathaniel Manista 4ddf950c89 Merge pull request #562 from ctiller/dox3
More channel argument documentation.
2015-02-17 23:10:16 -08:00
Craig Tiller 8ac56c9607 Clarify completion queue laws 2015-02-17 22:51:36 -08:00