]> granicus.if.org Git - apache/commitdiff
Creation of external gzip process fails, if we
authorRainer Jung <rjung@apache.org>
Fri, 20 Mar 2009 17:34:25 +0000 (17:34 +0000)
committerRainer Jung <rjung@apache.org>
Fri, 20 Mar 2009 17:34:25 +0000 (17:34 +0000)
try to set the working directory to r->filename.
Use ap_make_dirstr_parent() instead, like in all
other similar places.

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

modules/metadata/mod_mime_magic.c

index 307972f224adc358d9ec8d612581079fdef67cba..b22f79ef4bcc001f0b4bfb3c1fa77a743d8ece1f 100644 (file)
@@ -2138,7 +2138,8 @@ static int create_uncompress_child(struct uncompress_parms *parm, apr_pool_t *cn
     if ((apr_procattr_create(&procattr, child_context) != APR_SUCCESS) ||
         (apr_procattr_io_set(procattr, APR_FULL_BLOCK,
                            APR_FULL_BLOCK, APR_NO_PIPE)   != APR_SUCCESS) ||
-        (apr_procattr_dir_set(procattr, r->filename)        != APR_SUCCESS) ||
+        (apr_procattr_dir_set(procattr,
+                              ap_make_dirstr_parent(r->pool, r->filename)) != APR_SUCCESS) ||
         (apr_procattr_cmdtype_set(procattr, APR_PROGRAM)    != APR_SUCCESS)) {
         /* Something bad happened, tell the world. */
         ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_ENOPROC, r,
@@ -2473,5 +2474,3 @@ module AP_MODULE_DECLARE_DATA mime_magic_module =
     mime_magic_cmds,           /* command apr_table_t */
     register_hooks              /* register hooks */
 };
-
-