Roxen.git/ server/ etc/ modules/ Roxen.pmod

2008-03-11

2008-03-11 10:17:40 by Martin Stjernholm <mast@lysator.liu.se>

• b180ff940e38ac0725f948f7f84248f52be9c9fa (11 lines) (+6/-5) ^{[ Show | Annotate ]}
  Branch: 5.2

Fixed decoder order for double encodings with html. It's best to
decode entities last because they are invariant over the other
encodings, but the other way around is not true.

This error has afaics existed in all previous versions since
roxen_automatic_charset_variable was introduced, but previously the
errors were squelched by all the catches.

Rev: server/etc/modules/Roxen.pmod:1.234

1:   // This is a roxen pike module. Copyright © 1999 - 2004, Roxen IS.   // - // $Id: Roxen.pmod,v 1.233 2008/02/20 09:07:45 mast Exp $ + // $Id: Roxen.pmod,v 1.234 2008/03/11 10:17:40 mast Exp $      #include <roxen.h>   #include <config.h>
2834:       case "åäö?":    if (test != test2) { -  return "utf-8|html"; +  return "html|utf-8";    }    // FALL_THROUGH    case "åäö":
2845:       case "\214\212\232?":    if (test != test2) { -  return "mac|html"; +  return "html|mac";    }    // FALL_THROUGH    case "\214\212\232":
2891:    switch (charset) {    case "iso-2022-jp": f ("iso-2022"); break;    case "utf-7": f ("utf-7"); break; -  case "utf-8|html": case "utf-8": f ("utf-8"); break; -  case "mac|html": case "mac": f ("mac"); break; +  case "html|utf-8": case "utf-8": f ("utf-8"); break; +  case "html|mac": case "mac": f ("mac"); break;    case "utf-16": f (string_to_unicode); break;    case "shift_jis": f ("shift_jis"); break;    }