diff options
author | Yang Gao <yangg@google.com> | 2015-05-18 09:59:20 -0700 |
---|---|---|
committer | Yang Gao <yangg@google.com> | 2015-05-18 09:59:20 -0700 |
commit | 9e28875206d03a5fc5b1c5c51ebe4c0a7506f717 (patch) | |
tree | 63c37f61ef64b2e3c687a25bae26adc13b2c53b2 | |
parent | cc1c37c3e5aa7dc5e0da761e1bff0fe8e1fbaaee (diff) | |
parent | 818b8769fc59b805e7aa3742cc1e713fa9a4c9b5 (diff) |
Merge pull request #1637 from ctiller/explain-the-things
Delete antiquated code
-rw-r--r-- | include/grpc/grpc_http.h | 67 | ||||
-rw-r--r-- | src/core/channel/http_server_filter.c | 1 |
2 files changed, 0 insertions, 68 deletions
diff --git a/include/grpc/grpc_http.h b/include/grpc/grpc_http.h deleted file mode 100644 index c41e87413f..0000000000 --- a/include/grpc/grpc_http.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * - * Copyright 2015, Google Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifndef GRPC_GRPC_HTTP_H -#define GRPC_GRPC_HTTP_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* HTTP GET support. - - HTTP2 servers can publish statically generated text content served - via HTTP2 GET queries by publishing one or more grpc_http_server_page - elements via repeated GRPC_ARG_SERVE_OVER_HTTP elements in the servers - channel_args. - - This is not: - - a general purpose web server - - particularly fast - - It's useful for being able to serve up some static content (maybe some - javascript to be able to interact with your GRPC server?) */ - -typedef struct { - const char *path; - const char *content_type; - const char *content; -} grpc_http_server_page; - -#define GRPC_ARG_SERVE_OVER_HTTP "grpc.serve_over_http" - -#ifdef __cplusplus -} -#endif - -#endif /* GRPC_GRPC_HTTP_H */ diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index 1f64df68e3..11a53b1e70 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -34,7 +34,6 @@ #include "src/core/channel/http_server_filter.h" #include <string.h> -#include <grpc/grpc_http.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> |