httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Mon, 25 Aug 2003 02:49:19 GMT
nd          2003/08/24 19:49:19

  Modified:    modules/filters mod_include.c
  Log:
  same cleanup applies to TOKEN_LBRACE
  
  Revision  Changes    Path
  1.263     +15 -32    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.262
  retrieving revision 1.263
  diff -u -r1.262 -r1.263
  --- mod_include.c	25 Aug 2003 02:21:20 -0000	1.262
  +++ mod_include.c	25 Aug 2003 02:49:19 -0000	1.263
  @@ -1385,41 +1385,24 @@
                   root = current = new;
                   break;
               }
  -            /* Percolate upwards */
  -            if (current) {
  -                switch (current->token.type) {
  -                case TOKEN_NOT:
  -                case TOKEN_EQ:
  -                case TOKEN_NE:
  -                case TOKEN_AND:
  -                case TOKEN_OR:
  -                case TOKEN_LBRACE:
  -                case TOKEN_GE:
  -                case TOKEN_GT:
  -                case TOKEN_LE:
  -                case TOKEN_LT:
  -                    break;
   
  -                default:
  -                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
  -                                  "Invalid expression \"%s\" in file %s",
  -                                  expr, r->filename);
  -                    *was_error = 1;
  -                    return retval;
  -                }
  -            }
  +            switch (current->token.type) {
  +            case TOKEN_STRING:
  +            case TOKEN_RE:
  +            case TOKEN_RBRACE:
  +            case TOKEN_GROUP:
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
  +                              "Invalid expression \"%s\" in file %s",
  +                              expr, r->filename);
  +                *was_error = 1;
  +                return retval;
   
  -            if (!current) {
  -                new->left = root;
  -                new->left->parent = new;
  -                new->parent = NULL;
  -                root = new;
  -            }
  -            else {
  -                new->left = current->right;
  -                current->right = new;
  -                new->parent = current;
  +            default:
  +                break;
               }
  +
  +            current->right = new;
  +            new->parent = current;
               current = new;
               break;
   
  
  
  

Mime
View raw message