Roxen.git/ server/ modules/ filesystems/ filesystem.pike

2002-07-23

2002-07-23 18:09:49 by Martin Stjernholm <mast@lysator.liu.se>

• 927b878567a33587954445b66e1e04a522fc65ee (7 lines) (+4/-3) ^{[ Show | Annotate ]}
  Branch: 2.2

Fixed a trivial bug that caused pages to always be sent in UTF-8 when the
file content charset was something else than iso-8859-1.

Rev: server/modules/filesystems/filesystem.pike:1.117
Rev: server/modules/filesystems/sqlfs.pike:1.4

7:   inherit "module";   inherit "socket";    - constant cvs_version= "$Id: filesystem.pike,v 1.116 2002/07/01 09:23:07 anders Exp $"; + constant cvs_version= "$Id: filesystem.pike,v 1.117 2002/07/23 18:09:48 mast Exp $";   constant thread_safe=1;      #include <module.h>
637:    TRACE_LEAVE("Normal return");    if( charset != "iso-8859-1" )    { -  if( id->misc->set_output_charset ) -  id->misc->set_output_charset( charset, 2 ); +  if( id->set_output_charset ) +  id->set_output_charset( charset, 2 );    id->misc->input_charset = charset;    }    return o;