httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Fri, 29 Mar 2002 05:58:39 GMT
brianp      02/03/28 21:58:39

  Modified:    modules/filters mod_include.c
  Log:
  Allow variable expansion within in the "var" arg to <!--#echo
  and <!--#set, so that people can do things like this:
    <!--#echo var="${foo}_${bar}" -->
  
  Revision  Changes    Path
  1.212     +6 -2      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.211
  retrieving revision 1.212
  diff -u -r1.211 -r1.212
  --- mod_include.c	29 Mar 2002 04:47:10 -0000	1.211
  +++ mod_include.c	29 Mar 2002 05:58:39 -0000	1.212
  @@ -1358,7 +1358,10 @@
                   }
               }
               if (!strcmp(tag, "var")) {
  -                const char *val = get_include_var(r, ctx, tag_val);
  +                const char *val =
  +                    get_include_var(r, ctx,
  +                                    ap_ssi_parse_string(r, ctx, tag_val, NULL,
  +                                                        MAX_STRING_LEN, 0));
                   if (val) {
                       switch(encode) {
                       case E_NONE:   
  @@ -2784,7 +2787,8 @@
                   return 1;
               }
               else if (!strcmp(tag, "var")) {
  -                var = tag_val;
  +                var = ap_ssi_parse_string(r, ctx, tag_val, NULL,
  +                                          MAX_STRING_LEN, 0);
               }
               else if (!strcmp(tag, "value")) {
                   if (var == (char *) NULL) {
  
  
  

Mime
View raw message