You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/11/13 15:20:21 UTC
svn commit: r1408742 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
server/config.c
Author: jim
Date: Tue Nov 13 14:20:20 2012
New Revision: 1408742
URL: http://svn.apache.org/viewvc?rev=1408742&view=rev
Log:
Merge r1397172 from trunk:
"Iterate" directives: Report an error if no arguments are provided.
Submitted by: trawick
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/config.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1397172
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1408742&r1=1408741&r2=1408742&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Nov 13 14:20:20 2012
@@ -2,6 +2,9 @@
Changes with Apache 2.4.4
+ *) "Iterate" directives: Report an error if no arguments are provided.
+ [Jeff Trawick]
+
*) mod_ssl: Change default for SSLCompression to off, as compression
causes security issues in most setups. (The so called "CRIME" attack).
[Stefan Fritsch]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1408742&r1=1408741&r2=1408742&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Nov 13 14:20:20 2012
@@ -89,10 +89,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * "Iterate" directives: Report an error if no arguments are provided.
- trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1397172
- 2.4.x patch: trunk patch works
- +1: trawick, jim, jailletc36
* syslog logging: Remove stray ", referer" at the end of some messages.
trunk patch: http://svn.apache.org/viewvc?rev=1399708&view=rev
Modified: httpd/httpd/branches/2.4.x/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/config.c?rev=1408742&r1=1408741&r2=1408742&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/config.c (original)
+++ httpd/httpd/branches/2.4.x/server/config.c Tue Nov 13 14:20:20 2012
@@ -976,12 +976,20 @@ static const char *invoke_cmd(const comm
return cmd->AP_TAKE3(parms, mconfig, w, w2, w3);
case ITERATE:
- while (*(w = ap_getword_conf(parms->pool, &args)) != '\0') {
+ w = ap_getword_conf(parms->pool, &args);
+
+ if (*w == '\0')
+ return apr_pstrcat(parms->pool, cmd->name,
+ " requires at least one argument",
+ cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
+ while (*w != '\0') {
errmsg = cmd->AP_TAKE1(parms, mconfig, w);
if (errmsg && strcmp(errmsg, DECLINE_CMD) != 0)
return errmsg;
+
+ w = ap_getword_conf(parms->pool, &args);
}
return errmsg;