parser3/src/main/pa_http.C - diff

Return to pa_http.C CVS log

Up to [parser3project] / parser3 / src / main

Diff for /parser3/src/main/pa_http.C between versions 1.43 and 1.62

version 1.43, 2009/09/10 10:11:18	version 1.62, 2015/04/02 22:04:41
Line 1	Line 1
/** @file	/** @file
Parser: http support functions.	Parser: http support functions.

Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
*/	*/

static const char * const IDENT_HTTP_C="$Date$";

#include "pa_http.h"	#include "pa_http.h"
#include "pa_common.h"	#include "pa_common.h"
#include "pa_charsets.h"	#include "pa_charsets.h"
Line 15 static const char * const IDENT_HTTP_C="	Line 13 static const char * const IDENT_HTTP_C="
#include "pa_vfile.h"	#include "pa_vfile.h"
#include "pa_random.h"	#include "pa_random.h"

	volatile const char * IDENT_PA_HTTP_C="$Id$" IDENT_PA_HTTP_H;

	#ifdef _MSC_VER
	#include <windows.h>
	#else
	#define closesocket close
	#endif

// defines	// defines

#define HTTP_METHOD_NAME "method"	#define HTTP_METHOD_NAME "method"
Line 22 static const char * const IDENT_HTTP_C="	Line 28 static const char * const IDENT_HTTP_C="
#define HTTP_BODY_NAME "body"	#define HTTP_BODY_NAME "body"
#define HTTP_TIMEOUT_NAME "timeout"	#define HTTP_TIMEOUT_NAME "timeout"
#define HTTP_HEADERS_NAME "headers"	#define HTTP_HEADERS_NAME "headers"
#define HTTP_COOKIES_NAME "cookies"
#define HTTP_FORM_ENCTYPE_NAME "enctype"	#define HTTP_FORM_ENCTYPE_NAME "enctype"
#define HTTP_ANY_STATUS_NAME "any-status"	#define HTTP_ANY_STATUS_NAME "any-status"
#define HTTP_OMIT_POST_CHARSET_NAME "omit-post-charset" // ^file::load[...;http://...;$.form[...]$.method[post]]	#define HTTP_OMIT_POST_CHARSET_NAME "omit-post-charset" // ^file::load[...;http://...;$.method[post]] by default adds charset to content-type
// by default add charset to content-type

#define HTTP_TABLES_NAME "tables"	#define HTTP_TABLES_NAME "tables"

Line 35 static const char * const IDENT_HTTP_C="	Line 39 static const char * const IDENT_HTTP_C="

#define DEFAULT_USER_AGENT "parser3"	#define DEFAULT_USER_AGENT "parser3"

# ifndef INADDR_NONE	#ifndef INADDR_NONE
# define INADDR_NONE ((ulong) -1)	#define INADDR_NONE ((ulong) -1)
# endif	#endif

#undef CRLF	#undef CRLF
#define CRLF "\r\n"	#define CRLF "\r\n"

	// helpers

	class Cookies_table_template_columns: public ArrayString {
	public:
	Cookies_table_template_columns() {
	*this+=new String("name");
	*this+=new String("value");
	*this+=new String("expires");
	*this+=new String("max-age");
	*this+=new String("domain");
	*this+=new String("path");
	*this+=new String("httponly");
	*this+=new String("secure");
	}
	};


static bool set_addr(struct sockaddr_in addr, const char host, const short port){	static bool set_addr(struct sockaddr_in addr, const char host, const short port){
memset(addr, 0, sizeof(*addr));	memset(addr, 0, sizeof(*addr));
addr->sin_family=AF_INET;	addr->sin_family=AF_INET;
Line 194 static void timeout_handler(int /sig/)	Line 215 static void timeout_handler(int /sig/)
}	}
#endif	#endif

static size_t file_untaint(const char* str, size_t len) {
// untaint file from L_FILE_POST encoding
char* j=(char *)str;
const char* end=str+len-1;
for(const char* i=str; i<=end; i++, j++){
if(*i=='\\' && i!=end){
switch(*(i+1)){
case '0':
*j='\0';
i++;
continue;
case '\\':
*j='\\';
i++;
continue;
}
}
if(i!=j)
j=i;
}
return j-str; // new length
}

static int http_request(char*& response, size_t& response_size,	static int http_request(char*& response, size_t& response_size,
const char* host, short port,	const char* host, short port,
const char* request, size_t request_size,	const char* request, size_t request_size,
Line 318 struct Http_pass_header_info {	Line 316 struct Http_pass_header_info {
bool* content_type_url_encoded;	bool* content_type_url_encoded;
};	};
#endif	#endif

	char pa_http_safe_header_name(const char name) {
	char *result=pa_strdup(name);
	char *n=result;
	if(!pa_isalpha((unsigned char)*n))
	*n++ = '_';
	for(; *n; ++n) {
	if (!pa_isalnum((unsigned char)n) && n != '-' && *n != '_')
	*n = '_';
	}
	return result;
	}

static void http_pass_header(HashStringValue::key_type aname,	static void http_pass_header(HashStringValue::key_type aname,
HashStringValue::value_type avalue,	HashStringValue::value_type avalue,
Http_pass_header_info *info) {	Http_pass_header_info *info) {
Line 327 static void http_pass_header(HashStringV	Line 338 static void http_pass_header(HashStringV
if(strcasecmp(name_cstr, HTTP_CONTENT_LENGTH)==0)	if(strcasecmp(name_cstr, HTTP_CONTENT_LENGTH)==0)
return;	return;

String name=String(capitalize(name_cstr), String::L_URI);	String name=String(pa_http_safe_header_name(capitalize(name_cstr)), String::L_AS_IS);
String value=attributed_meaning_to_string(*avalue, String::L_URI, true);	String value=attributed_meaning_to_string(*avalue, String::L_HTTP_HEADER, true);

*info->request << name << ": " << value << CRLF;	*info->request << name << ": " << value << CRLF;

Line 336 static void http_pass_header(HashStringV	Line 347 static void http_pass_header(HashStringV
*info->user_agent_specified=true;	*info->user_agent_specified=true;
if(strcasecmp(name_cstr, HTTP_CONTENT_TYPE)==0){	if(strcasecmp(name_cstr, HTTP_CONTENT_TYPE)==0){
*info->content_type_specified=true;	*info->content_type_specified=true;
*info->content_type_url_encoded=StrStartFromNC(value.cstr(), HTTP_CONTENT_TYPE_FORM_URLENCODED);	*info->content_type_url_encoded=pa_strncasecmp(value.cstr(), HTTP_CONTENT_TYPE_FORM_URLENCODED)==0;
}	}
}	}

Line 405 static void form_value2string(	Line 416 static void form_value2string(
const char* pa_form2string(HashStringValue& form, Request_charsets& charsets) {	const char* pa_form2string(HashStringValue& form, Request_charsets& charsets) {
String string;	String string;
form.for_each<String*>(form_value2string, &string);	form.for_each<String*>(form_value2string, &string);
return string.transcode_and_untaint_cstr(String::L_URI, &charsets);	return string.untaint_and_transcode_cstr(String::L_URI, &charsets);
}	}

struct FormPart {	struct FormPart {
Request* r;	Request* r;
const char* boundary;	const char* boundary;
String string;	String* string;
Form_table_value2string_info* info;	Form_table_value2string_info* info;

	struct BinaryBlock{
	const char* ptr;
	size_t length;

	BinaryBlock(String* astring, Request* r): ptr(astring->untaint_and_transcode_cstr(String::L_AS_IS, &r->charsets)), length(strlen(ptr)){}
	BinaryBlock(const char* aptr, size_t alength): ptr(aptr), length(alength){}
	};

	Array<BinaryBlock> blocks;

	FormPart(Request* ar, const char* aboundary): r(ar), boundary(aboundary), string(new String()){}

	const char *post(size_t &length){
	if(blocks.count()){
	blocks+=BinaryBlock(string, r);

	length=0;
	for(size_t i=0; i<blocks.count(); i++)
	length+=blocks[i].length;

	char result=(char )pa_malloc_atomic(length);
	char *ptr=result;

	for(size_t i=0; i<blocks.count(); i++){
	memcpy(ptr, blocks[i].ptr, blocks[i].length);
	ptr+=blocks[i].length;
	}

	return result;
	} else {
	BinaryBlock result(string, r);
	length=result.length;
	return result.ptr;
	}
	}
};	};

static void form_part_boundary_header(FormPart& part, String::Body name, const char* file_name=0){	static void form_part_boundary_header(FormPart& part, String::Body name, const char* file_name=0){
part.string << "--" << part.boundary	*part.string << "--" << part.boundary
<< CRLF CONTENT_DISPOSITION_CAPITALIZED ": form-data; name=\""	<< CRLF CONTENT_DISPOSITION_CAPITALIZED ": form-data; name=\""
<< Charset::transcode(name, part.r->charsets.source(), part.r->charsets.client())	<< name
<< "\"";	<< "\"";
if(file_name){	if(file_name){
if(strcmp(file_name, NONAME_DAT)!=0)	if(strcmp(file_name, NONAME_DAT)!=0)
part.string << "; filename=\"" << file_name << "\"";	*part.string << "; filename=\"" << file_name << "\"";
part.string << CRLF HTTP_CONTENT_TYPE_CAPITALIZED ": " << part.r->mime_type_of(file_name);	*part.string << CRLF HTTP_CONTENT_TYPE_CAPITALIZED ": " << part.r->mime_type_of(file_name);
}	}
part.string << CRLF CRLF;	*part.string << CRLF CRLF;
}	}

static void form_string_value2part(	static void form_string_value2part(
Line 434 static void form_string_value2part(	Line 481 static void form_string_value2part(
FormPart& part)	FormPart& part)
{	{
form_part_boundary_header(part, key);	form_part_boundary_header(part, key);
part.string << Charset::transcode(value, part.r->charsets.source(), part.r->charsets.client()) << CRLF;	*part.string << value << CRLF;
}	}

static void form_file_value2part(	static void form_file_value2part(
Line 443 static void form_file_value2part(	Line 490 static void form_file_value2part(
FormPart& part)	FormPart& part)
{	{
form_part_boundary_header(part, key, vfile.fields().get(name_name)->as_string().cstr());	form_part_boundary_header(part, key, vfile.fields().get(name_name)->as_string().cstr());
part.string.append_know_length(vfile.value_ptr(), vfile.value_size(), String::L_FILE_POST);	part.blocks+=FormPart::BinaryBlock(part.string, part.r);
part.string << CRLF;	part.blocks+=FormPart::BinaryBlock(vfile.value_ptr(), vfile.value_size());
	part.string=new String();
	*part.string << CRLF;
}	}

static void form_table_value2part(Table::element_type row, FormPart* part) {	static void form_table_value2part(Table::element_type row, FormPart* part) {
Line 459 static void form_value2part(	Line 508 static void form_value2part(
if(const String* svalue=value->get_string())	if(const String* svalue=value->get_string())
form_string_value2part(key, *svalue, part);	form_string_value2part(key, *svalue, part);
else if(Table* tvalue=value->get_table()) {	else if(Table* tvalue=value->get_table()) {
Form_table_value2string_info info(key, part.string);	Form_table_value2string_info info(key, *part.string);
part.info = &info;	part.info = &info;
tvalue->for_each(form_table_value2part, &part);	tvalue->for_each(form_table_value2part, &part);
} else if(VFile* vfile=static_cast<VFile *>(value->as("file"))){	} else if(VFile* vfile=static_cast<VFile *>(value->as("file"))){
Line 471 static void form_value2part(	Line 520 static void form_value2part(
}	}

const char* pa_form2string_multipart(HashStringValue& form, Request& r, const char* boundary, size_t& post_size){	const char* pa_form2string_multipart(HashStringValue& form, Request& r, const char* boundary, size_t& post_size){
FormPart formpart;	FormPart formpart(&r, boundary);
formpart.r=&r;
formpart.boundary=boundary;
formpart.info=NULL;
form.for_each<FormPart&>(form_value2part, formpart);	form.for_each<FormPart&>(form_value2part, formpart);
formpart.string << "--" << boundary << "--";	*formpart.string << "--" << boundary << "--";
post_size=formpart.string.length(); // very surprizing, but it calculates correct post_size even with binary files!	// @todo: return binary blocks here to save memory in pa_internal_file_read_http
return formpart.string.untaint_cstr(String::L_AS_IS); // without transcoding	return formpart.post(post_size);
}	}

static void find_headers_end(char* p,	static void find_headers_end(char* p,
Line 500 static void find_headers_end(char* p,	Line 546 static void find_headers_end(char* p,
headers_end_at=0;	headers_end_at=0;
}	}

	// Set-Cookie: name=value; Domain=docs.foo.com; Path=/accounts; Expires=Wed, 13-Jan-2021 22:23:01 GMT; Secure; HttpOnly
	static ArrayString* parse_cookie(Request& r, const String& cookie) {
	char *current=strdup(cookie.cstr());

	const String* name=0;
	const String* value=&String::Empty;
	const String* expires=&String::Empty;
	const String* max_age=&String::Empty;
	const String* path=&String::Empty;
	const String* domain=&String::Empty;
	const String* httponly=&String::Empty;
	const String* secure=&String::Empty;

	bool first_pair=true;

	do {
	if(char *meaning=search_stop(current, ';'))
	if(char *attribute=search_stop(meaning, '=')) {
	const String* sname=new String(unescape_chars(attribute, strlen(attribute), &r.charsets.source(), true/don't convert '"' to space/), String::L_TAINTED);
	const String* smeaning=0;
	if(meaning)
	smeaning=new String(unescape_chars(meaning, strlen(meaning), &r.charsets.source(), true/don't convert '"' to space/), String::L_TAINTED);

	if(first_pair) {
	// name + value
	name=sname;
	value=smeaning;
	first_pair=false;
	} else {
	const String& slower=sname->change_case(r.charsets.source(), String::CC_LOWER);

	if(slower == "expires")
	expires=smeaning;
	else if(slower == "max-age")
	max_age=smeaning;
	else if(slower == "domain")
	domain=smeaning;
	else if(slower == "path")
	path=smeaning;
	else if(slower == "httponly")
	httponly=new String("1", String::L_CLEAN);
	else if(slower == "secure")
	secure=new String("1", String::L_CLEAN);
	else {
	// todo@ ?
	}
	}
	}
	} while(current);

	if(!name)
	return 0;

	ArrayString* result=new ArrayString(8);
	*result+=name;
	*result+=value;
	*result+=expires;
	*result+=max_age;
	*result+=domain;
	*result+=path;
	*result+=httponly;
	*result+=secure;

	return result;
	}

	Table* parse_cookies(Request& r, Table *cookies){
	Table& result=*new Table(new Cookies_table_template_columns);

	for(Array_iterator<Table::element_type> i(*cookies); i.has_next(); )
	if(ArrayString* row=parse_cookie(r, *i.next()->get(0)))
	result+=row;

	return &result;
	}

/// @todo build .cookies field. use ^file.tables.SET-COOKIES.menu{ for now	/// @todo build .cookies field. use ^file.tables.SET-COOKIES.menu{ for now
File_read_http_result pa_internal_file_read_http(Request& r,	File_read_http_result pa_internal_file_read_http(Request& r,
const String& file_spec,	const String& file_spec,
Line 509 File_read_http_result pa_internal_file_r	Line 631 File_read_http_result pa_internal_file_r
File_read_http_result result;	File_read_http_result result;
char host[MAX_STRING];	char host[MAX_STRING];
const char* uri;	const char* uri;
short port;	short port=80;
const char* method="GET";	const char* method="GET";
bool method_is_get=true;	bool method_is_get=true;
HashStringValue* form=0;	HashStringValue* form=0;
const char* body_cstr=0;
int timeout_secs=2;	int timeout_secs=2;
bool fail_on_status_ne_200=true;	bool fail_on_status_ne_200=true;
bool omit_post_charset=false;	bool omit_post_charset=false;
Line 521 File_read_http_result pa_internal_file_r	Line 642 File_read_http_result pa_internal_file_r
Value* vcookies=0;	Value* vcookies=0;
Value* vbody=0;	Value* vbody=0;
Charset *asked_remote_charset=0;	Charset *asked_remote_charset=0;
	Charset* real_remote_charset=0;
const char* user_cstr=0;	const char* user_cstr=0;
const char* password_cstr=0;	const char* password_cstr=0;
const char* encode=0;	const char* encode=0;
Line 564 File_read_http_result pa_internal_file_r	Line 686 File_read_http_result pa_internal_file_r
omit_post_charset=vomit_post_charset->as_bool();	omit_post_charset=vomit_post_charset->as_bool();
}	}
if(Value* vcharset_name=options->get(PA_CHARSET_NAME)) {	if(Value* vcharset_name=options->get(PA_CHARSET_NAME)) {
asked_remote_charset=&charsets.get(vcharset_name->as_string().	asked_remote_charset=&charsets.get(vcharset_name->as_string().change_case(r.charsets.source(), String::CC_UPPER));
change_case(r.charsets.source(), String::CC_UPPER));	}
	if(Value* vresponse_charset_name=options->get(PA_RESPONSE_CHARSET_NAME)) {
	valid_options++;
	real_remote_charset=&charsets.get(vresponse_charset_name->as_string().change_case(r.charsets.source(), String::CC_UPPER));
}	}
if(Value* vuser=options->get(HTTP_USER)) {	if(Value* vuser=options->get(HTTP_USER)) {
valid_options++;	valid_options++;
Line 577 File_read_http_result pa_internal_file_r	Line 702 File_read_http_result pa_internal_file_r
}	}

if(valid_options!=options->count())	if(valid_options!=options->count())
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
0,
INVALID_OPTION_PASSED);
}	}
if(!asked_remote_charset) // defaulting to $request:charset	if(!asked_remote_charset) // defaulting to $request:charset
asked_remote_charset=&(r.charsets).source();	asked_remote_charset=&(r.charsets).source();
Line 613 File_read_http_result pa_internal_file_r	Line 736 File_read_http_result pa_internal_file_r
//preparing request	//preparing request
String& connect_string=*new String(file_spec);	String& connect_string=*new String(file_spec);

String request_head_and_body;	const char* request;
	size_t request_size;
{	{
// influence URLencoding of tainted pieces to String::L_URI lang	// influence URLencoding of tainted pieces to String::L_URI lang
Temp_client_charset temp(r.charsets, *asked_remote_charset);	Temp_client_charset temp(r.charsets, *asked_remote_charset);

const char* connect_string_cstr=connect_string.transcode_and_untaint_cstr(String::L_URI, &(r.charsets));	const char* connect_string_cstr=connect_string.untaint_and_transcode_cstr(String::L_URI, &(r.charsets));

const char* current=connect_string_cstr;	const char* current=connect_string_cstr;
if(strncmp(current, "http://", 7)!=0)	if(strncmp(current, "http://", 7)!=0)
Line 631 File_read_http_result pa_internal_file_r	Line 755 File_read_http_result pa_internal_file_r
char* host_uri=lsplit(host, '/');	char* host_uri=lsplit(host, '/');
uri=host_uri?current+(host_uri-1-host):"/";	uri=host_uri?current+(host_uri-1-host):"/";
char* port_cstr=lsplit(host, ':');	char* port_cstr=lsplit(host, ':');
char* error_pos=0;
port=port_cstr?(short)strtol(port_cstr, &error_pos, 0):80;	if (port_cstr){
	char* error_pos=0;
	port=(short)strtol(port_cstr, &error_pos, 10);
	if(port==0 \|\| *error_pos)
	throw Exception(PARSER_RUNTIME, &connect_string, "invalid port number '%s'", port_cstr);
	}

// making request head	// making request head
String head;	String head;
Line 640 File_read_http_result pa_internal_file_r	Line 769 File_read_http_result pa_internal_file_r
if(method_is_get && form)	if(method_is_get && form)
head << (strchr(uri, '?')!=0?"&":"?") << pa_form2string(*form, r.charsets);	head << (strchr(uri, '?')!=0?"&":"?") << pa_form2string(*form, r.charsets);

head <<" HTTP/1.0" CRLF "Host: "<< host << CRLF;	head <<" HTTP/1.0" CRLF "Host: "<< host;
	if (port != 80)
	head << ":" << port_cstr;
	head << CRLF;

char* boundary=0;	char* boundary=0;

Line 675 File_read_http_result pa_internal_file_r	Line 807 File_read_http_result pa_internal_file_r
"headers param must be hash");	"headers param must be hash");
};	};

	const char* request_body=0;
size_t post_size=0;	size_t post_size=0;
if(form && !method_is_get) {	if(form && !method_is_get) {
head << "Content-Type: " << (multipart ? HTTP_CONTENT_TYPE_MULTIPART_FORMDATA : HTTP_CONTENT_TYPE_FORM_URLENCODED);	head << "Content-Type: " << (multipart ? HTTP_CONTENT_TYPE_MULTIPART_FORMDATA : HTTP_CONTENT_TYPE_FORM_URLENCODED);
Line 684 File_read_http_result pa_internal_file_r	Line 817 File_read_http_result pa_internal_file_r

if(multipart) {	if(multipart) {
head << "; boundary=" << boundary;	head << "; boundary=" << boundary;
body_cstr=pa_form2string_multipart(form, r/charsets & mime_type needed/, boundary, post_size/correct post_size returned here*/);	request_body=pa_form2string_multipart(form, r/charsets & mime_type needed/, boundary, post_size/correct post_size returned here*/);
} else {	} else {
body_cstr=pa_form2string(*form, r.charsets);	request_body=pa_form2string(*form, r.charsets);
post_size=strlen(body_cstr);	post_size=strlen(request_body);
}	}
head << CRLF;	head << CRLF;
} else if(vbody) {	} else if(vbody) {
// $.body was specified	// $.body was specified
if(content_type_url_encoded){	if(content_type_url_encoded){
// transcode + url-encode	// transcode + url-encode
body_cstr=vbody->as_string().transcode_and_untaint_cstr(String::L_URI, &(r.charsets));	request_body=vbody->as_string().untaint_and_transcode_cstr(String::L_URI, &(r.charsets));
} else {	} else {
// content-type != application/x-www-form-urlencoded -> transcode only, don't url-encode!	// content-type != application/x-www-form-urlencoded -> transcode only, don't url-encode!
body_cstr=Charset::transcode(	request_body=Charset::transcode(
String::C(vbody->as_string().cstr(), vbody->as_string().length()),	String::C(vbody->as_string().cstr(), vbody->as_string().length()),
r.charsets.source(),	r.charsets.source(),
*asked_remote_charset	*asked_remote_charset
);	);
}	}
post_size=strlen(body_cstr);	post_size=strlen(request_body);
}	}

// http://www.ietf.org/rfc/rfc2617.txt	// http://www.ietf.org/rfc/rfc2617.txt
Line 729 File_read_http_result pa_internal_file_r	Line 862 File_read_http_result pa_internal_file_r
} else	} else
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
0,	0,
"cookies param must be hash");	"cookies param must be hash");
}	}

if(body_cstr)	if(request_body)
head << "Content-Length: " << format(post_size, "%u") << CRLF;	head << "Content-Length: " << format(post_size, "%u") << CRLF;

	head << CRLF;

	const char *request_head=head.untaint_and_transcode_cstr(String::L_URI, &(r.charsets));

// head + end of header	if(request_body){
request_head_and_body << head.transcode_and_untaint_cstr(String::L_URI, &(r.charsets)) << CRLF;	size_t head_size = strlen(request_head);
	request_size=post_size + head_size;
// body	char ptr=(char )pa_malloc_atomic(request_size);
if(body_cstr)	memcpy(ptr, request_head, head_size);
request_head_and_body << body_cstr;	memcpy(ptr+head_size, request_body, post_size);
	request=ptr;
	} else {
	request_size=strlen(request_head);
	request=request_head;
	}
}	}

const char* request_cstr=request_head_and_body.cstr();
size_t request_size=strlen(request_cstr);

if(multipart)
request_size=file_untaint(request_cstr, request_size);

char* response;	char* response;
size_t response_size;	size_t response_size;

// sending request	// sending request
int status_code=http_request(response, response_size,	int status_code=http_request(response, response_size,
host, port, request_cstr, request_size,	host, port, request, request_size,
timeout_secs, fail_on_status_ne_200);	timeout_secs, fail_on_status_ne_200);

// processing results	// processing results
Line 768 File_read_http_result pa_internal_file_r	Line 904 File_read_http_result pa_internal_file_r
result.headers=new HashStringValue;	result.headers=new HashStringValue;
VHash* vtables=new VHash;	VHash* vtables=new VHash;
result.headers->put(HTTP_TABLES_NAME, vtables);	result.headers->put(HTTP_TABLES_NAME, vtables);
Charset* real_remote_charset=0; // undetected, yet

if(headers_end_at) {	if(headers_end_at) {
*headers_end_at=0;	*headers_end_at=0;
Line 791 File_read_http_result pa_internal_file_r	Line 926 File_read_http_result pa_internal_file_r
"bad response from host - bad header \"%s\"", line.cstr());	"bad response from host - bad header \"%s\"", line.cstr());
const String::Body HEADER_NAME=line.mid(0, pos).change_case(r.charsets.source(), String::CC_UPPER);	const String::Body HEADER_NAME=line.mid(0, pos).change_case(r.charsets.source(), String::CC_UPPER);
const String& HEADER_VALUE=line.mid(pos+1, line.length()).trim(String::TRIM_BOTH, " \t\r");	const String& HEADER_VALUE=line.mid(pos+1, line.length()).trim(String::TRIM_BOTH, " \t\r");
if(as_text && HEADER_NAME==HTTP_CONTENT_TYPE_UPPER)	if(as_text && HEADER_NAME==HTTP_CONTENT_TYPE_UPPER && !real_remote_charset)
real_remote_charset=detect_charset(HEADER_VALUE.cstr());	real_remote_charset=detect_charset(HEADER_VALUE.cstr());

// tables	// tables
Line 819 File_read_http_result pa_internal_file_r	Line 954 File_read_http_result pa_internal_file_r

result.headers->put(HEADER_NAME, new VString(HEADER_VALUE));	result.headers->put(HEADER_NAME, new VString(HEADER_VALUE));
}	}

	// filling $.cookies
	if(Value vcookies=(Value )tables.get("SET-COOKIE"))
	result.headers->put(HTTP_COOKIES_NAME, new VTable(parse_cookies(r, vcookies->get_table())));
}	}

if(as_text && raw_body_size>=3 && strncmp(raw_body, "\xEF\xBB\xBF", 3)==0){	if(as_text && raw_body_size>=3 && strncmp(raw_body, "\xEF\xBB\xBF", 3)==0){
// skip UTF-8 signature (BOM code)	// skip UTF-8 signature (BOM code)
raw_body+=3;	raw_body+=3;
raw_body_size-=3;	raw_body_size-=3;
	if(!real_remote_charset)
	real_remote_charset=&UTF8_charset;
}	}

// output response	// output response

E-mail:

Removed from v.1.43
changed lines
	Added in v.1.62