Roxen.git/ server/ modules/ tags/ insert_cached_href.pike

2007-03-15

2007-03-15 11:50:56 by Tobias Liin <liin@roxen.com>

• fc9e1ee67ae51cbdfc2f5c78b9af05474f2a3c43 (11 lines) (+9/-2) ^{[ Show | Annotate ]}
  Branch: 5.2

Fixed bug that gives a 500 error if the data is not UTF-8 but declared as such. This happened when trying to decode the data using the attribute "decode-xml". The exception thrown is now caught, an error msg is written to the debug log and the data is returned undecoded.

Rev: server/modules/tags/insert_cached_href.pike:1.18

7:   //<locale-token project="mod_insert_cached_href">LOCALE</locale-token>   #define LOCALE(X,Y) _DEF_LOCALE("mod_insert_cached_href",X,Y)    - constant cvs_version = "$Id: insert_cached_href.pike,v 1.17 2007/03/08 09:57:44 liin Exp $"; + constant cvs_version = "$Id: insert_cached_href.pike,v 1.18 2007/03/15 11:50:56 liin Exp $";      constant thread_safe = 1;   constant module_type = MODULE_TAG;
570:       if(args["decode-xml"]) {    // Parse xml header and recode content to internal representation. +  mixed result = catch {    res = Parser.XML.Simple()->autoconvert(res); -  +  };    -  +  if (result) { +  werror("insert#cached-href: An error occurred trying to decode the data.\n"); +  } +     // Remove any bytes potentially still preceeding the first '<' in the xml file    return res[search(res, "<")..];    }