From: Christophe Jaillet Date: Sat, 20 Apr 2019 07:01:29 +0000 (+0000) Subject: Axe a useless comment. X-Git-Tag: 2.5.0-alpha2-ci-test-only~2068 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4d0ae83a0ac6f0bfa22933ad25088d1f7577c07;p=thirdparty%2Fapache%2Fhttpd.git 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 --- diff --git a/modules/http/http_core.c b/modules/http/http_core.c index 746cf704a7b..a241783673f 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 &&