diff options
author | 2017-04-14 08:22:55 -0700 | |
---|---|---|
committer | 2017-04-14 08:22:55 -0700 | |
commit | 3136568e36abf32891cef392b02dddc9f8916d11 (patch) | |
tree | 5132d8849b93a3ea2cd0d1f5bc9d429f9163c8f5 /src/core/ext/transport/chttp2/server/chttp2_server.c | |
parent | 4f505464bdd8435a1ffe345357e30bb63fbf2120 (diff) | |
parent | b81fb794a397b053df0d4bed7b1525a0ff51535f (diff) |
Merge remote-tracking branch 'upstream/master' into revert-10619-revert-9626-lazy-deframe
Diffstat (limited to 'src/core/ext/transport/chttp2/server/chttp2_server.c')
-rw-r--r-- | src/core/ext/transport/chttp2/server/chttp2_server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.c b/src/core/ext/transport/chttp2/server/chttp2_server.c index 6433968ca5..b463506a98 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.c +++ b/src/core/ext/transport/chttp2/server/chttp2_server.c @@ -43,11 +43,11 @@ #include <grpc/support/sync.h> #include <grpc/support/useful.h> +#include "src/core/ext/filters/http/server/http_server_filter.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/handshaker.h" #include "src/core/lib/channel/handshaker_registry.h" -#include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/tcp_server.h" |