From eadc3100faaf9d658801c21ca1dccc0bfa6da0e2 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Tue, 23 Oct 2012 10:16:52 +0000 Subject: [PATCH] Make mark_connection_closed() visible when compiling without FEATURE_CONNECTION_KEEP_ALIVE It's used all over the place, ifdef-protecting each occurrence would be a mess, and calling it doesn't hurt. --- gateway.c | 4 +--- gateway.h | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gateway.c b/gateway.c index dad4c404..ae706cfa 100644 --- a/gateway.c +++ b/gateway.c @@ -1,4 +1,4 @@ -const char gateway_rcs[] = "$Id: gateway.c,v 1.90 2012/10/17 18:13:26 fabiankeil Exp $"; +const char gateway_rcs[] = "$Id: gateway.c,v 1.91 2012/10/21 12:56:38 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.c,v $ @@ -262,7 +262,6 @@ void remember_connection(const struct reusable_connection *connection) #endif /* def FEATURE_CONNECTION_SHARING */ -#ifdef FEATURE_CONNECTION_KEEP_ALIVE /********************************************************************* * * Function : mark_connection_closed @@ -292,7 +291,6 @@ void mark_connection_closed(struct reusable_connection *closed_connection) freez(closed_connection->forward_host); closed_connection->forward_port = 0; } -#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */ #ifdef FEATURE_CONNECTION_SHARING diff --git a/gateway.h b/gateway.h index 03a6df9e..4694a5bd 100644 --- a/gateway.h +++ b/gateway.h @@ -1,6 +1,6 @@ #ifndef GATEWAY_H_INCLUDED #define GATEWAY_H_INCLUDED -#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.20 2011/07/30 15:17:35 fabiankeil Exp $" +#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.21 2011/09/04 11:10:56 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.h,v $ @@ -63,8 +63,8 @@ extern void remember_connection(const struct reusable_connection *connection); extern int close_unusable_connections(void); #endif /* FEATURE_CONNECTION_SHARING */ -#ifdef FEATURE_CONNECTION_KEEP_ALIVE extern void mark_connection_closed(struct reusable_connection *closed_connection); +#ifdef FEATURE_CONNECTION_KEEP_ALIVE extern int connection_destination_matches(const struct reusable_connection *connection, const struct http_request *http, const struct forward_spec *fwd); -- 2.39.2