From e12300438d6e21f385f659792ac7ee60bf2e9b26 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 19 Jul 2009 09:24:17 +0000
Subject: [PATCH] Unbreak client_connection() for
 !defined(FEATURE_CONNECTION_KEEP_ALIVE).

Won't somebody think of the OS/2 users?
---
 parsers.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/parsers.c b/parsers.c
index 6803e359..6b2df76b 100644
--- a/parsers.c
+++ b/parsers.c
@@ -1,4 +1,4 @@
-const char parsers_rcs[] = "$Id: parsers.c,v 1.198 2009/07/14 17:50:34 fabiankeil Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.199 2009/07/18 12:20:05 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/parsers.c,v $
@@ -1812,6 +1812,16 @@ static jb_err client_connection(struct client_state *csp, char **header)
             *header);
          csp->flags &= ~CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE;
       }
+#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
+   }
+   else
+   {
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+      log_error(LOG_LEVEL_HEADER,
+         "Keeping the client header '%s' around. "
+         "The server connection will be kept alive if possible.",
+         *header);
+      csp->flags |= CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE;
 #else
       char *old_header = *header;
 
@@ -1823,18 +1833,8 @@ static jb_err client_connection(struct client_state *csp, char **header)
       log_error(LOG_LEVEL_HEADER,
          "Replaced: \'%s\' with \'%s\'", old_header, *header);
       freez(old_header);
-#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
-   }
-#ifdef FEATURE_CONNECTION_KEEP_ALIVE
-   else
-   {
-      log_error(LOG_LEVEL_HEADER,
-         "Keeping the client header '%s' around. "
-         "The server connection will be kept alive if possible.",
-         *header);
-      csp->flags |= CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE;
-   }
 #endif  /* def FEATURE_CONNECTION_KEEP_ALIVE */
+   }
 
    /* Signal client_connection_adder() to return early. */
    csp->flags |= CSP_FLAG_CLIENT_CONNECTION_HEADER_SET;
-- 
2.39.2