*** mod_include.c.orig	Tue Aug 11 15:26:27 1998
--- mod_include.c	Tue Aug 11 16:17:08 1998
***************
*** 842,847 ****
--- 842,848 ----
  static int handle_echo(FILE *in, request_rec *r, const char *error)
  {
      char tag[MAX_STRING_LEN];
+     char parsed_string[MAX_STRING_LEN];
      char *tag_val;
  
      while (1) {
***************
*** 849,855 ****
              return 1;
          }
          if (!strcmp(tag, "var")) {
!             char *val = table_get(r->subprocess_env, tag_val);
  
              if (val) {
                  rputs(val, r);
--- 850,858 ----
              return 1;
          }
          if (!strcmp(tag, "var")) {
!             char *val;
!             parse_string(r, tag_val, parsed_string, sizeof parsed_string, 0);
!             val = table_get(r->subprocess_env, parsed_string);
  
              if (val) {
                  rputs(val, r);
***************
*** 1950,1955 ****
--- 1953,1959 ----
  {
      char tag[MAX_STRING_LEN];
      char parsed_string[MAX_STRING_LEN];
+     char parsed_string2[MAX_STRING_LEN];
      char *tag_val;
      char *var;
  
***************
*** 1962,1968 ****
              return 0;
          }
          else if (!strcmp(tag, "var")) {
!             var = tag_val;
          }
          else if (!strcmp(tag, "value")) {
              if (var == (char *) NULL) {
--- 1966,1973 ----
              return 0;
          }
          else if (!strcmp(tag, "var")) {
!           parse_string(r, tag_val, parsed_string2, sizeof parsed_string2, 0);
!           var = parsed_string2;
          }
          else if (!strcmp(tag, "value")) {
              if (var == (char *) NULL) {