Fix mod_include so it works. Both people came up with very similar patches at

about the same time.  Since the work was duplicated, I am putting both names
on the patch.
Submitted by:   Allan Edwards and Paul Reder
Reviewed by:	Ryan Bloom

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84306 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 05f73fd3b5624823eaf8ed4590301952ad840757..248848aac95642ed1f094d946de53b06c8934616 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -853,20 +853,20 @@ static int include_cmd(char *s, request_rec *r)
         (ap_setprocattr_io(procattr, APR_NO_PIPE, 
                            APR_FULL_BLOCK, APR_NO_PIPE) != APR_SUCCESS) ||
         (ap_setprocattr_dir(procattr, ap_make_dirstr_parent(r->pool, r->filename)) != APR_SUCCESS) ||
-        (ap_setprocattr_cmdtype(procattr, APR_PROGRAM) != APR_SUCCESS)) {
+        (ap_setprocattr_cmdtype(procattr, APR_SHELLCMD) != APR_SUCCESS)) {
         /* Something bad happened, tell the world. */
        ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
-                     "couldn't create child process: %s", r->filename);
+            "couldn't initialize proc attributes: %s %s", r->filename, s);
         rc = !APR_SUCCESS;
     }
     else {
         build_argv_list(&argv, r, r->pool);
-        rc = ap_create_process(&procnew, r->filename, argv, ap_create_environment(r->pool, env), procattr, r->pool);
+        rc = ap_create_process(&procnew, s, argv, ap_create_environment(r->pool, env), procattr, r->pool);
 
         if (rc != APR_SUCCESS) {
             /* Bad things happened. Everyone should have cleaned up. */
             ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
-                        "couldn't create child process: %d: %s", rc, r->filename);
+                        "couldn't create child process: %d: %s", rc, s);
         }
         else {
             ap_note_subprocess(r->pool, procnew, kill_after_timeout);