Fix build without FEATURE_CONNECTION_KEEP_ALIVE

Sponsored by: Robert Klemme

diff --git a/jcc.c b/jcc.c
index f258544..5f7a1fd 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1201,6 +1201,7 @@ void save_connection_destination(jb_socket sfd,
    }
    server_connection->forward_port = fwd->forward_port;
 }
    }
    server_connection->forward_port = fwd->forward_port;
 }

+#endif /* FEATURE_CONNECTION_KEEP_ALIVE */

 
 
 /*********************************************************************
 
 
 /*********************************************************************


@@ -1301,7 +1302,6 @@ static void verify_request_length(struct client_state *csp)
       log_error(LOG_LEVEL_CONNECT, "Complete client request received.");
    }
 }
       log_error(LOG_LEVEL_CONNECT, "Complete client request received.");
    }
 }

-#endif /* FEATURE_CONNECTION_KEEP_ALIVE */

 
 
 /*********************************************************************
 
 
 /*********************************************************************


@@ -1922,6 +1922,7 @@ static jb_err parse_client_request(struct client_state *csp)
       /* Assume persistence until further notice */
       csp->flags |= CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE;
    }
       /* Assume persistence until further notice */
       csp->flags |= CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE;
    }

+#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */

 
    if (csp->http->ssl == 0)
    {
 
    if (csp->http->ssl == 0)
    {


@@ -1948,7 +1949,6 @@ static jb_err parse_client_request(struct client_state *csp)
       csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED;
    }
 #endif
       csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED;
    }
 #endif

-#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */

 
    err = sed(csp, FILTER_CLIENT_HEADERS);
    if (JB_ERR_OK != err)
 
    err = sed(csp, FILTER_CLIENT_HEADERS);
    if (JB_ERR_OK != err)

diff --git a/parsers.c b/parsers.c
index e28caba..9b4a129 100644 (file)
--- a/parsers.c
+++ b/parsers.c
@@ -141,10 +141,10 @@ static jb_err server_save_content_length(struct client_state *csp, char **header
 static jb_err server_keep_alive(struct client_state *csp, char **header);
 static jb_err server_proxy_connection(struct client_state *csp, char **header);
 static jb_err client_keep_alive(struct client_state *csp, char **header);
 static jb_err server_keep_alive(struct client_state *csp, char **header);
 static jb_err server_proxy_connection(struct client_state *csp, char **header);
 static jb_err client_keep_alive(struct client_state *csp, char **header);

-static jb_err client_save_content_length(struct client_state *csp, char **header);

 static jb_err client_proxy_connection(struct client_state *csp, char **header);
 #endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
 
 static jb_err client_proxy_connection(struct client_state *csp, char **header);
 #endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
 

+static jb_err client_save_content_length(struct client_state *csp, char **header);

 static jb_err client_host_adder       (struct client_state *csp);
 static jb_err client_xtra_adder       (struct client_state *csp);
 static jb_err client_x_forwarded_for_adder(struct client_state *csp);
 static jb_err client_host_adder       (struct client_state *csp);
 static jb_err client_xtra_adder       (struct client_state *csp);
 static jb_err client_x_forwarded_for_adder(struct client_state *csp);


@@ -188,9 +188,9 @@ static const struct parsers client_patterns[] = {
    { "TE:",                       3,   client_te },
    { "Host:",                     5,   client_host },
    { "if-modified-since:",       18,   client_if_modified_since },
    { "TE:",                       3,   client_te },
    { "Host:",                     5,   client_host },
    { "if-modified-since:",       18,   client_if_modified_since },

+   { "Content-Length:",          15,   client_save_content_length },

 #ifdef FEATURE_CONNECTION_KEEP_ALIVE
    { "Keep-Alive:",              11,   client_keep_alive },
 #ifdef FEATURE_CONNECTION_KEEP_ALIVE
    { "Keep-Alive:",              11,   client_keep_alive },

-   { "Content-Length:",          15,   client_save_content_length },

    { "Proxy-Connection:",        17,   client_proxy_connection },
 #else
    { "Keep-Alive:",              11,   crumble },
    { "Proxy-Connection:",        17,   client_proxy_connection },
 #else
    { "Keep-Alive:",              11,   crumble },


@@ -1850,6 +1850,7 @@ static jb_err server_proxy_connection(struct client_state *csp, char **header)
    csp->flags |= CSP_FLAG_SERVER_PROXY_CONNECTION_HEADER_SET;
    return JB_ERR_OK;
 }
    csp->flags |= CSP_FLAG_SERVER_PROXY_CONNECTION_HEADER_SET;
    return JB_ERR_OK;
 }

+#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */

 
 
 /*********************************************************************
 
 
 /*********************************************************************


@@ -1882,6 +1883,7 @@ static jb_err proxy_authentication(struct client_state *csp, char **header)
 }
 
 
 }
 
 

+#ifdef FEATURE_CONNECTION_KEEP_ALIVE

 /*********************************************************************
  *
  * Function    :  client_keep_alive
 /*********************************************************************
  *
  * Function    :  client_keep_alive


@@ -1948,6 +1950,7 @@ static jb_err client_keep_alive(struct client_state *csp, char **header)
 
    return JB_ERR_OK;
 }
 
    return JB_ERR_OK;
 }

+#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */

 
 
 /*********************************************************************
 
 
 /*********************************************************************


@@ -2020,8 +2023,6 @@ static jb_err client_save_content_length(struct client_state *csp, char **header
 
    return JB_ERR_OK;
 }
 
    return JB_ERR_OK;
 }

-#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
-

 
 
 /*********************************************************************
 
 
 /*********************************************************************


@@ -4883,7 +4884,6 @@ static void create_content_length_header(unsigned long long content_length,
 }
 
 
 }
 
 

-#ifdef FEATURE_CONNECTION_KEEP_ALIVE

 /*********************************************************************
  *
  * Function    :  get_expected_content_length
 /*********************************************************************
  *
  * Function    :  get_expected_content_length


@@ -4915,7 +4915,7 @@ unsigned long long get_expected_content_length(struct list *headers)
 
    return content_length;
 }
 
    return content_length;
 }

-#endif
+

 
 /*
   Local Variables:
 
 /*
   Local Variables: