Skip to content

Commit

Permalink
mod_proxy: Update some comments, axe redundant socket_cleanup().
Browse files Browse the repository at this point in the history
  • Loading branch information
ylavic committed Jul 5, 2023
1 parent bc301ae commit ebf11e3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions modules/proxy/proxy_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -1530,6 +1530,7 @@ static void address_cleanup(proxy_conn_rec *conn)

static apr_status_t conn_pool_cleanup(void *theworker)
{
/* Signal that the child is exiting */
((proxy_worker *)theworker)->cp = NULL;
return APR_SUCCESS;
}
Expand Down Expand Up @@ -1672,9 +1673,10 @@ static void connection_cleanup(void *theconn)
conn->close = 0;
}
else if (conn->is_ssl) {
/* Unbind/reset the SSL connection dir config (sslconn->dc) from
* r->per_dir_config, r will likely get destroyed before this proxy
* conn is reused.
/* The current ssl section/dir config of the conn is not necessarily
* the one it will be reused for, so while the conn is in the reslit
* reset its ssl config to the worker's, until a new user sets its own
* ssl config eventually in proxy_connection_create() and so on.
*/
ap_proxy_ssl_engine(conn->connection, worker->section_config, 1);
}
Expand Down Expand Up @@ -3788,8 +3790,6 @@ static int proxy_connection_create(const char *proxy_function,
s, APLOGNO(00960) "%s: an error occurred creating a "
"new connection to %pI (%s)", proxy_function,
backend_addr, conn->hostname);
/* XXX: Will be closed when proxy_conn is closed */
socket_cleanup(conn);
return HTTP_INTERNAL_SERVER_ERROR;
}

Expand Down

0 comments on commit ebf11e3

Please sign in to comment.