--- parser3/src/main/pa_http.C 2008/06/07 11:01:09 1.14 +++ parser3/src/main/pa_http.C 2008/06/11 11:38:35 1.15 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_HTTP_C="$Date: 2008/06/07 11:01:09 $"; +static const char * const IDENT_HTTP_C="$Date: 2008/06/11 11:38:35 $"; #include "pa_http.h" #include "pa_common.h" @@ -396,7 +396,8 @@ static void find_headers_end(char* p, File_read_http_result pa_internal_file_read_http(Request_charsets& charsets, const String& file_spec, bool as_text, - HashStringValue *options) { + HashStringValue *options, + bool transcode_text_result) { File_read_http_result result; char host[MAX_STRING]; const char* uri; @@ -656,7 +657,7 @@ File_read_http_result pa_internal_file_r // output response String::C real_body=String::C(raw_body, raw_body_size); - if(as_text && raw_body_size) { // must be checked because transcode returns CONST string in case length==0, which contradicts hacking few lines below + if(as_text && raw_body_size && transcode_text_result) { // must be checked because transcode returns CONST string in case length==0, which contradicts hacking few lines below // defaulting to used-asked charset [it's never empty!] if(!real_remote_charset) real_remote_charset=asked_remote_charset;