You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2012/11/16 19:27:26 UTC
svn commit: r1410523 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID
modules/fcgid/fcgid_conf.c
Author: wrowe
Date: Fri Nov 16 18:27:23 2012
New Revision: 1410523
URL: http://svn.apache.org/viewvc?rev=1410523&view=rev
Log:
Honor quoted FcgidCmdOptions arguments (notably for InitialEnv assignments).
PR: 51657
Modified:
httpd/mod_fcgid/trunk/CHANGES-FCGID
httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c
Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/CHANGES-FCGID?rev=1410523&r1=1410522&r2=1410523&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] (original)
+++ httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] Fri Nov 16 18:27:23 2012
@@ -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 @@ Changes with mod_fcgid 2.3.8
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
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=1410523&r1=1410522&r2=1410523&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c Fri Nov 16 18:27:23 2012
@@ -993,14 +993,14 @@ const char *set_cmd_options(cmd_parms *c
}
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 @@ const char *set_cmd_options(cmd_parms *c
}
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 @@ const char *set_cmd_options(cmd_parms *c
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 @@ const char *set_cmd_options(cmd_parms *c
}
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 @@ const char *set_cmd_options(cmd_parms *c
}
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 @@ const char *set_cmd_options(cmd_parms *c
}
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 @@ const char *set_cmd_options(cmd_parms *c
}
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 @@ const char *set_cmd_options(cmd_parms *c
}
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";
}