Branch: Tag:

2000-03-07

2000-03-07 22:42:13 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Somewhat safer backward compat for $File & $Me.

Rev: server/base_server/configuration.pike:1.272
Rev: server/protocols/http.pike:1.215

2:   // Modified by Francesco Chemolli to add throttling capabilities.   // Copyright © 1996 - 2000, Idonex AB.    - constant cvs_version = "$Id: http.pike,v 1.214 2000/03/07 21:36:49 mast Exp $"; + constant cvs_version = "$Id: http.pike,v 1.215 2000/03/07 22:42:13 grubba Exp $";      #define MAGIC_ERROR   
58: Inside #if defined(REQUEST_DEBUG)
  ([   #ifdef REQUEST_DEBUG    "trace_enter":lambda(mixed ...args) { -  werror(sprintf("TRACE_ENTER(%{%O,%})\n", args)); +  REQUEST_WERR(sprintf("TRACE_ENTER(%{%O,%})", args));    },    "trace_leave":lambda(mixed ...args) { -  werror(sprintf("TRACE_LEAVE(%{%O,%})\n", args)); +  REQUEST_WERR(sprintf("TRACE_LEAVE(%{%O,%})", args));    }   #endif // REQUEST_DEBUG   ]);
1502:    file = http_low_answer(misc->error_code, errors[misc->error]);    else if(err = catch {    file=http_low_answer(404, +  parse_rxml(   #ifdef OLD_RXML_COMPAT -  replace(parse_rxml(conf->query("ZNoSuchFile"), -  this_object()), +  replace(conf->query("ZNoSuchFile"),    ({"$File", "$Me"}), -  ({not_query, -  conf->query("MyWorldLocation")}))); +  ({ "&page.virtfile;", +  conf->query("MyWorldLocation") +  })),   #else -  parse_rxml(conf->query("ZNoSuchFile"), -  this_object())); +  conf->query("ZNoSuchFile"),   #endif -  +  this_object()));    }) {    INTERNAL_ERROR(err);    }