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 Thu, 28 Aug 2003 23:59:58 GMT
nd          2003/08/28 16:59:58

  Modified:    modules/filters mod_include.c
  Log:
  allow the undefined echo string to be configured via
  <!--#config echomsg="..." -->
  
  Revision  Changes    Path
  1.284     +9 -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.283
  retrieving revision 1.284
  diff -u -r1.283 -r1.284
  --- mod_include.c	28 Aug 2003 23:20:44 -0000	1.283
  +++ mod_include.c	28 Aug 2003 23:59:58 -0000	1.284
  @@ -1906,7 +1906,8 @@
   }
   
   /*
  - * <!--#config [timefmt="..."] [sizefmt="..."] [errmsg="..."] -->
  + * <!--#config [timefmt="..."] [sizefmt="..."] [errmsg="..."]
  + *             [echomsg="..."] -->
    */
   static apr_status_t handle_config(include_ctx_t *ctx, ap_filter_t *f,
                                     apr_bucket_brigade *bb)
  @@ -1934,7 +1935,6 @@
       while (1) {
           char *tag     = NULL;
           char *tag_val = NULL;
  -        char *parsed_string;
   
           ap_ssi_get_tag_and_value(ctx, &tag, &tag_val, SSI_VALUE_RAW);
           if (!tag || !tag_val) {
  @@ -1945,6 +1945,11 @@
               ctx->error_str = ap_ssi_parse_string(ctx, tag_val, NULL, 0,
                                                    SSI_EXPAND_DROP_NAME);
           }
  +        else if (!strcmp(tag, "echomsg")) {
  +            ctx->intern->undefined_echo =
  +                ap_ssi_parse_string(ctx, tag_val, NULL, 0,SSI_EXPAND_DROP_NAME);
  +            ctx->intern->undefined_echo_len=strlen(ctx->intern->undefined_echo);
  +        }
           else if (!strcmp(tag, "timefmt")) {
               apr_time_t date = r->request_time;
   
  @@ -1960,6 +1965,8 @@
                              ctx->time_str, 0));
           }
           else if (!strcmp(tag, "sizefmt")) {
  +            char *parsed_string;
  +
               parsed_string = ap_ssi_parse_string(ctx, tag_val, NULL, 0,
                                                   SSI_EXPAND_DROP_NAME);
               if (!strcmp(parsed_string, "bytes")) {
  
  
  

Mime
View raw message