rbb 99/12/16 07:41:29
Modified: src/modules/standard mod_include.c
Log:
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
Revision Changes Path
1.11 +4 -4 apache-2.0/src/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_include.c 1999/12/13 20:52:28 1.10
+++ mod_include.c 1999/12/16 15:41:28 1.11
@@ -853,20 +853,20 @@
(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);
