summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorChristophe Jaillet <jailletc36@apache.org>2019-04-20 09:01:29 +0200
committerChristophe Jaillet <jailletc36@apache.org>2019-04-20 09:01:29 +0200
commite4d0ae83a0ac6f0bfa22933ad25088d1f7577c07 (patch)
tree6f7baf206d9304f22e760cdbb489a8dc38994f7a /modules
parentFix use of StateDir directive after r1852982: (diff)
downloadapache2-e4d0ae83a0ac6f0bfa22933ad25088d1f7577c07.tar.xz
apache2-e4d0ae83a0ac6f0bfa22933ad25088d1f7577c07.zip
Axe a useless comment.
Remove some dead code and innacurate comment. 'r' can not be dereferenced later in the function. (this is obvious since r1814659) (Reverted in r1858070) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1857857 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
-rw-r--r--modules/http/http_core.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 746cf704a7..a241783673 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -57,7 +57,6 @@ static const char *set_keep_alive_timeout(cmd_parms *cmd, void *dummy,
return err;
}
- /* Stolen from mod_proxy.c */
if (ap_timeout_parameter_parse(arg, &timeout, "s") != APR_SUCCESS)
return "KeepAliveTimeout has wrong format";
cmd->server->keep_alive_timeout = timeout;
@@ -156,14 +155,6 @@ static int ap_process_http_async_connection(conn_rec *c)
}
ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r);
ap_process_async_request(r);
- /* After the call to ap_process_request, the
- * request pool may have been deleted. We set
- * r=NULL here to ensure that any dereference
- * of r that might be added later in this function
- * will result in a segfault immediately instead
- * of nondeterministic failures later.
- */
- r = NULL;
}
if (cs->state != CONN_STATE_WRITE_COMPLETION &&