Roxen.git/ server/ plugins/ protocols/ http.pike

2002-07-03

2002-07-03 19:23:57 by Martin Nilsson <mani@lysator.liu.se>

• ab22fd92eed74d5a93e45cd0e5d30467a772f4d3 (26 lines) (+9/-17) ^{[ Show | Annotate ]}
  Branch: Aphoto_2.0_beta3

highlight_pike not used, so don't inherit it. Store backtraces in memory cache for (hopefully)faster gc. Use random id instead of sequential id to improve security.

Rev: server/plugins/protocols/http.pike:1.376

2:   // Modified by Francesco Chemolli to add throttling capabilities.   // Copyright © 1996 - 2001, Roxen IS.    - constant cvs_version = "$Id: http.pike,v 1.375 2002/07/03 14:52:10 per Exp $"; + constant cvs_version = "$Id: http.pike,v 1.376 2002/07/03 19:23:57 nilsson Exp $";   // #define REQUEST_DEBUG   #define MAGIC_ERROR    - #ifdef MAGIC_ERROR - inherit "highlight_pike"; - #endif -  +    // HTTP protocol module.   #include <config.h>   #define TIMER_PREFIX "http:"
1059:   {    [string msg, array(string) rxml_bt, array(array) bt,    string raw_bt_descr, string raw_url, string raw] = -  roxen.query_var ("errors")[eid]; +  cache_lookup( "http_bt_error", eid);       string res = error_page_header ("Internal Server Error") +    "<h1>" + replace (Roxen.html_encode_string (msg), "\n", "<br />\n") + "</h1>\n";
1123:   {    mixed err = _err;    _err = 0; // hide in backtrace, they are bad enough anyway... -  mapping e = roxen.query_var("errors"); -  if(!e) roxen.set_var("errors", ([])); -  e = roxen.query_var("errors"); /* threads... */ +     -  int id = ++e[0]; -  if(id>1024) id = 1; +  int id; +  do { +  id = random(0xffffffff); +  } while(!cache_lookup("http_bt_error", id));       string msg;    array(string) rxml_bt;
1196:    }       add_cvs_ids (err); -  e[id] = ({msg,rxml_bt,bt,describe_backtrace (err),raw_url,censor(raw)}); +  cache_set( "http_bt_error", id, ({msg,rxml_bt,bt,describe_backtrace (err),raw_url,censor(raw)}) );    return id;   }      array get_error(string eid)   { -  mapping e = roxen.query_var("errors"); -  if(e) return e[(int)eid]; -  return 0; +  return cache_lookup( "http_bt_error", (int)eid );   }      
1333:    }    int end = (int)variables->line+50;    -  // The highlighting doesn't work well enough on recent pike code. -  //lines=highlight_pike("foo", ([ "nopre":1 ]), lines[start..end]*"\n")/"\n"; +     lines = map (lines[start..end], Roxen.html_encode_string);       if(sizeof(lines)>off) {