mirror of
https://github.com/apache/httpd.git
synced 2025-08-10 02:02:49 +03:00
Fixup DEBUG_CGI code paths to compile and not leak fds.
PR: 9670, 9671 Submitted by: David MacKenzie <djm@pix.net> Reviewed by: Justin Erenkrantz git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93474 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
3
CHANGES
3
CHANGES
@@ -1,5 +1,8 @@
|
|||||||
Changes with Apache 2.0.33-dev
|
Changes with Apache 2.0.33-dev
|
||||||
|
|
||||||
|
*) Fix DEBUG_CGI support in mod_cgi. PR 9670, 9671.
|
||||||
|
[David MacKenzie <djm@pix.net>]
|
||||||
|
|
||||||
*) Fix incorrect check for script_in in mod_cgi. PR 9669.
|
*) Fix incorrect check for script_in in mod_cgi. PR 9669.
|
||||||
[David MacKenzie <djm@pix.net>]
|
[David MacKenzie <djm@pix.net>]
|
||||||
|
|
||||||
|
@@ -402,8 +402,8 @@ static apr_status_t run_cgi_child(apr_file_t **script_out,
|
|||||||
|
|
||||||
RAISE_SIGSTOP(CGI_CHILD);
|
RAISE_SIGSTOP(CGI_CHILD);
|
||||||
#ifdef DEBUG_CGI
|
#ifdef DEBUG_CGI
|
||||||
fprintf(dbg, "Attempting to exec %s as %sCGI child (argv0 = %s)\n",
|
fprintf(dbg, "Attempting to exec %s as CGI child (argv0 = %s)\n",
|
||||||
r->filename, cld->nph ? "NPH " : "", argv0);
|
r->filename, argv[0]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (e_info->prog_type == RUN_AS_CGI) {
|
if (e_info->prog_type == RUN_AS_CGI) {
|
||||||
@@ -482,6 +482,9 @@ static apr_status_t run_cgi_child(apr_file_t **script_out,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#ifdef DEBUG_CGI
|
||||||
|
fclose(dbg);
|
||||||
|
#endif
|
||||||
return (rc);
|
return (rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user