From 34f38557c5c0cc740a43de1d6d3ba367ff34ac7b Mon Sep 17 00:00:00 2001
From: Adrian <adrian.dev@kousz.ch>
Date: Fri, 27 Nov 2015 21:32:59 +0100
Subject: [PATCH 1/2] Fix unreadable blue color

---
 conf/windows/Config.reg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/windows/Config.reg b/conf/windows/Config.reg
index d927ffc..f1aa240 100644
--- a/conf/windows/Config.reg
+++ b/conf/windows/Config.reg
@@ -3,6 +3,7 @@ REGEDIT4
 [HKEY_CURRENT_USER\Console]
 "ColorTable00"=dword:00403010
 "ColorTable07"=dword:00d0c8c0
+"ColorTable09"=dword:00ff9933
 "FaceName"="Oxygen Mono"
 "FontFamily"=dword:00000036
 "FontSize"=dword:000c0000

From c55d4afa87d3a6d708679851adf252ce3e62f8eb Mon Sep 17 00:00:00 2001
From: Adrian <adrian.dev@kousz.ch>
Date: Sun, 13 Dec 2015 23:09:12 +0100
Subject: [PATCH 2/2] Update cgi-bin.php

---
 conf/nginx/cgi-bin.php | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/conf/nginx/cgi-bin.php b/conf/nginx/cgi-bin.php
index ed588eb..cc4a793 100644
--- a/conf/nginx/cgi-bin.php
+++ b/conf/nginx/cgi-bin.php
@@ -1,22 +1,14 @@
 <?php
 
-/**
- * Run old CGI applications through PHP
- * @author Adrian Kousz
- * @link https://wiki.archlinux.org/index.php/Awstats Source
- */
+// Adapted from https://wiki.archlinux.org/index.php/Awstats
 
 // Prepare environment
 
 $newenv = $_SERVER;
-$xScriptFilename = $_SERVER["X_SCRIPT_FILENAME"];
-$xScriptName = $_SERVER["X_SCRIPT_NAME"];
-$newenv["SCRIPT_FILENAME"] = $xScriptFilename;
-$newenv["SCRIPT_NAME"] = $xScriptName;
+$newenv["SCRIPT_FILENAME"] = $_SERVER["X_SCRIPT_FILENAME"];
+$newenv["SCRIPT_NAME"] = $_SERVER["X_SCRIPT_NAME"];
 
-// Check file
-
-if (!is_executable($xScriptFilename) || is_dir($xScriptFilename))
+if (!is_executable($_SERVER["X_SCRIPT_FILENAME"]) || is_dir($_SERVER["X_SCRIPT_FILENAME"]))
 	error_exit(404, 'Not Found');
 
 // Open process
@@ -27,7 +19,7 @@ $descriptorspec = array(
 	array('pipe', 'w'),
 );
 $pipes = array();
-$process = proc_open($xScriptFilename, $descriptorspec, $pipes, null, $newenv);
+$process = proc_open($_SERVER["X_SCRIPT_FILENAME"], $descriptorspec, $pipes, null, $newenv);
 
 if (!is_resource($process))
 	error_exit(500, 'Internal Server Error');
@@ -36,29 +28,26 @@ if (!is_resource($process))
 
 while (true) {
 	$head = fgets($pipes[1]);
-	if ($head === "\r\n" || $head === "\n") break;
+	if ($head === false || $head === "\r\n" || $head === "\n") break;
 	header($head);
 }
 fpassthru($pipes[1]);
 
-// Log errors
-
-$scriptErrors = '';
-while ($line = fgets($pipes[2])) $scriptErrors .= $line;
-$scriptErrors = trim($scriptErrors);
-if ($scriptErrors) trigger_error($scriptErrors, E_USER_NOTICE);
-
 // Close
 
+$scriptErrors = trim(stream_get_contents($pipes[2]));
 foreach ($pipes as $fh) fclose($fh);
-proc_close($process);
+$returnValue = proc_close($process);
+if ($scriptErrors) trigger_error("Status=$returnValue Error=$scriptErrors", E_USER_ERROR);
+exit;
 
 // Exit helper
 
 function error_exit($code, $msg)
 {
+	$err = "Error executing $_SERVER[X_SCRIPT_FILENAME]: $msg";
 	header("$_SERVER[SERVER_PROTOCOL] $code $msg");
 	echo($msg);
 	trigger_error($err, E_USER_ERROR);
-	exit;
+	exit(1);
 }