diff options
| author |  ncteisen <ncteisen@gmail.com> | 2017-11-20 10:50:38 -0500 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2017-11-20 10:56:04 -0500 |
| commit | 993e9f06921123a9220031398ecfbf52a6114dce (patch) | |
| tree | f15a85d3446e8a8495e8fb5b02a1f7c4aa26c6fc /src/core/lib/http | |
| parent | 46f9175ba3a27958a1655707d6014de1ba3ce4d5 (diff) | |
| parent | 9addd2eef21a96e52135dc9369566d8452412763 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into no-more-extern-c
Diffstat (limited to 'src/core/lib/http')
| -rw-r--r-- | src/core/lib/http/parser.cc | 4 | ||||
| -rw-r--r-- | src/core/lib/http/parser.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/lib/http/parser.cc b/src/core/lib/http/parser.cc index 9134b0ced2..fb4eb234a7 100644 --- a/src/core/lib/http/parser.cc +++ b/src/core/lib/http/parser.cc @@ -25,7 +25,7 @@ #include <grpc/support/log.h> #include <grpc/support/useful.h> -grpc_tracer_flag grpc_http1_trace = GRPC_TRACER_INITIALIZER(false, "http1"); +grpc_core::TraceFlag grpc_http1_trace(false, "http1"); static char* buf2str(void* buffer, size_t length) { char* out = (char*)gpr_malloc(length + 1); @@ -294,7 +294,7 @@ static grpc_error* addbyte(grpc_http_parser* parser, uint8_t byte, case GRPC_HTTP_FIRST_LINE: case GRPC_HTTP_HEADERS: if (parser->cur_line_length >= GRPC_HTTP_PARSER_MAX_HEADER_LENGTH) { - if (GRPC_TRACER_ON(grpc_http1_trace)) + if (grpc_http1_trace.enabled()) gpr_log(GPR_ERROR, "HTTP header max line length (%d) exceeded", GRPC_HTTP_PARSER_MAX_HEADER_LENGTH); return GRPC_ERROR_CREATE_FROM_STATIC_STRING( diff --git a/src/core/lib/http/parser.h b/src/core/lib/http/parser.h index add6042f9b..5fef448019 100644 --- a/src/core/lib/http/parser.h +++ b/src/core/lib/http/parser.h @@ -107,6 +107,6 @@ grpc_error* grpc_http_parser_eof(grpc_http_parser* parser); void grpc_http_request_destroy(grpc_http_request* request); void grpc_http_response_destroy(grpc_http_response* response); -extern grpc_tracer_flag grpc_http1_trace; +extern grpc_core::TraceFlag grpc_http1_trace; #endif /* GRPC_CORE_LIB_HTTP_PARSER_H */ |