svn commit: r823640 - /httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c

[tr...@apache.org]

Author: trawick
Date: Fri Oct  9 17:53:40 2009
New Revision: 823640

URL: http://svn.apache.org/viewvc?rev=823640&view=rev
Log:
TAKE123 ensures that you have at least one argument, so don't bother
checking if the wrapper (1st arg) has been specified

note a couple of fixmes related to FcgidWrapper config processing

Modified:
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c?rev=823640&r1=823639&r2=823640&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c Fri Oct  9 17:53:40 2009
@@ -748,6 +748,9 @@
     apr_size_t cur_id;
 } wrapper_id_info;
 
+/* FIXME thread safety issues when FcgidWrapper is used in .htaccess;
+ * see use of pconf
+ */
 const char *set_wrapper_config(cmd_parms * cmd, void *dirconfig,
                                const char *wrapper_cmdline,
                                const char *extension,
@@ -764,9 +767,6 @@
 
     /* Sanity checks */
 
-    if (wrapper_cmdline == NULL)
-        return "Invalid wrapper file";
-
     if (virtual == NULL && extension != NULL && !strcasecmp(extension, WRAPPER_FLAG_VIRTUAL)) {
         virtual = WRAPPER_FLAG_VIRTUAL;
         extension = NULL;
@@ -823,6 +823,7 @@
         return missing_file_msg(cmd->pool, "Wrapper", path, rv);
     }
 
+    /* FIXME no need to embed in structure (subject to correct pool usage) */
     apr_cpystrn(wrapper->args, wrapper_cmdline, _POSIX_PATH_MAX);
     wrapper->inode = finfo.inode;
     wrapper->deviceid = finfo.device;