Roxen.git/ server/ protocols/ http.pike

2000-08-22

2000-08-22 02:34:14 by Martin Stjernholm <mast@lysator.liu.se>

• 3befe1b129b33aab09a4286af04da0c7c37d4cfd (17 lines) (+12/-5) ^{[ Show | Annotate ]}
  Branch: 5.2

Add object-> before functions in the backtrace in the error page when
it's meaningful. Fixed a quoting bug when generating links in the
error page.

Rev: server/protocols/http.pike:1.253

2:   // Modified by Francesco Chemolli to add throttling capabilities.   // Copyright © 1996 - 2000, Roxen IS.    - constant cvs_version = "$Id: http.pike,v 1.252 2000/08/20 03:12:08 per Exp $"; + constant cvs_version = "$Id: http.pike,v 1.253 2000/08/22 02:34:14 mast Exp $";   // #define REQUEST_DEBUG   #define MAGIC_ERROR   
1156:    if (!file || !line) return "<a>";    if(file[0]!='/') file = combine_path(getcwd(), file);    return ("<a href=\"/(old_error,find_file)/error/?"+ -  "file="+Roxen.http_encode_string(file)+ -  (fun ? "&fun="+Roxen.http_encode_string(fun) : "") + +  "file="+Roxen.http_encode_url(file)+ +  (fun ? "&fun="+Roxen.http_encode_url(fun) : "") +    "&off="+qq+    "&error="+eid+    (line ? "&line="+line+"#here" : "") +
1204:    (line ? ":" + line : "") +    "</a>" + (file ? Roxen.html_encode_string (get_id (file)) : "") + ":<br />\n" +    replace (Roxen.html_encode_string (descr), -  ({"(", ")"}), ({"<b>(</b>", "<b>)</b>"})) + +  ({"(", ")", " "}), ({"<b>(</b>", "<b>)</b>", "&nbsp;"})) +    "</li>\n";    res += "</ul>\n\n";    }
1278:    if (sizeof (ent) >= 2) line = ent[1];    if (sizeof (ent) >= 3)    if(functionp(ent[2])) { -  func = function_name(ent[2]); +  func = ""; +  if (object o = function_object (ent[2])) { +  string s; +  if (!catch (s = sprintf ("%O",o)) && s != "object") +  func = s + "->"; +  } +  func += function_name(ent[2]);    if (!file)    catch {    file = master()->describe_program (