httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r823624 - in /httpd/mod_fcgid/trunk/modules/fcgid: fcgid_conf.c fcgid_pm.h fcgid_pm_main.c fcgid_pm_unix.c fcgid_pm_win.c fcgid_proc_win.c
Date Fri, 09 Oct 2009 17:20:16 GMT
Author: trawick
Date: Fri Oct  9 17:20:15 2009
New Revision: 823624

URL: http://svn.apache.org/viewvc?rev=823624&view=rev
Log:
s/wrapperpath/wrapper_cmdline/

The use of the "wrapperpath" field/variable changed in the past to include 
any optional arguments to the wrapper command.  Rename accordingly.

Modified:
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm.h
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.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=823624&r1=823623&r2=823624&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:20:15 2009
@@ -749,7 +749,7 @@
 } wrapper_id_info;
 
 const char *set_wrapper_config(cmd_parms * cmd, void *dirconfig,
-                               const char *wrapperpath,
+                               const char *wrapper_cmdline,
                                const char *extension,
                                const char *virtual)
 {
@@ -764,7 +764,7 @@
 
     /* Sanity checks */
 
-    if (wrapperpath == NULL)
+    if (wrapper_cmdline == NULL)
         return "Invalid wrapper file";
 
     if (virtual == NULL && extension != NULL && !strcasecmp(extension, WRAPPER_FLAG_VIRTUAL))
{
@@ -798,21 +798,21 @@
                               apr_pool_cleanup_null,
                               cmd->server->process->pool);
     }
-    /* Get wrapper_id for wrapperpath */
+    /* Get wrapper_id for wrapper_cmdline */
     if ((wrapper_id =
-         apr_hash_get(id_info->wrapper_id_hash, wrapperpath,
-                      strlen(wrapperpath))) == NULL) {
+         apr_hash_get(id_info->wrapper_id_hash, wrapper_cmdline,
+                      strlen(wrapper_cmdline))) == NULL) {
         wrapper_id =
             apr_pcalloc(cmd->server->process->pool, sizeof(*wrapper_id));
         *wrapper_id = id_info->cur_id++;
-        apr_hash_set(id_info->wrapper_id_hash, wrapperpath,
-                     strlen(wrapperpath), wrapper_id);
+        apr_hash_set(id_info->wrapper_id_hash, wrapper_cmdline,
+                     strlen(wrapper_cmdline), wrapper_id);
     }
 
     wrapper = apr_pcalloc(cmd->server->process->pconf, sizeof(*wrapper));
 
     /* Get wrapper path */
-    tmp = wrapperpath;
+    tmp = wrapper_cmdline;
     path = ap_getword_white(cmd->temp_pool, &tmp);
     if (path == NULL || *path == '\0')
         return "Invalid wrapper config";
@@ -823,7 +823,7 @@
         return missing_file_msg(cmd->pool, "Wrapper", path, rv);
     }
 
-    apr_cpystrn(wrapper->args, wrapperpath, _POSIX_PATH_MAX);
+    apr_cpystrn(wrapper->args, wrapper_cmdline, _POSIX_PATH_MAX);
     wrapper->inode = finfo.inode;
     wrapper->deviceid = finfo.device;
     wrapper->share_group_id = *wrapper_id;

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm.h
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm.h?rev=823624&r1=823623&r2=823624&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm.h (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm.h Fri Oct  9 17:20:15 2009
@@ -22,7 +22,7 @@
 
 typedef struct {
     char cgipath[_POSIX_PATH_MAX];
-    char wrapperpath[_POSIX_PATH_MAX];
+    char wrapper_cmdline[_POSIX_PATH_MAX];
     apr_ino_t inode;
     dev_t deviceid;
     apr_size_t share_grp_id;

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c?rev=823624&r1=823623&r2=823624&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c Fri Oct  9 17:20:15 2009
@@ -531,9 +531,9 @@
     }
 
     /* Spawn the process now */
-    /* XXX Spawn uses wrapperpath, but log uses cgipath ? */
+    /* XXX Spawn uses wrapper_cmdline, but log uses cgipath ? */
     if ((rv =
-        proc_spawn_process(command->wrapperpath, &procinfo,
+        proc_spawn_process(command->wrapper_cmdline, &procinfo,
                            procnode)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, rv, main_server,
                      "mod_fcgid: spawn process %s error",

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c?rev=823624&r1=823623&r2=823624&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c Fri Oct  9 17:20:15 2009
@@ -411,13 +411,13 @@
     command->virtualhost = r->server->server_hostname;
 
     /* Update fcgid_command with wrapper info */
-    command->wrapperpath[0] = '\0';
+    command->wrapper_cmdline[0] = '\0';
     if ((wrapperconf = get_wrapper_info(argv0, r))) {
-        apr_cpystrn(command->wrapperpath, wrapperconf->args, _POSIX_PATH_MAX);
+        apr_cpystrn(command->wrapper_cmdline, wrapperconf->args, _POSIX_PATH_MAX);
         command->deviceid = wrapperconf->deviceid;
         command->inode = wrapperconf->inode;
         command->share_grp_id = wrapperconf->share_group_id;
-        cmd_to_spawn = command->wrapperpath;
+        cmd_to_spawn = command->wrapper_cmdline;
     }
     else {
         cmd_to_spawn = command->cgipath;

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c?rev=823624&r1=823623&r2=823624&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c Fri Oct  9 17:20:15 2009
@@ -140,13 +140,13 @@
     command->virtualhost = r->server->server_hostname;
 
     /* Update fcgid_command with wrapper info */
-    command->wrapperpath[0] = '\0';
+    command->wrapper_cmdline[0] = '\0';
     if ((wrapperconf = get_wrapper_info(argv0, r))) {
-        apr_cpystrn(command->wrapperpath, wrapperconf->args, _POSIX_PATH_MAX);
+        apr_cpystrn(command->wrapper_cmdline, wrapperconf->args, _POSIX_PATH_MAX);
         command->deviceid = wrapperconf->deviceid;
         command->inode = wrapperconf->inode;
         command->share_grp_id = wrapperconf->share_group_id;
-        cmd_to_spawn = command->wrapperpath;
+        cmd_to_spawn = command->wrapper_cmdline;
     }
     else {
         cmd_to_spawn = command->cgipath;

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c?rev=823624&r1=823623&r2=823624&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c Fri Oct  9 17:20:15 2009
@@ -59,7 +59,7 @@
     return APR_SUCCESS;
 }
 
-apr_status_t proc_spawn_process(char *wrapperpath, fcgid_proc_info *procinfo,
+apr_status_t proc_spawn_process(char *wrapper_cmdline, fcgid_proc_info *procinfo,
                                 fcgid_procnode *procnode)
 {
     HANDLE *finish_event, listen_handle;
@@ -79,7 +79,7 @@
 
     /* Build wrapper args */
     argc = 0;
-    tmp = wrapperpath;
+    tmp = wrapper_cmdline;
     while (1) {
         word = ap_getword_white(procnode->proc_pool, &tmp);
         if (word == NULL || *word == '\0')
@@ -165,7 +165,7 @@
                != APR_SUCCESS
         || (rv = apr_procattr_dir_set(proc_attr,
                      ap_make_dirstr_parent(procnode->proc_pool,
-                         (wrapperpath && wrapperpath[0] != '\0') 
+                         (wrapper_cmdline && wrapper_cmdline[0] != '\0') 
                               ? wargv[0] : procinfo->cgipath))) != APR_SUCCESS
         || (rv = apr_procattr_cmdtype_set(proc_attr, APR_PROGRAM))
                != APR_SUCCESS
@@ -184,10 +184,10 @@
     }
 
     /* fork and exec now */
-    if (wrapperpath != NULL && wrapperpath[0] != '\0') {
+    if (wrapper_cmdline != NULL && wrapper_cmdline[0] != '\0') {
         ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, procinfo->main_server,
                      "mod_fcgid: call %s with wrapper %s",
-                     procinfo->cgipath, wrapperpath);
+                     procinfo->cgipath, wrapper_cmdline);
         if ((rv = apr_proc_create(procnode->proc_id, wargv[0],
                                   wargv, proc_environ, proc_attr,
                                   procnode->proc_pool)) != APR_SUCCESS) {



Mime
View raw message