--- parser3/src/classes/file.C	2016/11/28 22:42:57	1.256
+++ parser3/src/classes/file.C	2016/12/28 17:41:15	1.259
@@ -25,7 +25,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.256 2016/11/28 22:42:57 moko Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.259 2016/12/28 17:41:15 moko Exp $";
 
 // defines
 
@@ -118,6 +118,7 @@ static const char* suexec_safe_env_lst[]
 
 // statics
 
+static const String::Body size_name("size");
 static const String::Body adate_name("adate");
 static const String::Body mdate_name("mdate");
 static const String::Body cdate_name("cdate");
@@ -285,7 +286,7 @@ static void _load(Request& r, MethodPara
 	if(file.headers){
 		file.headers->for_each<HashStringValue*>(_load_pass_param, &self.fields());
 	} else {
-		size_t size;
+		uint64_t size;
 		time_t atime, mtime, ctime;
 
 		file_stat(lfile_name, size, atime, mtime, ctime);
@@ -385,14 +386,15 @@ static void _create(Request& r, MethodPa
 static void _stat(Request& r, MethodParams& params) {
 	const String& lfile_name=params.as_string(0, FILE_NAME_MUST_NOT_BE_CODE);
 
-	size_t size;
+	uint64_t size;
 	time_t atime, mtime, ctime;
 	file_stat(r.absolute(lfile_name), size, atime, mtime, ctime);
 	
 	VFile& self=GET_SELF(r, VFile);
 
-	self.set_binary(true/*tainted*/, 0/*no bytes*/, size, &lfile_name, 0, &r);
+	self.set_binary(true/*tainted*/, 0 /*no bytes*/, 0 /*fake size*/, &lfile_name, 0, &r);
 	HashStringValue& ff=self.fields();
+	ff.put(size_name, new VDouble((double)size) /*real size*/);
 	ff.put(adate_name, new VDate((pa_time_t)atime));
 	ff.put(mdate_name, new VDate((pa_time_t)mtime));
 	ff.put(cdate_name, new VDate((pa_time_t)ctime));
@@ -660,7 +662,7 @@ static void _exec_cgi(Request& r, Method
 		}
 	} else { // ^file::exec
 		// $body
-		self.set(false/*not tainted*/, is_text, file_out->str, file_out->length);
+		self.set(false/*not tainted*/, is_text, file_out->str ? file_out->str : pa_strdup("") /*to distinguish from stat-ed file*/, file_out->length);
 	}
 
 	// $status