Skip to content
This repository was archived by the owner on Jul 9, 2023. It is now read-only.

Stable #244

Merged
merged 54 commits into from
May 19, 2017
Merged

Stable #244

merged 54 commits into from
May 19, 2017

Conversation

@justcoding121
Copy link
Owner

@justcoding121 justcoding121 commented May 19, 2017 •
edited
Loading

Doneness:

  • Build is okay - I made sure that this change is building successfully.
  • No Bugs - I made sure that this change is working properly as expected. It doesn't have any bugs that you are aware of.
  • Branching - If this is not a hotfix, I am making this request against develop branch

honfika and others added 30 commits May 15, 2017 10:43
@honfika
Allow to generate root certificate with Titanium without storing it i…
72c9135 
…n file system
@honfika
Allow to remove the root certificates from windows certmgr
0cb7db7
@honfika
Certificate Issuer/Name setter fix
f6277d3
@justcoding121
Merge pull request #224 from honfika/develop
1178e5d 
RootCertificate creation improvements
#184 add connection count; TODO: Find out why large number of client …
985890a 
…connections are active
#184 move linger state experimentally to avoid object disposed except…
922398f 
…ion on Close
Add Server Connection Count; Reduce Params
45b0d87
print server connections for debugging
eed3ff9
decrement server connection when closed
ac58fee
@honfika
- Create less TcpRow objects
90c935e 
- Use static Http Verion objects
- Common HTTP header parser (request, response)
- Code duplication removed from ProxyAuthorizationHandler
- Fix? for issue #227
@honfika
Fix for #227
5e9e129
@justcoding121
Merge pull request #228 from honfika/develop
77cc1a7 
- Create less TcpRow objects
@justcoding121
Fix server connection reuse
d5082b4
@justcoding121
format
07f86b8
@justcoding121
call dispose correctly
063d78a
update sample proj for convenience (don't block google, evade dropbox)
f183d65
@honfika
reuse buffers, missing dispose added
7b84816
@justcoding121
reduce timeout; cleanup
278e2a5
@justcoding121
Merge pull request #230 from justcoding121/develop
11a2221 
Beta
@honfika
ServerConnection?.Dispose(); Call removed.
f089acc
@justcoding121
Merge pull request #229 from honfika/develop
dff9ef7 
reuse buffers, missing dispose added
@honfika
connection count locking + usings sorted
e6d8eb2
@honfika
event parallel invoke moved to extension class
a7d679d
@honfika
cleanup
c44631d
@honfika
Pass the ProxyServer object to CertificateSelection callbacks
0f6434e
@justcoding121
Merge pull request #233 from honfika/develop
585ec8e 
connection count locking + usings sorted
#231 Fix server count; don't dispose twice
e7c1c98
revert experimental changes
fde5838
@honfika
Space within single line array initializer
270cb13
#232 experimental fix
1641a29
justcoding121 and others added 24 commits May 16, 2017 12:19
@justcoding121
Merge pull request #236 from honfika/develop
94afaa0 
Space within single line array initializer
set body bytes to null after use
20ce85b
@honfika
move Dispose all to finally blocks
30f5389
fix issue with console quickedit mode where app hangs until key press
c994c82
improve readability
ab64887
@honfika
dispose flag changed to disposed flag in HandleHttpSessionRequestInte…
acde2df 
…rnal
@justcoding121
Merge pull request #237 from honfika/develop
f9ca3b0 
move Dispose calls to finally blocks
#184 dispose args
1c35a2d
disable quick edit causing app hang
522d0b5
@justcoding121
Merge pull request #238 from justcoding121/develop
b8355cd 
Beta
@justcoding121
move around methods based on logical flow
652b444
@honfika
Allow to query the root certificate status (IsRootCertificateTrusted …
f1e3741 
…and IsRootCertificateMachineTrusted)

Allow to machine trust the root certificate (it will show the UAC dialog when required)
Not sure why this was added in PR #187
cad1b6d
@honfika
Enterprise parameter removed
03e69d2
@justcoding121
Merge pull request #239 from honfika/develop
78746e8 
Allow to query the root certificate status (IsRootCertificateTrusted …
move dispose; remove references to actice objects after dispose
10e5e31
@justcoding121
Merge pull request #240 from justcoding121/develop
7fa3a9b 
Beta
@justcoding121
add TLS cert revocation check flag; cleanup
a630f28
@justcoding121
Merge pull request #241 from justcoding121/develop
cccc61a 
add TLS cert revocation check flag; cleanup
@justcoding121
already supported
c046a32
#242 Fix external proxy
2260a89
Merge branch 'develop' of https://github.com/justcoding121/Titanium-W…
3b4b6ad 
…eb-Proxy into develop
@justcoding121
Merge pull request #243 from justcoding121/develop
75fb00c 
Merge with beta
Merge branch 'stable' of https://github.com/justcoding121/Titanium-We…
42313cb 
…b-Proxy into beta

# Conflicts:
#	Examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs
#	Titanium.Web.Proxy/Helpers/CustomBinaryReader.cs
#	Titanium.Web.Proxy/Helpers/Network.cs
#	Titanium.Web.Proxy/Helpers/Tcp.cs
#	Titanium.Web.Proxy/Http/HeaderParser.cs
#	Titanium.Web.Proxy/Http/HttpWebClient.cs
#	Titanium.Web.Proxy/Http/Request.cs
#	Titanium.Web.Proxy/Network/CertificateManager.cs
#	Titanium.Web.Proxy/Network/Tcp/TcpConnection.cs
#	Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
#	Titanium.Web.Proxy/ProxyAuthorizationHandler.cs
#	Titanium.Web.Proxy/ProxyServer.cs
#	Titanium.Web.Proxy/RequestHandler.cs
#	Titanium.Web.Proxy/ResponseHandler.cs
@justcoding121 justcoding121 changed the title Beta Stable May 19, 2017
@justcoding121 justcoding121 merged commit 8b6cd97 into stable May 19, 2017
justcoding121 added a commit that referenced this pull request Oct 18, 2017
@justcoding121
Merge pull request #244 from justcoding121/beta
d10f39f 
Stable
justcoding121 added a commit that referenced this pull request Oct 19, 2017
@justcoding121
Merge pull request #244 from justcoding121/beta
319ef26 
Stable
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@justcoding121 @honfika