Roxen.git/ server/ base_server/ roxen.pike

2012-12-12

2012-12-12 15:03:39 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 56f927c17836fb048b02f7b0c3e72bdd764c503e (14 lines) (+13/-1) ^{[ Show | Annotate ]}
  Branch: 5.2

ImageCache: Avoid throwing errors in draw on invalid keys.

Restores some of the code that was removed in revision 1.1118.
Fixes [bug 6590 (#6590)].

Rev: server/base_server/roxen.pike:1.1126

6:   // Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.   // ABS and suicide systems contributed freely by Francesco Chemolli    - constant cvs_version="$Id: roxen.pike,v 1.1125 2012/11/12 09:23:26 jonasw Exp $"; + constant cvs_version="$Id: roxen.pike,v 1.1126 2012/12/12 15:03:39 grubba Exp $";      //! @appears roxen   //!
4271:    errmsg += " Referrer: " + id->referer[0];    report_error (errmsg + "\n");    return 0; +  } else if (arrayp(err) && sizeof(err) && stringp(err[0])) { +  if (sscanf(err[0], "Requesting unknown key %s\n", +  string message) == 1) +  { +  // File not found. +  report_debug("Requesting unknown key %s %O from %O\n", +  message, +  id->not_query, +  (sizeof(id->referer)?id->referer[0]:"unknown page")); +  return 0;    } -  +  }    throw (err);    }    if( !(res = restore( na,id )) ) {