e2de92fa6c
port #9505 to master
2017-01-31 16:34:31 -08:00
c63aaf1650
Merge branch 'cp' into rollfwd
2017-01-26 08:51:30 -08:00
6f690f3483
Merge pull request #9372 from markdroth/proxy_mapper
...
Add proxy mapper hook.
2017-01-25 10:42:34 -08:00
7c70b6c144
Revert "Revert "Metadata handling rewrite""
...
This reverts commit 5e01e2ac97
2017-01-23 07:48:42 -08:00
5e01e2ac97
Revert "Metadata handling rewrite"
2017-01-20 18:11:52 -08:00
d58a985a56
Move detection of HTTP CONNECT proxy from DNS resolver to client channel.
2017-01-18 08:28:57 -08:00
5acc826ace
Merge github.com:grpc/grpc into metadata_filter
2017-01-17 17:20:14 -08:00
79f2a24644
Add proxy mapper hook.
2017-01-17 14:13:33 -08:00
e6bcd0ebc9
Merge remote-tracking branch 'upstream/master' into revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup
2017-01-13 11:23:01 -08:00
2d9f8e8179
Fix build
2017-01-10 08:48:48 -08:00
d04dc4da81
Merge github.com:grpc/grpc into fix_errors
2017-01-09 14:40:28 -08:00
732351f826
Start fixing http error --> grpc status conversion
2017-01-06 14:52:01 -08:00
1f0f23cc5a
Handshaker plugin mechanism.
2017-01-06 13:07:19 -08:00
348fba2809
Merge remote-tracking branch 'upstream/master' into revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup
2017-01-06 11:07:30 -08:00
293ef1572b
Merge github.com:grpc/grpc into slice_with_exec_ctx
2017-01-04 15:38:44 -08:00
3ca6019d39
Merge branch 'patchy' into slice_with_exec_ctx_and_build
2017-01-04 14:41:29 -08:00
3d5592cea8
Moving message_size_filter properly.
2017-01-04 23:23:40 +01:00
ef6938477b
Merge branch 'slice_with_exec_ctx' into metadata_filter
2016-12-27 08:59:00 -08:00
0704727c2d
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-12-27 08:38:35 -08:00
8f7b0b48bf
v1.0.x → master upmerge
...
Manual changes:
- Fixed use of Exception.message in _invalid_metadata_test.py
- Fixed merge of one_failed_as_unavailable in rpc_server_spec.rb
- Added "set -e" to generate_build_additions.sh
2016-12-16 23:48:52 +00:00
1b0d2f008b
Merge branch 'slice_with_exec_ctx' into metadata_filter
2016-12-12 07:19:55 -08:00
6d379a90af
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-12-12 07:16:03 -08:00
4d2ea02129
Revert "Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""""
2016-12-12 07:12:27 -08:00
30268a99e0
Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h"""
2016-12-12 06:48:30 -08:00
b995e8bcda
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-12-12 06:36:43 -08:00
385dd9a462
Merge branch 'slice_interning' into metadata_filter
2016-12-06 20:27:38 -08:00
35769dc29c
Merge branch 'slice_with_exec_ctx' into slice_interning
2016-12-06 20:23:13 -08:00
30d50fed6d
Fix build
2016-12-06 19:34:32 -08:00
397bff36b9
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-12-06 15:05:59 -08:00
2d317fbc57
Revert "Revert "Remove redundant includes from string.h and tmpfile.h""
2016-12-05 08:07:13 -08:00
4eec0041f5
Revert "Remove redundant includes from string.h and tmpfile.h"
2016-12-05 08:03:41 -08:00
adc3fbc0a3
Merge pull request #8922 from sreecha/slice_cleanup
...
Remove redundant includes from string.h and tmpfile.h
2016-12-05 07:43:40 -08:00
714038204a
Use the same server code for both secure and insecure servers.
2016-12-02 10:51:39 -08:00
f989469fe3
Temporarily enable gpr_slice_* functions to not break api compatibility
2016-12-01 17:09:35 -08:00
369ddc524a
Merge branch 'slice_with_exec_ctx' into slice_interning
2016-11-30 13:32:18 -08:00
6c3d040ebf
Merge branch 'security_handshaker1' into security_handshaker2
2016-11-29 14:24:42 -08:00
a7f03f6423
Advance objective c version to v1.0.2
2016-11-28 11:29:19 -08:00
ac5f518016
Merge branch 'slice_with_exec_ctx' into eliminate_mdstr
2016-11-18 12:45:16 -08:00
b28c7e8710
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-11-18 10:29:04 -08:00
071cacf1cb
Rename security handshaker files.
2016-11-17 13:17:56 -08:00
8686cab11c
Use the same connector code for both secure and insecure clients.
2016-11-17 13:12:17 -08:00
66b14c125e
Merge branch 'slice_interning' into eliminate_mdstr
2016-11-16 16:05:01 -08:00
1094c32f35
Merge branch 'slice_with_exec_ctx' into slice_interning
2016-11-16 15:54:03 -08:00
c586666cbd
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-11-16 15:25:00 -08:00
863113a0d9
Merge remote-tracking branch 'upstream/master' into service_config_json
2016-11-16 14:18:28 -08:00
c80fa2f673
Merge pull request #8680 from ctiller/no_more_legacy
...
Remove legacy poller
2016-11-15 17:25:27 -08:00
5c1f55af23
Merge pull request #8335 from y-zeng/tos
...
Add grpc_socket_mutator
2016-11-11 15:05:14 -08:00
5ef31ab9c9
Progress towards mdstr elimination
2016-11-10 16:27:48 -08:00
14ded3bbff
Merge branch 'slice_with_exec_ctx' into slice_interning
2016-11-10 08:37:40 -08:00
7cdad96fc4
Fix foward declaration duplication
2016-11-10 08:37:21 -08:00
Muxi Yan