Explicitly spell out cancellation in default propagation mask

9 years ago · 44912d78a0
parent 354e2127a2
commit 44912d78a0
1 changed files with 4 additions and 4 deletions
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@ -369,9 +369,9 @@ typedef struct grpc_op {
   propagation. Doing so gives flexibility in the future to define new 
   propagation types that are default inherited or not. */
 #define GRPC_PROPAGATE_DEFAULTS                                                \
-  ((gpr_uint32)((0xffff | GRPC_PROPAGATE_DEADLINE |    \
+  ((gpr_uint32)((                                                              \
-                 GRPC_PROPAGATE_CENSUS_STATS_CONTEXT | \
+      0xffff | GRPC_PROPAGATE_DEADLINE | GRPC_PROPAGATE_CENSUS_STATS_CONTEXT | \
-                 GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT)))
+      GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT | GRPC_PROPAGATE_CANCELLATION)))
 /** Initialize the grpc library.