Merge branch 'master' into patch-1

This commit is contained in:
Mashiro 2019-09-14 21:38:00 +08:00 committed by GitHub
commit 29eebec8a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 11 deletions

View File

@ -318,10 +318,10 @@ http {
rewrite ^/(.*)$ https://www.recaptcha.net/$1 redirect;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
}
#error_page 500 502 503 504 /50x.html;
#/location = /50x.html {
# root html;
#}
}
}

11
hosts
View File

@ -19,7 +19,6 @@
127.0.0.1 imgaz.pixiv.net
127.0.0.1 sensei.pixiv.net
127.0.0.1 fanbox.pixiv.net
127.0.0.1 i.pximg.net
127.0.0.1 source.pixiv.net
127.0.0.1 i1.pixiv.net
127.0.0.1 i2.pixiv.net
@ -70,11 +69,11 @@
127.0.0.1 hlsc5.pixivsketch.net
127.0.0.1 hlsc6.pixivsketch.net
127.0.0.1 hlst1.pixivsketch.net
210.129.120.50 app-api.pixiv.net
74.120.148.207 g-client-proxy.pixiv.net
210.140.131.159 d.pixiv.org
210.140.92.135 pixiv.pximg.net
210.140.92.134 s.pximg.net
#210.129.120.50 app-api.pixiv.net
#74.120.148.207 g-client-proxy.pixiv.net
#210.140.131.159 d.pixiv.org
#210.140.92.135 pixiv.pximg.net
#210.140.92.134 s.pximg.net
#Pixiv End
# 顺手修一下维基百科

View File

@ -1 +1 @@
9152
11124