Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Titanium-Web-Proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Titanium-Web-Proxy
Commits
b8c85c74
Commit
b8c85c74
authored
Feb 05, 2016
by
titanium007
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #38 from titanium007/master
Merge master to release
parents
75d6ba76
60c23d7e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
SessionEventArgs.cs
Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
+1
-1
CertificateManager.cs
Titanium.Web.Proxy/Helpers/CertificateManager.cs
+5
-2
No files found.
Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
View file @
b8c85c74
...
...
@@ -326,7 +326,7 @@ namespace Titanium.Web.Proxy.EventArguments
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
View file @
b8c85c74
...
...
@@ -3,6 +3,7 @@ using System.IO;
using
System.Diagnostics
;
using
System.Collections.Generic
;
using
System.Security.Cryptography.X509Certificates
;
using
System.Reflection
;
namespace
Titanium.Web.Proxy.Helpers
{
...
...
@@ -112,14 +113,16 @@ namespace Titanium.Web.Proxy.Helpers
{
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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment