commit 7272d18fa113e661dfd195081972086bafb2cd61
author William A. Rowe Jr <wrowe@apache.org> Fri Nov 16 18:27:23 2012 +0000
committer William A. Rowe Jr <wrowe@apache.org> Fri Nov 16 18:27:23 2012 +0000
tree 46978c5f074e9117bcd84c898794ac9de1c5c33b
parent 9b93d366b40ab55d874ee950f40b6a36080b6db1

Honor quoted FcgidCmdOptions arguments (notably for InitialEnv assignments).

PR: 51657


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

CHANGES-FCGID

diff --git a/CHANGES-FCGID b/CHANGES-FCGID
index 2e01c2c..9e324be 100644
--- a/CHANGES-FCGID
+++ b/CHANGES-FCGID
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with mod_fcgid 2.3.8
 
+  *) Honor quoted FcgidCmdOptions arguments (notably for InitialEnv
+     assignments).  PR 51657  [William Rowe]
+
   *) Conform script response parsing with mod_cgid and ensure no response
      body is sent when ap_meets_conditions() determines that request
      conditions are met.  [Chris Darroch]
@@ -13,7 +16,7 @@
      redirections are not meaningful in this mode.  [Chris Darroch]
      
   *) Avoid a 1 s sleep when spawning wrapper. PR 54000
-  [Bartosz Kwitniewski <zerg2000-apachebug astral org pl>]
+     [Bartosz Kwitniewski <zerg2000-apachebug astral org pl>]
 
 Changes with mod_fcgid 2.3.7
 

modules/fcgid/fcgid_conf.c

diff --git a/modules/fcgid/fcgid_conf.c b/modules/fcgid/fcgid_conf.c
index 42d5cba..e2b540e 100644
--- a/modules/fcgid/fcgid_conf.c
+++ b/modules/fcgid/fcgid_conf.c
@@ -993,14 +993,14 @@
     }
 
     while (*args) {
-        const char *option = ap_getword_white(cmd->pool, &args);
+        const char *option = ap_getword_conf(cmd->pool, &args);
         const char *val;
 
         /* TODO: Consider supporting BusyTimeout.
          */
 
         if (!strcasecmp(option, "ConnectTimeout")) {
-            val = ap_getword_white(cmd->pool, &args);
+            val = ap_getword_conf(cmd->pool, &args);
             if (!strlen(val)) {
                 return "ConnectTimeout must have an argument";
             }
@@ -1009,7 +1009,7 @@
         }
 
         if (!strcasecmp(option, "IdleTimeout")) {
-            val = ap_getword_white(cmd->pool, &args);
+            val = ap_getword_conf(cmd->pool, &args);
             if (!strlen(val)) {
                 return "IdleTimeout must have an argument";
             }
@@ -1021,7 +1021,7 @@
             char *name;
             char *eql;
 
-            name = ap_getword_white(cmd->pool, &args);
+            name = ap_getword_conf(cmd->pool, &args);
             if (!strlen(name)) {
                 return "InitialEnv must have an argument";
             }
@@ -1040,7 +1040,7 @@
         }
 
         if (!strcasecmp(option, "IOTimeout")) {
-            val = ap_getword_white(cmd->pool, &args);
+            val = ap_getword_conf(cmd->pool, &args);
             if (!strlen(val)) {
                 return "IOTimeout must have an argument";
             }
@@ -1049,7 +1049,7 @@
         }
 
         if (!strcasecmp(option, "MaxProcesses")) {
-            val = ap_getword_white(cmd->pool, &args);
+            val = ap_getword_conf(cmd->pool, &args);
             if (!strlen(val)) {
                 return "MaxProcesses must have an argument";
             }
@@ -1058,7 +1058,7 @@
         }
 
         if (!strcasecmp(option, "MaxProcessLifetime")) {
-            val = ap_getword_white(cmd->pool, &args);
+            val = ap_getword_conf(cmd->pool, &args);
             if (!strlen(val)) {
                 return "MaxProcessLifetime must have an argument";
             }
@@ -1067,7 +1067,7 @@
         }
 
         if (!strcasecmp(option, "MaxRequestsPerProcess")) {
-            val = ap_getword_white(cmd->pool, &args);
+            val = ap_getword_conf(cmd->pool, &args);
             if (!strlen(val)) {
                 return "MaxRequestsPerProcess must have an argument";
             }
@@ -1076,7 +1076,7 @@
         }
 
         if (!strcasecmp(option, "MinProcesses")) {
-            val = ap_getword_white(cmd->pool, &args);
+            val = ap_getword_conf(cmd->pool, &args);
             if (!strlen(val)) {
                 return "MinProcesses must have an argument";
             }