You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by re...@apache.org on 2004/02/04 16:09:33 UTC
cvs commit: httpd-2.0/server config.c
rederpj 2004/02/04 07:09:32
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
server Tag: APACHE_2_0_BRANCH config.c
Log:
*) Keep focus of ITERATE and ITERATE2 on the current module when
the module chooses to return DECLINE_CMD for the directive. PR 22299.
Submitted by: Geoffrey Young <geoff apache.org>
Reviewed by: trawick, rederpj
Revision Changes Path
No revision
No revision
1.988.2.233 +4 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.232
retrieving revision 1.988.2.233
diff -u -r1.988.2.232 -r1.988.2.233
--- CHANGES 3 Feb 2004 21:51:37 -0000 1.988.2.232
+++ CHANGES 4 Feb 2004 15:09:31 -0000 1.988.2.233
@@ -1,5 +1,9 @@
Changes with Apache 2.0.49
+ *) Keep focus of ITERATE and ITERATE2 on the current module when
+ the module chooses to return DECLINE_CMD for the directive.
+ PR 22299. [Geoffrey Young <geoff apache.org>]
+
*) Add support for IMT minor-type wildcards (e.g., text/*) to
ExpiresByType. PR#7991 [Ken Coar]
1.751.2.674 +1 -5 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.673
retrieving revision 1.751.2.674
diff -u -r1.751.2.673 -r1.751.2.674
--- STATUS 4 Feb 2004 14:48:30 -0000 1.751.2.673
+++ STATUS 4 Feb 2004 15:09:31 -0000 1.751.2.674
@@ -80,10 +80,6 @@
[ please place file names and revisions from HEAD here, so it is easy to
identify exactly what the proposed changes are! ]
- * fix DECLINE_CMD interaction with ITERATE/ITERATE2
- http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/config.c?r1=1.168&r2=1.169
- +1: geoff, trawick
-
* Fix file extensions for real media files and removed rpm extension
from mime.types. PR 26079. (2.0 + 1.3)
docs/conf/mime.types: r1.23
No revision
No revision
1.156.2.11 +11 -5 httpd-2.0/server/config.c
Index: config.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/config.c,v
retrieving revision 1.156.2.10
retrieving revision 1.156.2.11
diff -u -r1.156.2.10 -r1.156.2.11
--- config.c 8 Jan 2004 20:56:18 -0000 1.156.2.10
+++ config.c 4 Feb 2004 15:09:32 -0000 1.156.2.11
@@ -697,7 +697,7 @@
void *mconfig, const char *args)
{
char *w, *w2, *w3;
- const char *errmsg;
+ const char *errmsg = NULL;
if ((parms->override & cmd->req_override) == 0)
return apr_pstrcat(parms->pool, cmd->name, " not allowed here", NULL);
@@ -797,11 +797,14 @@
case ITERATE:
while (*(w = ap_getword_conf(parms->pool, &args)) != '\0') {
- if ((errmsg = cmd->AP_TAKE1(parms, mconfig, w)))
+
+ errmsg = cmd->AP_TAKE1(parms, mconfig, w);
+
+ if (errmsg && strcmp(errmsg, DECLINE_CMD) != 0)
return errmsg;
}
- return NULL;
+ return errmsg;
case ITERATE2:
w = ap_getword_conf(parms->pool, &args);
@@ -812,11 +815,14 @@
cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
while (*(w2 = ap_getword_conf(parms->pool, &args)) != '\0') {
- if ((errmsg = cmd->AP_TAKE2(parms, mconfig, w, w2)))
+
+ errmsg = cmd->AP_TAKE2(parms, mconfig, w, w2);
+
+ if (errmsg && strcmp(errmsg, DECLINE_CMD) != 0)
return errmsg;
}
- return NULL;
+ return errmsg;
case FLAG:
w = ap_getword_conf(parms->pool, &args);