Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 93313 invoked from network); 27 Aug 2003 16:37:34 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 27 Aug 2003 16:37:34 -0000 Received: (qmail 99923 invoked by uid 500); 27 Aug 2003 16:35:28 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 99833 invoked by uid 500); 27 Aug 2003 16:35:27 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 99764 invoked by uid 500); 27 Aug 2003 16:35:26 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 99733 invoked from network); 27 Aug 2003 16:35:26 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 27 Aug 2003 16:35:25 -0000 Received: (qmail 59703 invoked by uid 1569); 27 Aug 2003 15:35:14 -0000 Date: 27 Aug 2003 15:35:14 -0000 Message-ID: <20030827153514.59702.qmail@minotaur.apache.org> From: nd@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/filters mod_include.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N nd 2003/08/27 08:35:14 Modified: modules/filters mod_include.c Log: minor optimization. Revision Changes Path 1.275 +4 -5 httpd-2.0/modules/filters/mod_include.c Index: mod_include.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- mod_include.c 27 Aug 2003 14:04:51 -0000 1.274 +++ mod_include.c 27 Aug 2003 15:35:13 -0000 1.275 @@ -1329,13 +1329,10 @@ break; case TOKEN_RBRACE: - while (current) { - if (current->token.type == TOKEN_LBRACE) { - TYPE_TOKEN(¤t->token, TOKEN_GROUP); - break; - } + while (current && current->token.type != TOKEN_LBRACE) { current = current->parent; } + if (!current) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Unmatched ')' in \"%s\" in file %s", @@ -1343,6 +1340,8 @@ *was_error = 1; return retval; } + + TYPE_TOKEN(¤t->token, TOKEN_GROUP); break; case TOKEN_NOT: