--- parser3/src/classes/file.C 2001/04/15 13:12:17 1.26 +++ parser3/src/classes/file.C 2001/04/17 19:31:06 1.28 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: file.C,v 1.26 2001/04/15 13:12:17 paf Exp $ + $Id: file.C,v 1.28 2001/04/17 19:31:06 paf Exp $ */ #include "pa_request.h" @@ -102,10 +102,13 @@ static void append_env_pair(const Hash:: Hash& hash=*static_cast(info); hash.put(key, &static_cast(value)->as_string()); } -/// ^exec[file-name] -/// ^exec[file-name;env hash] -/// ^exec[file-name;env hash;cmd;line;arg;s] -/// @test header to $fields. waits for header '\' tricks +/** + ^exec[file-name] + ^exec[file-name;env hash] + ^exec[file-name;env hash;cmd;line;arg;s] + @test header to $fields. waits for header '\' tricks + @todo fix `` in perl - they produced flipping consoles and no output to perl +*/ static void _cgi(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -152,6 +155,10 @@ static void _cgi(Request& r, const Strin PASS(REMOTE_USER); // SCRIPT_NAME env.put(String(pool, "SCRIPT_NAME"), &script_name); +#ifdef WIN32 + // WIN32 shell + PASS(COMSPEC); +#endif if(params->size()>1) { Value& venv=params->get_no_junction(1, "env must not be code"); @@ -172,7 +179,7 @@ static void _cgi(Request& r, const Strin const String in(pool, r.post_data, r.post_size); String out(pool); - String err(pool); + String& err=*new(pool) String(pool); int exit_code=pa_exec(script_name, &env, argv, in, out, err); @@ -186,7 +193,8 @@ static void _cgi(Request& r, const Strin delim_size=0; // calm down, compiler PTHROW(0, 0, &method_name, - "output does not contain CGI header"); + "output does not contain CGI header; exit code=%d; size=%u; text: \"%s\"", + exit_code, (uint)out.size(), out.cstr()); } const String& header=out.mid(0, pos);