--- parser3/src/classes/file.C 2002/11/25 14:57:32 1.105 +++ parser3/src/classes/file.C 2003/03/21 07:19:42 1.108 @@ -1,11 +1,11 @@ /** @file Parser: @b file parser class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_FILE_C="$Date: 2002/11/25 14:57:32 $"; +static const char* IDENT_FILE_C="$Date: 2003/03/21 07:19:42 $"; #include "pa_config_includes.h" @@ -269,7 +269,6 @@ static void _exec_cgi(Request& r, const env.put(*new(pool) String(pool, "SCRIPT_NAME"), &script_name); //env.put(*new(pool) String(pool, "SCRIPT_FILENAME"), ??&script_name); - bool stdin_specified=false; // environment & stdin from param String in(pool); if(params->size()>1) { @@ -278,7 +277,6 @@ static void _exec_cgi(Request& r, const Append_env_pair_info info={&env}; user_env->for_each(append_env_pair, &info); if(info.vstdin) { - stdin_specified=true; if(const String *sstdin=info.vstdin->get_string()) { in.append(*sstdin, String::UL_CLEAN, true); } else @@ -301,10 +299,6 @@ static void _exec_cgi(Request& r, const *argv+=¶ms->as_string(i, "parameter must be string"); } - // passing POST data - if(!stdin_specified) // if $.stdin[...] not specified - in.APPEND(r.post_data, r.post_size, String::UL_CLEAN, "POST data (passed)", 0); - // exec! String out(pool); String& err=*new(pool) String(pool); @@ -578,8 +572,12 @@ static void _fullpath(Request& r, const // /some/page.html: ^file:fullpath[a.gif] => /some/a.gif const String& full_disk_path=r.absolute(file_spec); size_t document_root_length=strlen(r.info.document_root); - if(document_root_length>0) - --document_root_length; + + if(document_root_length>0) { + char last_char=r.info.document_root[document_root_length-1]; + if(last_char == '/' || last_char == '\\') + --document_root_length; + } result=&full_disk_path.mid(document_root_length, full_disk_path.size()); } r.write_assign_lang(*result);