diff --git a/Makefile b/Makefile index efdd10297..03f7e7165 100644 --- a/Makefile +++ b/Makefile @@ -960,8 +960,7 @@ OBJS += src/mux_h2.o src/mux_fcgi.o src/mux_h1.o src/tcpcheck.o \ src/base64.o src/auth.o src/uri_auth.o src/time.o src/ebistree.o \ src/dynbuf.o src/wdt.o src/pipe.o src/init.o src/http_acl.o \ src/hpack-huff.o src/hpack-enc.o src/dict.o src/freq_ctr.o \ - src/ebtree.o src/hash.o src/dgram.o src/version.o \ - src/proto_reverse_connect.o + src/ebtree.o src/hash.o src/dgram.o src/version.o src/proto_rhttp.o ifneq ($(TRACE),) OBJS += src/calltrace.o diff --git a/include/haproxy/proto_reverse_connect-t.h b/include/haproxy/proto_rhttp-t.h similarity index 73% rename from include/haproxy/proto_reverse_connect-t.h rename to include/haproxy/proto_rhttp-t.h index 4e7a579de..28e2ff952 100644 --- a/include/haproxy/proto_reverse_connect-t.h +++ b/include/haproxy/proto_rhttp-t.h @@ -1,5 +1,5 @@ -#ifndef _HAPROXY_PROTO_REVERSE_CONNECT_H_T -#define _HAPROXY_PROTO_REVERSE_CONNECT_H_T +#ifndef _HAPROXY_PROTO_RHTTP_H_T +#define _HAPROXY_PROTO_RHTTP_H_T /* State for reverse preconnect listener state machine. * Used to limit log reporting only on state changes. @@ -11,4 +11,4 @@ enum li_preconn_state { LI_PRECONN_ST_FULL, /* pre-connect maxconn reached */ }; -#endif /* _HAPROXY_PROTO_REVERSE_CONNECT_H_T */ +#endif /* _HAPROXY_PROTO_RHTTP_H_T */ diff --git a/include/haproxy/proto_reverse_connect.h b/include/haproxy/proto_rhttp.h similarity index 82% rename from include/haproxy/proto_reverse_connect.h rename to include/haproxy/proto_rhttp.h index 0c07356e0..8ce90f778 100644 --- a/include/haproxy/proto_reverse_connect.h +++ b/include/haproxy/proto_rhttp.h @@ -1,5 +1,5 @@ -#ifndef _HAPROXY_PROTO_REVERSE_CONNECT_H -#define _HAPROXY_PROTO_REVERSE_CONNECT_H +#ifndef _HAPROXY_PROTO_RHTTP_H +#define _HAPROXY_PROTO_RHTTP_H #include #include @@ -18,4 +18,4 @@ int rev_accepting_conn(const struct receiver *rx); void rev_notify_preconn_err(struct listener *l); -#endif /* _HAPROXY_PROTO_REVERSE_CONNECT_H */ +#endif /* _HAPROXY_PROTO_RHTTP_H */ diff --git a/include/haproxy/receiver-t.h b/include/haproxy/receiver-t.h index d9f280e46..17bb56915 100644 --- a/include/haproxy/receiver-t.h +++ b/include/haproxy/receiver-t.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/src/connection.c b/src/connection.c index 547fff1b4..f07113abd 100644 --- a/src/connection.c +++ b/src/connection.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/proto_reverse_connect.c b/src/proto_rhttp.c similarity index 99% rename from src/proto_reverse_connect.c rename to src/proto_rhttp.c index 3d100d594..c2b3f9dad 100644 --- a/src/proto_reverse_connect.c +++ b/src/proto_rhttp.c @@ -16,7 +16,7 @@ #include #include -#include +#include struct proto_fam proto_fam_reverse_connect = { .name = "reverse_connect",