Roxen.git/ server/ base_server/ prototypes.pike

2009-03-27

2009-03-27 10:39:12 by Jonas Wallden <jonasw@roxen.com>

• ae6bf6f14cef346a55028c694d7c19e1486d7c56 (15 lines) (+9/-6) ^{[ Show | Annotate ]}
  Branch: 5.2

Revert FF 2.0 workaround in r1.211 where we always provided a default
charset response even when we didn't know. That approach caused the
browser to complain if our default didn't match a BOM at the beginning of
the data (observed with JavaScript files in FCK 2.5.x).

Rev: server/base_server/prototypes.pike:1.237

5:   #include <config.h>   #include <module.h>   #include <module_constants.h> - constant cvs_version="$Id: prototypes.pike,v 1.236 2009/03/26 13:51:18 jonasw Exp $"; + constant cvs_version="$Id: prototypes.pike,v 1.237 2009/03/27 10:39:12 jonasw Exp $";      #ifdef DAV_DEBUG   #define DAV_WERROR(X...) werror(X)
2608:    }    }    -  // Always set the charset. At least Firefox 2.0 is known to -  // propagate the charset from the frameset page to the frame -  // pages if they lack explicit charsets. -  type += "; charset=" + (charset || "ISO-8859-1"); +  // Only declare charset if we have exact knowledge of it. We cannot +  // provide a default for other requests since e.g. Firefox will +  // complain if it receives a charset=ISO-8859-1 header for text data +  // that starts with a UTF-8 BOM. +  if (charset) +  type += "; charset=" + charset;    }       heads["Content-Type"] = type;