--- parser3/src/classes/file.C	2002/08/01 11:26:43	1.91
+++ parser3/src/classes/file.C	2002/09/10 10:55:32	1.97
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_FILE_C="$Id: file.C,v 1.91 2002/08/01 11:26:43 paf Exp $";
+static const char* IDENT_FILE_C="$Date: 2002/09/10 10:55:32 $";
 
 #include "pa_config_includes.h"
 
@@ -119,12 +119,10 @@ static void _move(Request& r, const Stri
 static void _load(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	Value& vmode_name=params-> as_no_junction(0, "mode must not be code");
-	Value& vfile_name=params->as_no_junction(1, "file name must not be code");
-
-	const String& lfile_name=vfile_name.as_string();
+	const String& lfile_name=r.absolute(params->as_no_junction(1, "file name must not be code").as_string());
 
 	void *data;  size_t size;
-	file_read(pool, r.absolute(lfile_name), data, size, 
+	file_read(pool, lfile_name, data, size, 
 		vmode_name.as_string()==TEXT_MODE_NAME);
 
 	char *user_file_name=params->size()>2?
@@ -153,6 +151,7 @@ static void _stat(Request& r, const Stri
 	ff.put(*new(pool) String(pool, "adate"), new(pool) VDate(pool, atime));
 	ff.put(*new(pool) String(pool, "mdate"), new(pool) VDate(pool, mtime));
 	ff.put(*new(pool) String(pool, "cdate"), new(pool) VDate(pool, ctime));
+	ff.put(*content_type_name, new(pool) VString(r.mime_type_of(lfile_name.cstr(String::UL_FILE_SPEC))));
 }
 
 static bool is_safe_env_key(const char *key) {
@@ -186,13 +185,24 @@ static void append_env_pair(const Hash::
 		pi.hash->put(key, &svalue);
 	}
 }
-static void pass_cgi_header_attribute(Array::Item *value, void *info) {
+#ifndef DOXYGEN
+struct Pass_cgi_header_attribute_info {
+	Hash *hash;
+	Value *content_type;
+};
+#endif
+static void pass_cgi_header_attribute(Array::Item *value, void *ainfo) {
 	String& string=*static_cast<String *>(value);
-	Hash& hash=*static_cast<Hash *>(info);
+	Pool& pool=string.pool();
+	Pass_cgi_header_attribute_info& info=*static_cast<Pass_cgi_header_attribute_info *>(ainfo);
 	int colon_pos=string.pos(":", 1);
-	if(colon_pos>0)
-		hash.put(string.mid(0, colon_pos), 
-		new(string.pool()) VString(string.mid(colon_pos+1, string.size())));
+	if(colon_pos>0) {
+		const String& key=string.mid(0, colon_pos).change_case(pool, String::CC_UPPER);
+		Value *value=new(pool) VString(string.mid(colon_pos+1, string.size()));
+		info.hash->put(key, value);
+		if(key=="CONTENT-TYPE")
+			info.content_type=value;
+	}
 }
 /// @todo fix `` in perl - they produced flipping consoles and no output to perl
 static void _exec_cgi(Request& r, const String& method_name, MethodParams *params,
@@ -270,10 +280,12 @@ static void _exec_cgi(Request& r, const
 	VFile& self=*static_cast<VFile *>(r.self);
 
 	const String *body=&out; // ^file:exec
+	Value *content_type=0;
+	const char *eol_marker="\r\n"; size_t eol_marker_size=2;
+	const String *header=0;
 	if(cgi) { // ^file:cgi
 		// construct with 'out' body and header
 		int delim_size;
-		const char *eol_marker="\r\n"; size_t eol_marker_size=2;
 		int pos=out.pos("\r\n\r\n", delim_size=4);
 		if(pos<0) {
 			eol_marker="\n"; eol_marker_size=1;
@@ -290,19 +302,22 @@ static void _exec_cgi(Request& r, const
 					(uint)err.size(), err.cstr());
 		}
 
-		const String& header=out.mid(0, pos);
+		header=&out.mid(0, pos);
 		body=&out.mid(pos+delim_size, out.size());
-
-		// header to $fields
-		{
-			Array rows(pool);
-			header.split(rows, 0, eol_marker, eol_marker_size, String::UL_CLEAN);
-			rows.for_each(pass_cgi_header_attribute, &self.fields());
-		}
 	}
 	// body
 	self.set(false/*not tainted*/, body->cstr(), body->size());
 
+	// $fields << header
+	if(header) {
+		Array rows(pool);
+		header->split(rows, 0, eol_marker, eol_marker_size);
+		Pass_cgi_header_attribute_info info={&self.fields()};
+		rows.for_each(pass_cgi_header_attribute, &info);
+		if(info.content_type)
+			self.fields().put(*content_type_name, info.content_type);
+	}
+
 	// $status
 	self.fields().put(
 		*new(pool) String(pool, "status"),
@@ -313,8 +328,6 @@ static void _exec_cgi(Request& r, const
 		self.fields().put(
 			*new(pool) String(pool, "stderr"),
 			new(pool) VString(err));
-
-		SAPI::log(pool, "file:%s: %s", cgi?"cgi":"exec", err.cstr());
 	}
 }
 static void _exec(Request& r, const String& method_name, MethodParams *params) {
@@ -444,7 +457,7 @@ static void _find(Request& r, const Stri
 
 	// easy way
 	if(file_readable(r.absolute(*file_spec))) {
-		r.write_no_lang(*file_spec);
+		r.write_assign_lang(*file_spec);
 		return;
 	}
 
@@ -459,7 +472,7 @@ static void _find(Request& r, const Stri
 		local_test_name<<*(dirname=&dirname->mid(0, after_monkey_slash));
 		local_test_name<<basename;
 		if(file_readable(r.absolute(local_test_name))) {
-			r.write_no_lang(*new(pool) String(local_test_name));
+			r.write_assign_lang(*new(pool) String(local_test_name));
 			return;
 		}
 	}