--- parser3/src/main/pa_exec.C	2009/10/02 01:18:27	1.78
+++ parser3/src/main/pa_exec.C	2015/10/28 22:50:00	1.87
@@ -1,29 +1,23 @@
 /** @file
 	Parser: program executing for different OS-es.
 
-	Copyright(c) 2000-2009 ArtLebedev Group(http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
 	@todo setrlimit
 */
 
-static const char * const IDENT_EXEC_C="$Date: 2009/10/02 01:18:27 $";
-
 #include "pa_config_includes.h"
 
 #include "pa_exec.h"
 #include "pa_exception.h"
 #include "pa_common.h"
 
-#ifdef WIN32
-#	include <windows.h>
-#else
-#	include <signal.h>
-#	include <sys/types.h>
-#	include <sys/wait.h>
-#endif
+volatile const char * IDENT_PA_EXEC_C="$Id: pa_exec.C,v 1.87 2015/10/28 22:50:00 moko Exp $" IDENT_PA_EXEC_H;
 
-#ifdef WIN32
+#ifdef _MSC_VER
+
+#include <windows.h>
 
 /// this func from http://www.ccas.ru/~posp/popov/spawn.htm
 static DWORD CreateHiddenConsoleProcess(LPCTSTR szCmdLine,
@@ -51,15 +45,27 @@ static DWORD CreateHiddenConsoleProcess(
 	// create STDIN pipe
 	if(!CreatePipe(&hInRead, phInWrite, &sa, 0))
 		goto error;
-	
+
+	// Ensure the write handle to the pipe for STDIN is not inherited. 
+	if (!SetHandleInformation(*phInWrite, HANDLE_FLAG_INHERIT, 0))
+		goto error;
+
 	// create STDOUT pipe
 	if(!CreatePipe(phOutRead, &hOutWrite, &sa, 0))
 		goto error;
 	
+	// Ensure the read handle to the pipe for STDOUT is not inherited.
+	if (!SetHandleInformation(*phOutRead, HANDLE_FLAG_INHERIT, 0))
+		goto error;
+
 	// create STDERR pipe
 	if(!CreatePipe(phErrRead, &hErrWrite, &sa, 0))
 		goto error;
 	
+	// Ensure the read handle to the pipe for STDERR is not inherited.
+	if (!SetHandleInformation(*phErrRead, HANDLE_FLAG_INHERIT, 0))
+		goto error;
+
 	// process startup information
 	memset(&si, 0, sizeof(si));
 	si.cb=sizeof(si); 
@@ -111,6 +117,20 @@ error:
 	return result;
 }
 
+static int get_exit_status(HANDLE hProcess) {
+	DWORD dwExitCode = 0;
+	if(!GetExitCodeProcess(hProcess, &dwExitCode))
+		return -1;
+	if(dwExitCode != STILL_ACTIVE)
+		return dwExitCode;
+	// wait for 1 second for process to exit
+	if(WaitForSingleObject(hProcess, 1000) != WAIT_OBJECT_0)
+		return -2;
+	if(!GetExitCodeProcess(hProcess, &dwExitCode))
+		return -1;
+	return dwExitCode;
+}
+
 static void read_pipe(String& result, HANDLE hOutRead, String::Language lang){
 	while(true) {
 		char *buf=new(PointerFreeGC) char[MAX_STRING+1];
@@ -339,7 +359,7 @@ static void read_pipe(File_read_result&
 
 #ifndef DOXYGEN
 struct Append_env_pair_info {
-#ifdef WIN32
+#ifdef _MSC_VER
 	String::Body& body;
 	Append_env_pair_info(String::Body& abody): body(abody) {}
 #else
@@ -347,10 +367,11 @@ struct Append_env_pair_info {
 #endif
 };
 #endif
+
 ///@test maybe here and at argv construction --- untaint_cstr(String::L_AS_IS
 static void append_env_pair(HashStringString::key_type key, HashStringString::value_type value,
 		Append_env_pair_info *info) {
-#ifdef WIN32
+#ifdef _MSC_VER
 	info->body << key << "=" << value;
 	info->body.append_know_length("\1", 1); // placeholder for of zero byte
 #else
@@ -362,11 +383,7 @@ static void append_env_pair(HashStringSt
 }
 
 PA_exec_result pa_exec(
-			bool 
-#if defined(NO_PA_EXEC) || defined(PA_SAFE_MODE)
-			forced_allow
-#endif
-			, 
+			bool forced_allow,
 			const String& file_spec, 
 			const HashStringString* env, 
 			const ArrayString& argv, 
@@ -380,7 +397,7 @@ PA_exec_result pa_exec(
 			"parser execs are disabled [recompile parser without --disable-execs configure option]");
 #endif
 
-#ifdef WIN32
+#ifdef _MSC_VER
 
 	PROCESS_INFORMATION pi;	
 	HANDLE hInWrite, hOutRead, hErrRead;
@@ -414,21 +431,14 @@ PA_exec_result pa_exec(
 		const char* in_cstr=in.cstr();
 		DWORD written_size;
 		WriteFile(hInWrite, in_cstr, in.length(), &written_size, NULL);
-		// EOF for stupid text reads
-		// normally they should read CONTENT_LENGTH bytes,
-		// without this char
-		WriteFile(hInWrite, "\x1A", 1, &written_size, NULL);
 		CloseHandle(hInWrite);
 		read_pipe(result.out, hOutRead);
 		CloseHandle(hOutRead);
-		read_pipe(result.err, hErrRead, String::L_TAINTED);		
+		read_pipe(result.err, hErrRead, String::L_TAINTED);
 		CloseHandle(hErrRead);
-/*	
-from http://www.apache.org/websrc/cvsweb.cgi/apache-1.3/src/main/util_script.c?rev=1.151&content-type=text/vnd.viewcvs-markup
-
-	* We must close the handles to the new process and its main thread
-	* to prevent handle and memory leaks.
-*/	
+		result.status=get_exit_status(pi.hProcess);
+		// We must close the handles to the new process and its main thread
+		// to prevent handle and memory leaks.
 		CloseHandle(pi.hProcess);
 		CloseHandle(pi.hThread);
 	}
@@ -440,7 +450,6 @@ from http://www.apache.org/websrc/cvsweb
 
 	int pipe_write, pipe_read, pipe_err;
 
-#ifdef PA_SAFE_MODE
 	if(!forced_allow) {
 		struct stat finfo;
 		if(stat(file_spec_cstr, &finfo)!=0)
@@ -451,7 +460,6 @@ from http://www.apache.org/websrc/cvsweb
 
 		check_safe_mode(finfo, file_spec, file_spec_cstr);
 	}
-#endif
 
 	char* argv_cstrs[1+100+1]={file_spec_cstr, 0};
 	const int argv_size=argv.count();