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

2012-06-10

2012-06-10 00:27:24 by Martin Stjernholm <mast@lysator.liu.se>

• e925a49647f15642bc627bec5073253457d8b89d (24 lines) (+23/-1) ^{[ Show | Annotate ]}
  Branch: 5.2

Fixed a compat Null object for 5.1 and earlier.

Fixes the Roxen side of the compat problem pointed out in [bug 5900 (#5900)],
comment #7.

Rev: server/etc/modules/Roxen.pmod:1.330
Rev: server/modules/database/sqltag.pike:1.124

1:   // This is a roxen pike module. Copyright © 1999 - 2009, Roxen IS.   // - // $Id: Roxen.pmod,v 1.329 2012/04/17 09:06:40 erikd Exp $ + // $Id: Roxen.pmod,v 1.330 2012/06/10 00:27:24 mast Exp $      #include <roxen.h>   #include <config.h>
1042:    }    }    +  // FIXME: Parse away BOM in xml documents also when the charset +  // already is known. +     if (charset) {    Locale.Charset.Decoder decoder;    if (mixed err = catch (decoder = Locale.Charset.decoder (charset))) {
4501:    return ENCODE_RXML_TEXT(magic_charset_variable_value, type);       case "null": +  // Note that we don't need to check compat_level < 5.2 and +  // return compat_5_1_null here, since this constant didn't exist +  // prior to 5.2.    return Val->null;    case "true":    return Val->true;
5476:   Val.Null sql_null;   // Compat aliases. sql_null is initialized in create() in roxen.pike.    + class Compat51Null + // Null object for compat_level < 5.2. Also inherits RXML.Nil, which + // among other things allows casting to empty values of various types. + { +  inherit Null; +  inherit RXML.Nil;    -  +  protected string _sprintf (int flag) +  { +  return flag == 'O' && "Roxen.compat_5_1_null"; +  } + } +  + Compat51Null compat_5_1_null = Compat51Null(); +  +    #ifdef REQUEST_TRACE   protected string trace_msg (mapping id_misc, string msg,    string|int name_or_time, int enter)