VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-06 11:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

* modules/generators/mod_cgid.c (get_cgi_pid): Fix test for pid=0.

Browse Source 
(cgid_handler): Remove duplicated test for pid=0 here added in
  r1879119.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879860 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2020-07-14 16:25:43 +00:00
parent a4ee6e97a2
commit edb644302a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/generators/mod_cgid.c
View File

@ -1517,7 +1517,9 @@ static apr_status_t get_cgi_pid(request_rec *r, cgid_server_conf *conf, pid_t *
return stat; return stat;
} }
if (pid == 0) { /* Don't accept zero as a pid here, calling kill(0, SIGTERM) etc
* later is unpleasant. */
if (*pid == 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01261) ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01261)
"daemon couldn't find CGI process for connection %lu", "daemon couldn't find CGI process for connection %lu",
r->connection->id); r->connection->id);
@ -1650,9 +1652,7 @@ static int cgid_handler(request_rec *r)
info->r = r; info->r = r;
rv = get_cgi_pid(r, conf, &(info->pid)); rv = get_cgi_pid(r, conf, &(info->pid));
/* Don't accept zero as a pid here, calling kill(0, SIGTERM) etc if (rv == APR_SUCCESS) {
* later is unpleasant. */
if (rv == APR_SUCCESS && info->pid) {
apr_pool_cleanup_register(r->pool, info, apr_pool_cleanup_register(r->pool, info,
cleanup_script, apr_pool_cleanup_null); cleanup_script, apr_pool_cleanup_null);
} }