Merge pull request #299 from Castaglia/proxy-disable-nagle

Disable the Nagle algorithm by default on our TCP connections to back…

Author: Castaglia

lib/proxy/conn.c

@@ -1023,6 +1023,12 @@ conn_t *proxy_conn_get_server_conn(pool *p, struct proxy_session *proxy_sess,
  pr_inet_close(p, server_conn);
 
  pr_pool_tag(ctrl_conn->pool, "proxy backend ctrl conn pool");
+
+ /* Make sure that TCP_NODELAY is enabled (i.e. Nagle is disabled) by default
+ * for our control connections.
+ */
+ (void) pr_inet_set_proto_nodelay(ctrl_conn->pool, ctrl_conn, 1);
+
  return ctrl_conn;
 }
 

lib/proxy/ftp/conn.c

@@ -128,6 +128,12 @@ conn_t *proxy_ftp_conn_accept(pool *p, conn_t *data_conn, conn_t *ctrl_conn,
 
  pr_trace_msg(trace_channel, 9,
  "accepted connection from server '%s'", conn->remote_name);
+
+ /* Make sure that TCP_NODELAY is enabled (i.e. Nagle is disabled) by default
+ * for our data connections.
+ */
+ (void) pr_inet_set_proto_nodelay(conn->pool, conn, 1);
+
  return conn;
 }
 
@@ -247,6 +253,12 @@ conn_t *proxy_ftp_conn_connect(pool *p, const pr_netaddr_t *bind_addr,
 
  pr_trace_msg(trace_channel, 9,
  "connected to server '%s'", opened->remote_name);
+
+ /* Make sure that TCP_NODELAY is enabled (i.e. Nagle is disabled) by default
+ * for our data connections.
+ */
+ (void) pr_inet_set_proto_nodelay(opened->pool, opened, 1);
+
  return opened;
 }
 

lib/proxy/tls.c

@@ -1417,22 +1417,11 @@ static int tls_connect(conn_t *conn, const char *host_name,
  }
 
  /* If configured, set a timer for the handshake. */
- if (handshake_timeout) {
+ if (handshake_timeout > 0) {
  handshake_timer_id = pr_timer_add(handshake_timeout, -1,
  &proxy_module, handshake_timeout_cb, "SSL/TLS handshake");
  }
 
- /* Make sure that TCP_NODELAY is enabled for the handshake. */
- (void) pr_inet_set_proto_nodelay(conn->pool, conn, 1);
-
- /* Make sure that TCP_CORK (aka TCP_NOPUSH) is DISABLED for the handshake. */
- if (pr_inet_set_proto_cork(conn->wfd, 0) < 0) {
- pr_trace_msg(trace_channel, 9,
- "error disabling TCP_CORK on %s conn: %s",
- nstrm->strm_type == PR_NETIO_STRM_CTRL ? "control" : "data",
- strerror(errno));
- }
-
  connect_retry:
 
  blocking = tls_get_block(conn);
@@ -1555,17 +1544,7 @@ static int tls_connect(conn_t *conn, const char *host_name,
  /* Disable the handshake timer. */
  pr_timer_remove(handshake_timer_id, &proxy_module);
 
- /* Disable TCP_NODELAY, now that the handshake is done. */
- (void) pr_inet_set_proto_nodelay(conn->pool, conn, 0);
-
- if (nstrm->strm_type == PR_NETIO_STRM_DATA) {
- /* Re-enable TCP_CORK (aka TCP_NOPUSH), now that the handshake is done. */
- if (pr_inet_set_proto_cork(conn->wfd, 1) < 0) {
- pr_trace_msg(trace_channel, 9,
- "error re-enabling TCP_CORK on data conn: %s", strerror(errno));
- }
-
- } else if (nstrm->strm_type == PR_NETIO_STRM_CTRL) {
+ if (nstrm->strm_type == PR_NETIO_STRM_CTRL) {
  int reused;
 
  /* Only try to cache the new SSL session if we actually did create a