--- parser3/src/classes/file.C 2013/08/27 11:27:45 1.229 +++ parser3/src/classes/file.C 2015/01/12 12:13:25 1.232 @@ -25,7 +25,7 @@ #include "pa_vregex.h" #include "pa_version.h" -volatile const char * IDENT_FILE_C="$Id: file.C,v 1.229 2013/08/27 11:27:45 moko Exp $"; +volatile const char * IDENT_FILE_C="$Id: file.C,v 1.232 2015/01/12 12:13:25 misha Exp $"; // defines @@ -486,7 +486,7 @@ static void _exec_cgi(Request& r, Method // const ECSTR(GATEWAY_INTERFACE, "CGI/1.1"); - ECSTR("PARSER_VERSION", PARSER_VERSION); + ECSTR(PARSER_VERSION, PARSER_VERSION); // from Request.info ECSTR(DOCUMENT_ROOT, r.request_info.document_root); ECSTR(PATH_TRANSLATED, r.request_info.path_translated); @@ -699,6 +699,7 @@ static void _list(Request& r, MethodPara } if(Value* value=options->get("filter")) { vfilter=value; + valid_options++; } if(valid_options!=options->count()) throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); @@ -739,9 +740,9 @@ static void _list(Request& r, MethodPara if(stat) { ffblk.stat_file(); *row+=VDouble(ffblk.size()).get_string(); - *row+=new String(String::Body::Format(ffblk.c_timestamp()), String::L_CLEAN); - *row+=new String(String::Body::Format(ffblk.m_timestamp()), String::L_CLEAN); - *row+=new String(String::Body::Format(ffblk.a_timestamp()), String::L_CLEAN); + *row+=new String(String::Body::Format((int)ffblk.c_timestamp()), String::L_CLEAN); + *row+=new String(String::Body::Format((int)ffblk.m_timestamp()), String::L_CLEAN); + *row+=new String(String::Body::Format((int)ffblk.a_timestamp()), String::L_CLEAN); } table+=row; }