Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.0 #3

Open
wants to merge 2,163 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
2163 commits
Select commit Hold shift + click to select a range
6f7217d
refine dup condition
phuslu Aug 24, 2013
335642c
refine url2filter function
phuslu Aug 24, 2013
06a8fb5
add multi online urlfiter support
phuslu Aug 24, 2013
08ca556
typo
phuslu Aug 24, 2013
4ab3f54
fix chunk
phuslu Aug 24, 2013
27107c2
add response_replace_header function
phuslu Aug 24, 2013
663ade9
rewrite addto-startup.vbs with JScript
phuslu Aug 25, 2013
e5440e3
clear proxy.pac
phuslu Aug 25, 2013
f5d3c40
refine and revert clean proxy.pac
phuslu Aug 25, 2013
a695358
fix dnsDomainIs mistakes.
phuslu Aug 25, 2013
fc9b7c2
edit(reshack) goagent.exe to use local pac
phuslu Aug 25, 2013
14f57ca
add gght.com
phuslu Aug 26, 2013
091fc32
rm tz.php
phuslu Aug 26, 2013
e7e82c6
rewrite dnsserver with gevent/dnslib
phuslu Aug 27, 2013
caeacce
do remote resolve if dns enabled
phuslu Aug 27, 2013
04f1bec
refine proxy.ini
phuslu Aug 27, 2013
db2b2b8
bugfix
phuslu Aug 29, 2013
b047b34
add appspot.com
phuslu Aug 29, 2013
7b79104
bugfix for gtalk
phuslu Aug 29, 2013
933e98b
support multiple hosts address
phuslu Aug 29, 2013
fe015be
Update proxy.py
phuslu Aug 30, 2013
ae8913d
update goagent
phuslu Aug 31, 2013
03ac81f
update goagent
phuslu Aug 31, 2013
fd48b34
delay trigger pac update
phuslu Aug 31, 2013
82f9ea1
fix pac autoupdate
phuslu Aug 31, 2013
96b82a8
refine request headers
phuslu Aug 31, 2013
55ff22c
fix pac dir error issue
binyuj Sep 1, 2013
324ae2c
Merge pull request #147 from binyuj/patch-1
phuslu Sep 1, 2013
d8fbb5a
refine rangefetch
phuslu Sep 2, 2013
c3ed78f
add ablock-chinalist
phuslu Sep 7, 2013
e874eae
add tanx/alimama
phuslu Sep 8, 2013
8b1590e
add $image adblock rule support
phuslu Sep 8, 2013
01c33c3
add $script adblock rule support
phuslu Sep 8, 2013
65b9542
fix adblock bugs
phuslu Sep 12, 2013
1863fb0
upgrade to gevent 1.0rc3
phuslu Sep 15, 2013
f7d627a
Fixed, start_new_thread in stdlib "thread" takes no keyword arguments
polyrabbit Sep 17, 2013
a5493cf
Merge pull request #149 from polyrabbit/3.0
phuslu Sep 17, 2013
61a54ca
Fixed, start_new_thread in stdlib "thread" takes two positional argum…
polyrabbit Sep 20, 2013
0f6438a
Merge pull request #150 from polyrabbit/3.0
phuslu Sep 22, 2013
f4065b7
fix dicttype
phuslu Sep 23, 2013
f187f84
add cdnjs
phuslu Oct 1, 2013
aff4694
简化addto-startup.py 文件,使用plistlib简化PLIST文件写操作
Oct 3, 2013
e3d341e
简化from AppKit import blah...为from AppKit import *
Oct 3, 2013
a19791b
Merge pull request #152 from oxnz/3.0
phuslu Oct 7, 2013
dd46b77
update goagent.exe
phuslu Oct 11, 2013
24cff86
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
phuslu Oct 11, 2013
1a46f53
Update proxy.py so that it runs on CYGWIN
ShusenLiu Oct 14, 2013
624aeb9
Merge pull request #159 from ShusenLiu/patch-1
phuslu Oct 14, 2013
bbf317e
fix broken scripts
hewigovens Oct 15, 2013
87041a4
hide ADs like test.gif?xxx
phuslu Oct 21, 2013
38af21f
bugfix for goagent.exe
phuslu Oct 21, 2013
6661160
update goagent.exe
phuslu Oct 24, 2013
9dded9f
update goagent.exe
phuslu Oct 25, 2013
772bc72
speedup pyOpenSSL handshake.
phuslu Oct 27, 2013
6be1f44
use python ssl to handshake
phuslu Oct 27, 2013
4e1c04e
add pycrypto to python27.zip
phuslu Oct 28, 2013
155f075
refine OpenSSL Connection
phuslu Oct 29, 2013
cf47841
use SSL_CTX_ctrl to speedup openssl handshake
phuslu Oct 29, 2013
2905764
set_session_id to openssl context
phuslu Oct 30, 2013
cca769b
Update proxy.ini
phuslu Nov 1, 2013
881cd53
update proxy.ini
phuslu Nov 1, 2013
9fd2575
fix youtube
phuslu Nov 2, 2013
bda96ec
fix youtube live
phuslu Nov 3, 2013
9dbe772
use [google_hk]hosts for youtube/watch
phuslu Nov 3, 2013
246b403
fix youtube embed video
phuslu Nov 3, 2013
74e7343
Update proxy.ini
phuslu Nov 4, 2013
3d8ff7d
add rc4 crypt
phuslu Nov 4, 2013
02d3d2a
prestart check
phuslu Nov 4, 2013
98c2ec9
buffering http response
phuslu Nov 4, 2013
0369625
refine crlf injection
phuslu Nov 4, 2013
9b68253
add rc4 crypt
phuslu Nov 5, 2013
f4b3ee4
small bugfix.
phuslu Nov 5, 2013
03d1b13
streaming rc4 fileobj
phuslu Nov 5, 2013
0663b54
Update proxy.py
phuslu Nov 5, 2013
f333142
Update proxy.py
phuslu Nov 5, 2013
1fb4ff9
add rc4 crypt
phuslu Nov 5, 2013
9ad6300
Update proxy.ini
phuslu Nov 5, 2013
58ef5b3
Update proxy.ini
phuslu Nov 5, 2013
e1ba518
bump version 3.0.6
phuslu Nov 5, 2013
09658f9
rc4 new function
phuslu Nov 6, 2013
9bbbac1
range fetch
phuslu Nov 6, 2013
2bf4bb5
add: A useful shell for unix-like system to control the client.
ysmood Nov 6, 2013
276cf84
Update proxy.ini
phuslu Nov 7, 2013
864802d
Update proxy.ini
phuslu Nov 7, 2013
f0f4fcf
bugfix
phuslu Nov 7, 2013
95eabbb
update dns config
phuslu Nov 7, 2013
62a6d1c
force do remote dns resolve
phuslu Nov 7, 2013
dbcae53
Update proxy.ini
phuslu Nov 7, 2013
52684c0
Merge pull request #169 from ysmood/linux_shell
phuslu Nov 8, 2013
3025ff2
reconfigure proxy.ini
phuslu Nov 9, 2013
68b1329
stop __fetchlet retry when self.__stopped==True
phuslu Nov 9, 2013
ea42757
refine rc4 crypt
phuslu Nov 9, 2013
cc415f9
refine crlf
phuslu Nov 9, 2013
952f7f2
update proxy.py
phuslu Nov 10, 2013
5e7e494
refine proxy.sh
phuslu Nov 10, 2013
b4855c3
Update wsgi.py
phuslu Nov 10, 2013
5f110de
bump version to 3.0.7
phuslu Nov 10, 2013
606f4ac
Update proxy.ini
phuslu Nov 10, 2013
cecda45
update proxy.ini
phuslu Nov 10, 2013
aeea0a0
Update proxy.ini
phuslu Nov 10, 2013
0d5aeed
hybird mode
phuslu Nov 10, 2013
6fad435
Update proxy.ini
phuslu Nov 10, 2013
bd47128
refine hybird mode
phuslu Nov 11, 2013
52dd563
Merge branch '3.0.x' of https://github.com/goagent/goagent into 3.0.x
phuslu Nov 11, 2013
b5fda42
remove ipaddr from GAE_HOSTS when 403
phuslu Nov 11, 2013
fac479a
Update proxy.ini
phuslu Nov 11, 2013
90bbee9
Update proxy.py
phuslu Nov 12, 2013
69967c3
fix cpu 100% issue and certificate validation.
phuslu Nov 14, 2013
77e1ec0
refine logging level
phuslu Nov 14, 2013
94813c1
Update proxy.ini
phuslu Nov 15, 2013
b48a2f4
merge openssl dllfiles to python27.zip
phuslu Nov 15, 2013
b2ee09a
improve performance
phuslu Nov 15, 2013
be72e59
fix ImportError
cs0x7f Nov 15, 2013
5338dfd
fix line 449 TypeError
v3aqb Nov 15, 2013
d37a891
Merge pull request #173 from ChenShuang/fix-bugs
phuslu Nov 16, 2013
91f8377
Update proxy.sh
phuslu Nov 16, 2013
debfca9
Merge pull request #174 from v3aqb/patch-1
phuslu Nov 16, 2013
f97296d
refine connection window for hybird mode
phuslu Nov 16, 2013
e80cb5e
Update proxy.ini
phuslu Nov 16, 2013
d9a88d0
-
cs0x7f Nov 16, 2013
67cd0ff
Merge pull request #175 from ChenShuang/fix-bugs
phuslu Nov 16, 2013
8e35ab5
fix certdir error issue
cnfuyu Nov 17, 2013
8349a79
fix typo
cnfuyu Nov 17, 2013
962aa48
bugfix for adblock
phuslu Nov 19, 2013
7c20019
fix appspot.com
phuslu Nov 19, 2013
a2860f1
update to lastest proxy.pac
phuslu Nov 19, 2013
5bfb219
fixed char encoding on mac os.
cuixin Nov 19, 2013
399235b
Merge pull request #178 from cuixin/3.0
phuslu Nov 19, 2013
2c02a82
Update proxy.ini
phuslu Nov 19, 2013
084d300
rewrite rc4
cs0x7f Nov 20, 2013
953d626
Merge pull request #179 from ChenShuang/fix-bugs
phuslu Nov 20, 2013
e5ca504
Merge pull request #177 from cnfuyu/3.0
phuslu Nov 20, 2013
e71b0ed
disable adblock when [pac]adblock is deleted.
phuslu Nov 20, 2013
13050df
typo
phuslu Nov 20, 2013
1e502d7
cache connected socket
phuslu Nov 21, 2013
02f893e
only cache first socket.
phuslu Nov 21, 2013
e76ff46
kick off 3.0.9
phuslu Nov 21, 2013
0cbae1d
add googlevideo.com to proxy.pac
phuslu Nov 22, 2013
7085624
refine socket cache
phuslu Nov 22, 2013
fa671e8
refine socket cache
phuslu Nov 22, 2013
86d9215
rename address to ipaddr
phuslu Nov 25, 2013
86f30b3
record connection time for each ssl socket
phuslu Nov 25, 2013
a846068
refine goagent-osx tray icon
phuslu Nov 26, 2013
6cf0c87
define __content_type__
phuslu Nov 26, 2013
b751906
improve remote resolve stage
phuslu Nov 26, 2013
97d7b67
refine google remote resolve
phuslu Nov 26, 2013
4c7528f
upgrade to gevent 1.0 final
phuslu Nov 27, 2013
f48d207
upgrade to python 2.7.6
phuslu Nov 27, 2013
6c79688
refine proxy.ini
phuslu Nov 27, 2013
b95c034
add get_process_list function.
phuslu Nov 28, 2013
e93df0d
fix appid pattern.
cs0x7f Nov 28, 2013
26fe744
Merge pull request #184 from ChenShuang/fix-bugs
phuslu Nov 28, 2013
417ebdf
delay RangeFetch thread, prioritize expect_begin, rx speed
harmonymeow Nov 28, 2013
eab5290
add appengine.google.com to [google_hk]hosts
wwqgtxx Dec 1, 2013
ddf4835
add .webp to no autorange
wwqgtxx Dec 1, 2013
ad9ba5f
fix typo
binyuj Dec 1, 2013
aefee94
Merge pull request #185 from harmonymeow/ThreadDelay
phuslu Dec 1, 2013
ad39240
init t0=time.time() in __fetchlet
phuslu Dec 1, 2013
a60de71
Merge pull request #186 from wwqgtxx/patch-4
phuslu Dec 1, 2013
9c2ee68
Merge pull request #187 from wwqgtxx/patch-5
phuslu Dec 1, 2013
c4a087a
Merge pull request #188 from binyuj/patch-2
phuslu Dec 1, 2013
38beec6
bugfix for autoproxy2pac
phuslu Dec 2, 2013
7c27881
switch GEVENT_RESOLVER=ares
phuslu Dec 2, 2013
5c90186
bump gevent version
phuslu Dec 2, 2013
f647513
revert goagent-osx.command icon
phuslu Dec 2, 2013
1246c9c
update goagent
phuslu Dec 2, 2013
7333428
bump version 3.0.9
phuslu Dec 4, 2013
ca85fb9
add google+ to hosts
phuslu Dec 6, 2013
8147999
remove google translate api
phuslu Dec 6, 2013
ba1b046
bugfix for tcp socket cache
phuslu Dec 6, 2013
5f2fd06
refine appspot socket cache
phuslu Dec 6, 2013
e9ccaa9
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
phuslu Dec 6, 2013
ef080e7
add developers.google.com to google_hk
phuslu Dec 6, 2013
25b8b79
switch to google_hk
phuslu Dec 6, 2013
69ba91e
refine proxy.ini format
phuslu Dec 6, 2013
216aa0d
rename *.cer to *.crt
phuslu Dec 10, 2013
300551b
add ipv6 profile support
phuslu Dec 10, 2013
1ac36df
add www.google.com/searchbyimage
phuslu Dec 10, 2013
1d0f31e
refine proxy.py
phuslu Dec 10, 2013
bb88355
refine proxy.py
phuslu Dec 10, 2013
5a2c28a
refine proxy.py
phuslu Dec 10, 2013
c5e0e11
remove www.google.com from fakehttps
phuslu Dec 11, 2013
e5b6992
add profile = ipv4
phuslu Dec 11, 2013
e59fd33
add google-analytics.com = google_cn
phuslu Dec 11, 2013
b18ff51
refine adblock
phuslu Dec 11, 2013
5617d36
add lh[0-9].googleusercontent.com to fakehttps
phuslu Dec 11, 2013
c2a8a24
add www.google.com to forcehttps
phuslu Dec 11, 2013
456d99d
refine proxy.ini
phuslu Dec 11, 2013
8c55403
bugfix for expand_google_iplist
phuslu Dec 11, 2013
d328e38
switch to google_tw
phuslu Dec 11, 2013
47f0a9a
comment google_hk and youtube.com
phuslu Dec 12, 2013
d44a166
Update proxy.py
cicku Dec 12, 2013
0c77640
Cleanup unused variable
cicku Dec 12, 2013
22c06da
Merge pull request #191 from cicku/patch-1
phuslu Dec 12, 2013
5f75edc
Beautify again
cicku Dec 12, 2013
b69740c
Beautify again
cicku Dec 12, 2013
45169ea
Merge pull request #192 from cicku/patch-1
phuslu Dec 12, 2013
8a9483a
refine google_tw iplist
phuslu Dec 12, 2013
e5456ee
switch to google_hk
phuslu Dec 12, 2013
aad3e3f
comment google_tw iplist
phuslu Dec 12, 2013
1970cec
refine expand_google_hk_iplist
phuslu Dec 12, 2013
8345e29
smaller python27.zip
phuslu Dec 12, 2013
d7ea2e7
refine rangefetch
phuslu Dec 12, 2013
17d46da
bugfix for expand iplist
phuslu Dec 13, 2013
dcfe742
refine index.php
phuslu Dec 13, 2013
d992c9e
add sourcegraph badges
hewigovens Dec 13, 2013
54ac27e
explicit markdown
hewigovens Dec 13, 2013
a50b2b7
add badge
hewigovens Dec 13, 2013
8e286f2
Cleanup my info
cicku Dec 13, 2013
cdf1186
Merge pull request #194 from cicku/patch-3
phuslu Dec 13, 2013
317d5e8
add xor cipher class to index.php
phuslu Dec 13, 2013
5b04a1b
bugfix xor cipher for index.php
phuslu Dec 13, 2013
ab3a1f3
Update README.md
phuslu Dec 13, 2013
cc6224f
refine xor cipher for paas
phuslu Dec 14, 2013
eace2cb
fix load cacert error
phuslu Dec 14, 2013
05729cb
clean up wsgi.py
phuslu Dec 14, 2013
50717b9
rename paas to php
phuslu Dec 14, 2013
040478d
refine paas
phuslu Dec 14, 2013
673dc06
默认python环境为python3时依然使用python2启动脚本
s2marine Dec 16, 2013
b317996
visible参数优先从proxy.user.ini读取
s2marine Dec 16, 2013
aa32013
Merge pull request #195 from s2marine/3.0
phuslu Dec 16, 2013
17a40e7
add googleusercontent
phuslu Dec 16, 2013
8d67baa
Do not use RangeFetch for 'HEAD'
harmonymeow Dec 16, 2013
a3608fc
Merge pull request #196 from harmonymeow/no-head
phuslu Dec 17, 2013
d7471c3
dont cache socket when do_CONNECT_FWD
phuslu Dec 17, 2013
c2941b6
cache socket according ssl connection time
phuslu Dec 17, 2013
07cee00
bump version to 3.1.1
phuslu Dec 17, 2013
2d217ee
fix Issue 11957
phuslu Dec 17, 2013
75a01ea
fix issue 11964
phuslu Dec 17, 2013
d2d1ce2
dont encrypt audio/image/video in response
phuslu Dec 17, 2013
e8ab8b3
fix php
phuslu Dec 17, 2013
e290df7
fix issue 11970
phuslu Dec 17, 2013
8fd0712
fix php 204/304 bug
phuslu Dec 17, 2013
64f7b07
refine php
phuslu Dec 18, 2013
ff21c84
rename fetch.php to index.php
phuslu Dec 18, 2013
dd6c2fa
bugfix for php
phuslu Dec 18, 2013
ce0f653
start working out for paas
phuslu Dec 18, 2013
4d0db5b
bugfix for php
phuslu Dec 18, 2013
5fd6c10
import wsgi
phuslu Dec 18, 2013
d77e528
refine certificate match
phuslu Dec 19, 2013
f7c8fa8
refine certificate match
phuslu Dec 19, 2013
04228a8
refine swithy options
phuslu Dec 19, 2013
cad561f
remove www.google.com from forcehttps
phuslu Dec 19, 2013
2f6b3ad
bugfix for forcehttps
phuslu Dec 19, 2013
288d867
refine proxy.ini
phuslu Dec 20, 2013
0acff0f
Update README.md
phuslu Dec 20, 2013
9456181
refine proxy.ini
phuslu Dec 20, 2013
bb94544
refine proxy.py
phuslu Dec 20, 2013
6de6e73
add default password to index.php
phuslu Dec 20, 2013
db3024a
refine start time for rangefetch threads.
phuslu Dec 20, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refine appspot socket cache
phuslu committed Dec 6, 2013
commit 5f2fd06c6d2f5730ba379a942ffbc24e964f7dfa
8 changes: 2 additions & 6 deletions local/proxy.py
Original file line number Diff line number Diff line change
@@ -1603,12 +1603,8 @@ def gae_urlfetch(method, url, headers, payload, fetchserver, **kwargs):
payload = rc4crypt(payload, kwargs.get('password'))
request_headers['Content-Length'] = str(len(payload))
# post data
if common.GAE_MODE == 'https':
need_crlf = 0
connection_cache_key = '*.appspot.com:443'
else:
need_crlf = 1
connection_cache_key = '*.appspot.com:80'
need_crlf = 0 if common.GAE_MODE == 'https' else 1
connection_cache_key = '%s:%d' % ('*.appspot.com' if common.GAE_PROFILE == 'google_cn' else '*.google.com', 443 if common.GAE_MODE == 'https' else 80)
response = http_util.request(request_method, fetchserver, payload, request_headers, crlf=need_crlf, connection_cache_key=connection_cache_key)
response.app_status = response.status
response.app_options = response.getheader('X-GOA-Options', '')