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

2002-08-05

2002-08-05 13:26:56 by Martin Nilsson <mani@lysator.liu.se>

• 8ec60ad170297de268efd1d37e5e67e704e687e7 (7 lines) (+4/-3) ^{[ Show | Annotate ]}
  Branch: Aphoto_2.0_beta3

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.120

7:   inherit "module";   inherit "socket";    - constant cvs_version = "$Id: filesystem.pike,v 1.119 2002/06/14 00:06:47 nilsson Exp $"; + constant cvs_version = "$Id: filesystem.pike,v 1.120 2002/08/05 13:26:56 nilsson Exp $";   constant thread_safe = 1;      #include <module.h>
640:    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;