Merge pull request #38 from titanium007/master

Merge master to release

Author: justcoding121

Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs

@@ -326,7 +326,7 @@ public void Ok(string html)
             var result = Encoding.Default.GetBytes(html);
 
             var connectStreamWriter = new StreamWriter(this.Client.ClientStream);
-            connectStreamWriter.WriteLine(string.Format("{0} {2} {3}", ProxySession.Request.HttpVersion, 200, "Ok"));
+            connectStreamWriter.WriteLine(string.Format("{0} {1} {2}", ProxySession.Request.HttpVersion, 200, "Ok"));
             connectStreamWriter.WriteLine("Timestamp: {0}", DateTime.Now);
             connectStreamWriter.WriteLine("content-length: " + result.Length);
             connectStreamWriter.WriteLine("Cache-Control: no-cache, no-store, must-revalidate");

Titanium.Web.Proxy/Helpers/CertificateManager.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
+using System.Reflection;
 
 namespace Titanium.Web.Proxy.Helpers
 {
@@ -112,14 +113,16 @@ protected virtual void CreateCertificate(string[] args)
         {
             using (var process = new Process())
             {
-                if (!File.Exists("makecert.exe"))
+                string file = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "makecert.exe");
+
+                if (!File.Exists(file))
                     throw new Exception("Unable to locate 'makecert.exe'.");
 
                 process.StartInfo.Verb = "runas";
                 process.StartInfo.Arguments = args != null ? args[0] : string.Empty;
                 process.StartInfo.CreateNoWindow = true;
                 process.StartInfo.UseShellExecute = false;
-                process.StartInfo.FileName = "makecert.exe";
+                process.StartInfo.FileName = file;
 
                 process.Start();
                 process.WaitForExit();