Roxen.git/ server/ base_server/ configuration.pike

2010-12-02

2010-12-02 16:11:02 by Martin Stjernholm <mast@lysator.liu.se>

• bf7453fe2dd23bd06e45004a0987ac5e7fc8324c (22 lines) (+19/-3) ^{[ Show | Annotate ]}
  Branch: 5.2

Enable charset decoding in try_get_file on compat level 5.1.

Since there might be old code that compensates for this bug by ad-hoc
decoding afterwards.

Rev: server/base_server/configuration.pike:1.710

5:   // @appears Configuration   //! A site's main configuration    - constant cvs_version = "$Id: configuration.pike,v 1.709 2010/12/02 13:38:57 grubba Exp $"; + constant cvs_version = "$Id: configuration.pike,v 1.710 2010/12/02 16:11:02 mast Exp $";   #include <module.h>   #include <module_constants.h>   #include <roxen.h>
3165:    }    }    -  if(m->raw) +  if(m->raw) { +  if (compat_level() > 5.0)    res = Roxen.parse_http_response (res, result_mapping, 0, "from " + s); -  +  else { +  // This function used to simply toss the headers and return the +  // data as-is, losing the content type and charset. Need to be +  // bug compatible with the lack of charset handling, since +  // callers might be compensating. (The old code also deleted all +  // CR's in the whole body, regardless of content type(!), but we +  // don't have to be bug compatible with that at least.) +  sscanf (res, "%*s\r\n\r\n%s", res) || +  sscanf (res, "%*s\n\n%s", res) || +  sscanf (res, "%*s\r\n%s", res) || +  sscanf (res, "%*s\n%s", res); +  } +  } +     return res;   }