Update README.md

Update LICENSE
Update README.md
2023-03-15 01:05:45 +08:00 · 2023-03-13 21:46:09 +08:00 · 2021-10-23 23:06:11 +08:00 · 2021-10-23 22:59:56 +08:00 · 2021-10-23 22:36:59 +08:00 · 2021-10-21 13:45:22 +08:00
40 changed files with 2227 additions and 702 deletions
--- a/5.调试工具（这个功能全）.bat
+++ b/5.调试工具（这个功能全）.bat
@ -1,165 +1,165 @@
-
-@echo off
-rem 提供Windows下nginx的启动，重启，关闭功能
- 
-echo ==================begin========================
- 
-cls 
-::ngxin 所在的盘符
-set NGINX_PATH=%~d0
- 
-::nginx 所在目录
-set NGINX_DIR=%~dp0
-::color 0a 
-TITLE Nginx 管理脚本 v1.0
- 
-CLS 
- 
-echo. 
-echo. *************************** 
-echo. *************************** 
-echo. *** Nginx 管理脚本 v1.0 *** 
-echo. ***       Mashiro       *** 
-echo. ***  https://2heng.xin  *** 
-echo. ***************************
-echo. *************************** 
-echo. 
- 
-:MENU 
- 
-echo. ***** nginx 进程list ****** 
-::tasklist|findstr /i "nginx.exe"
-tasklist /fi "imagename eq nginx.exe"
- 
-echo. 
- 
-    if ERRORLEVEL 1 (
-        echo nginx.exe不存在
-    ) else (
-        echo nginx.exe存在
-    )
- 
-echo. 
-::*************************************************************************************************************
-echo. 
-	echo.  [1] 启动Nginx  
-	echo.  [2] 关闭Nginx  
-	echo.  [3] 重启Nginx 
-	echo.  [4] 刷新控制台  
-	echo.  [5] 重新加载Nginx配置文件
-	echo.  [6] 检查测试nginx配置文件
-	echo.  [7] 查看nginx version
-	echo.  [0] 退 出 
-echo. 
- 
-echo.请输入选择的序号:
-set /p ID=
-	IF "%id%"=="1" GOTO start 
-	IF "%id%"=="2" GOTO stop 
-	IF "%id%"=="3" GOTO restart 
-	IF "%id%"=="4" GOTO MENU
-	IF "%id%"=="5" GOTO reloadConf 
-	IF "%id%"=="6" GOTO checkConf 
-	IF "%id%"=="7" GOTO showVersion 
-	IF "%id%"=="0" EXIT
-PAUSE 
- 
-::*************************************************************************************************************
-::启动
-:start 
-	call :startNginx
-	GOTO MENU
- 
-::停止
-:stop 
-	call :shutdownNginx
-	GOTO MENU
- 
-::重启
-:restart 
-	call :shutdownNginx
-	call :startNginx
-	GOTO MENU
- 
-::检查测试配置文件
-:checkConf 
-	call :checkConfNginx
-	GOTO MENU
- 
-::重新加载Nginx配置文件
-:reloadConf 
-    call :checkConfNginx
-	call :reloadConfNginx
-	GOTO MENU
-	
-::显示nginx版本
-:showVersion 
-    call :showVersionNginx
-	GOTO MENU	
-	
-	
-::*************************************************************************************
-::底层
-::*************************************************************************************
-:shutdownNginx
-	echo. 
-	echo.关闭Nginx...... 
-	taskkill /F /IM nginx.exe > nul
-	echo.OK,关闭所有nginx 进程
-	goto :eof
- 
-:startNginx
-	echo. 
-	echo.启动Nginx...... 
-	IF NOT EXIST "%NGINX_DIR%nginx.exe" (
-        echo "%NGINX_DIR%nginx.exe"不存在
-        goto :eof
-     )
- 
-	%NGINX_PATH% 
-	cd "%NGINX_DIR%" 
- 
-	IF EXIST "%NGINX_DIR%nginx.exe" (
-		echo "start '' nginx.exe"
-		start "" nginx.exe
-	)
-	echo.OK
-	goto :eof
-	
- 
-:checkConfNginx
-	echo. 
-	echo.检查测试 nginx 配置文件...... 
-	IF NOT EXIST "%NGINX_DIR%nginx.exe" (
-        echo "%NGINX_DIR%nginx.exe"不存在
-        goto :eof
-     )
- 
-	%NGINX_PATH% 
-	cd "%NGINX_DIR%" 
-	nginx -t -c conf/nginx.conf
- 
-	goto :eof
-	
-::重新加载 nginx 配置文件
-:reloadConfNginx
-	echo. 
-	echo.重新加载 nginx 配置文件...... 
-	IF NOT EXIST "%NGINX_DIR%nginx.exe" (
-        echo "%NGINX_DIR%nginx.exe"不存在
-        goto :eof
-     )
- 
-	%NGINX_PATH% 
-	cd "%NGINX_DIR%" 
-	nginx -s reload
- 
-	goto :eof
-	
-::显示nginx版本
-:showVersionNginx
-	echo. 
-	%NGINX_PATH% 
-	cd "%NGINX_DIR%" 
-	nginx -V
+
+@echo off
+rem 提供Windows下nginx的启动，重启，关闭功能
+ 
+echo ==================begin========================
+ 
+cls 
+::ngxin 所在的盘符
+set NGINX_PATH=%~d0
+ 
+::nginx 所在目录
+set NGINX_DIR=%~dp0
+::color 0a 
+TITLE Nginx 管理脚本 v1.0
+ 
+CLS 
+ 
+echo. 
+echo. *************************** 
+echo. *************************** 
+echo. *** Nginx 管理脚本 v1.0 *** 
+echo. ***       Mashiro       *** 
+echo. ***  https://2heng.xin  *** 
+echo. ***************************
+echo. *************************** 
+echo. 
+ 
+:MENU 
+ 
+echo. ***** nginx 进程list ****** 
+::tasklist|findstr /i "nginx.exe"
+tasklist /fi "imagename eq nginx.exe"
+ 
+echo. 
+ 
+    if ERRORLEVEL 1 (
+        echo nginx.exe不存在
+    ) else (
+        echo nginx.exe存在
+    )
+ 
+echo. 
+::*************************************************************************************************************
+echo. 
+	echo.  [1] 启动Nginx  
+	echo.  [2] 关闭Nginx  
+	echo.  [3] 重启Nginx 
+	echo.  [4] 刷新控制台  
+	echo.  [5] 重新加载Nginx配置文件
+	echo.  [6] 检查测试nginx配置文件
+	echo.  [7] 查看nginx version
+	echo.  [0] 退 出 
+echo. 
+ 
+echo.请输入选择的序号:
+set /p ID=
+	IF "%id%"=="1" GOTO start 
+	IF "%id%"=="2" GOTO stop 
+	IF "%id%"=="3" GOTO restart 
+	IF "%id%"=="4" GOTO MENU
+	IF "%id%"=="5" GOTO reloadConf 
+	IF "%id%"=="6" GOTO checkConf 
+	IF "%id%"=="7" GOTO showVersion 
+	IF "%id%"=="0" EXIT
+PAUSE 
+ 
+::*************************************************************************************************************
+::启动
+:start 
+	call :startNginx
+	GOTO MENU
+ 
+::停止
+:stop 
+	call :shutdownNginx
+	GOTO MENU
+ 
+::重启
+:restart 
+	call :shutdownNginx
+	call :startNginx
+	GOTO MENU
+ 
+::检查测试配置文件
+:checkConf 
+	call :checkConfNginx
+	GOTO MENU
+ 
+::重新加载Nginx配置文件
+:reloadConf 
+    call :checkConfNginx
+	call :reloadConfNginx
+	GOTO MENU
+	
+::显示nginx版本
+:showVersion 
+    call :showVersionNginx
+	GOTO MENU	
+	
+	
+::*************************************************************************************
+::底层
+::*************************************************************************************
+:shutdownNginx
+	echo. 
+	echo.关闭Nginx...... 
+	taskkill /F /IM nginx.exe > nul
+	echo.OK,关闭所有nginx 进程
+	goto :eof
+ 
+:startNginx
+	echo. 
+	echo.启动Nginx...... 
+	IF NOT EXIST "%NGINX_DIR%nginx.exe" (
+        echo "%NGINX_DIR%nginx.exe"不存在
+        goto :eof
+     )
+ 
+	%NGINX_PATH% 
+	cd "%NGINX_DIR%" 
+ 
+	IF EXIST "%NGINX_DIR%nginx.exe" (
+		echo "start '' nginx.exe"
+		start "" nginx.exe
+	)
+	echo.OK
+	goto :eof
+	
+ 
+:checkConfNginx
+	echo. 
+	echo.检查测试 nginx 配置文件...... 
+	IF NOT EXIST "%NGINX_DIR%nginx.exe" (
+        echo "%NGINX_DIR%nginx.exe"不存在
+        goto :eof
+     )
+ 
+	%NGINX_PATH% 
+	cd "%NGINX_DIR%" 
+	nginx -t -c conf/nginx.conf
+ 
+	goto :eof
+	
+::重新加载 nginx 配置文件
+:reloadConfNginx
+	echo. 
+	echo.重新加载 nginx 配置文件...... 
+	IF NOT EXIST "%NGINX_DIR%nginx.exe" (
+        echo "%NGINX_DIR%nginx.exe"不存在
+        goto :eof
+     )
+ 
+	%NGINX_PATH% 
+	cd "%NGINX_DIR%" 
+	nginx -s reload
+ 
+	goto :eof
+	
+::显示nginx版本
+:showVersionNginx
+	echo. 
+	%NGINX_PATH% 
+	cd "%NGINX_DIR%" 
+	nginx -V
 	goto :eof
--- a/6.安全及隐私声明.txt
+++ b/6.安全及隐私声明.txt
@ -0,0 +1,50 @@
+1、SSL 证书相关提醒及声明：
+需要安装的 CA 证书是自签名证书，作者本人可以保证 CA 证书的
+私钥不会泄露给任何人，本人也保证不会将此 CA 证书用于此项目
+以外的任何地方（如果你在其他地方看到了 Mashiro Internet 
+Fake Authority CA 签发的证书，你可以顺着网线过来打我）。
+
+但是网页的证书及私钥（pixiv.net.crt、pixiv.net.key）是必
+须开源放在这里的，该证书里面包括了下列的网站，除了localhost
+（127.0.0.1），请不要将hosts中的下列域名指向其他任何你不信
+任的IP，否则有可能遭遇中间人攻击（http://t.cn/A67reYAS）。
+
+域名列表：
+DNS.1   = *.pixiv.net
+DNS.2   = pixiv.net
+DNS.3   = *.secure.pixiv.net
+DNS.4   = pixivision.net
+DNS.5   = *.pixivision.net
+DNS.6   = pixiv.me
+DNS.7   = *.pixiv.me
+DNS.8   = pximg.net
+DNS.9   = *.pximg.net
+DNS.10  = pixivsketch.net
+DNS.11  = *.pixivsketch.net
+DNS.12  = public-api.secure.pixiv.net
+DNS.13  = wikipedia.org
+DNS.14  = *.wikipedia.org
+DNS.15  = m.wikipedia.org
+DNS.16  = *.m.wikipedia.org
+DNS.17  = google.com
+DNS.18  = *.google.com
+DNS.19  = steamcommunity.com
+DNS.20  = *.steamcommunity.com
+DNS.21  = steampowered.com
+DNS.22  = *.steampowered.com
+DNS.23  = archiveofourown.org
+DNS.24  = *.archiveofourown.org
+
+虽然我认为以上的网站没有中间人攻击的价值，但是，如果还是不
+放心，并且自己有能力，可以选择自己签发证书，只要不泄露自己
+的私钥，你的数据100%安全。
+
+自签证书的教程见： 
+https://2heng.xin/2018/12/16/your-own-ca-with-openssl/
+自签证书后，需要替换项目中对应的公私钥文件： 
+https://github.com/mashirozx/Pixiv-Nginx/tree/master/conf/ca
+
+2、日志上传注意事项：
+logs 文件夹内为服务器日志文件。access.log 为工作日志，里
+面可能留下你的访问记录；error.log 为 Nginx 错误日志。通
+常提供错误日志即可；分享工作日志的时候注意保护隐私。
--- a/6.日志上传注意事项.txt
+++ b/6.日志上传注意事项.txt
@ -1,3 +0,0 @@
-logs 文件夹内为服务器日志文件。access.log 为工作日志，里面可能留下你的访问记录；error.log 为 Nginx 错误日志。
-
-通常提供错误日志即可；分享工作日志的时候注意保护隐私。
--- a/7.更多信息及更新.html
+++ b/7.更多信息及更新.html
@ -1,7 +1,7 @@
 <center>
-<h1>使用说明及后续维护情况请访问<br><a href="https://2heng.xin/2017/09/19/pixiv/">https://2heng.xin/2017/09/19/pixiv/</a></h1>
+<h1>使用说明及后续维护情况请访问<br><a href="https://2heng.xin/2017/09/19/pixiv/">https://2heng.xin/2017/09/19/pixiv/</a></h1>
 <br><br><br>
 <big>by Mashiro</big>
 <hr>
-<p><i>打包时间：2018/9/17</i></p>
+<p><i>打包时间：2019/6/27</i></p>
 </center>
--- a/27
+++ b/27
@ -1,21 +1,14 @@
-MIT License
+           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                   Version 2, December 2004

-Copyright (c) 2018 Mashiro
+Copyright (C) 2018 Mashiro
+Copyright (C) 2023 Mashiro <moezhx@outlook.com>

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Everyone is permitted to copy and distribute verbatim or modified
+copies of this license document, and changing it is allowed as long
+as the name is changed.

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
--- a/README.md
+++ b/README.md
@ -3,22 +3,22 @@
 [![GitHub release](https://img.shields.io/github/release/mashirozx/Pixiv-Nginx.svg?style=flat-square)](https://github.com/mashirozx/Pixiv-Nginx/releases/latest)
 [![Github commits (since latest release)](https://img.shields.io/github/commits-since/mashirozx/Pixiv-Nginx/latest.svg?style=flat-square)](https://github.com/mashirozx/Pixiv-Nginx/commits/)

-请在[此处](https://github.com/mashirozx/Pixiv-Nginx/releases)下载最新版`Source code
-(zip)`；或者在此页点击下图所示的按键下载。
-![](https://view.moezx.cc/images/2018/09/17/git.png)
-
 使用说明见 <https://2heng.xin/2017/09/19/pixiv/>

-### 要饭
+在本页点击下图所示的按键下载以获取最新版。

-微信支付：  
-<img src="https://view.moezx.cc/images/2018/05/28/WeChanQR.png" width="200"/>
+<img src="https://view.moezx.cc/images/2018/09/17/git.png" width="360" alt="下载方法" />

-支付宝：  
-<img src="https://view.moezx.cc/images/2018/05/28/AliPayQR.jpg" width="200"/>
+如遇本页下载速度过慢，可尝试通过镜像下载：

-PayPal：
-<https://paypal.me/mashirozx>
+|[👉 镜像1](https://git.mashiro.top/mirrors/Pixiv-Nginx) |[👉 镜像2](https://git.moezx.cc/mirrors/Pixiv-Nginx)|
+|---|---|
+|<img src="https://view.moezx.cc/images/2023/03/15/ed9589b16436258a529172fbaa052b60.png" width="360" alt="镜像1下载方法" /> | <img src="https://view.moezx.cc/images/2021/10/23/c5a92987653ea0c6921b1a461401cfec.png" width="360" alt="镜像2下载方法" />|

-### Lisence
-This is a fork of [nginx/nginx](https://github.com/nginx/nginx), so you should always follow its [2-clause BSD-like license](http://nginx.org/LICENSE).
+### LICENSE
+
+<a href="http://www.wtfpl.net/"><img src="https://ngx.moezx.cc/share/svg/brands/WTFPL_badge.svg" width="80" alt="WTFPL" /></a>
+
+This is a fork of [nginx/nginx](https://github.com/nginx/nginx), so you should always follow its [2-clause BSD-like license](http://nginx.org/LICENSE).
+
+The visualized management tool is part of [wnmp/wnmp](https://github.com/wnmp/wnmp), which is under [GPL-3.0](https://github.com/wnmp/wnmp/blob/master/LICENSE).
--- a/ca.cer
+++ b/ca.cer
--- a/conf/ca/ca.cer
+++ b/conf/ca/ca.cer
--- a/conf/ca/pixiv.net.crt
+++ b/conf/ca/pixiv.net.crt
@ -1,71 +1,93 @@
 Certificate:
    Data:
        Version: 3 (0x2)
-        Serial Number: 5 (0x5)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=CN, ST=Shanghai, L=Shanghai, O=Mashiro LLC, OU=Mashiro, CN=Mashiro Internet Authority CA
+        Serial Number: 17 (0x11)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=CN, ST=Shanghai, L=Shanghai, O=Mashiro LLC, CN=Mashiro Internet Fake Authority CA
        Validity
-            Not Before: Sep 16 16:57:32 2018 GMT
-            Not After : Sep 13 16:57:32 2028 GMT
-        Subject: C=CN, ST=Shanghai, O=Mashiro LLC, OU=Mashiro, CN=*.pixiv.net
+            Not Before: Oct 16 17:18:43 2020 GMT
+            Not After : Oct 14 17:18:43 2030 GMT
+        Subject: C=CN, ST=Shanghai, O=Mashiro LLC, CN=SNI\xE4\xBB\xA3\xE7\x90\x86\xE9\x80\x9A\xE7\x94\xA8\xE8\xAF\x81\xE4\xB9\xA6\xEF\xBC\x88https://2heng.xin/2017/09/19/pixiv/\xEF\xBC\x89
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                Modulus:
-                    00:a9:84:77:44:2f:77:cf:5a:de:59:4c:ce:15:c1:
-                    bc:db:6d:43:1e:6f:f2:2e:46:f5:a4:74:bc:f6:92:
-                    60:77:b2:cd:79:bf:d7:65:2b:54:78:48:6d:ab:2f:
-                    6b:f8:63:c1:69:a1:1d:b2:b5:78:e4:2b:b7:ad:62:
-                    d6:14:aa:7a:24:97:72:d2:81:f7:e3:d7:b4:76:1f:
-                    94:de:74:5c:b0:b1:6c:31:21:2f:c4:3e:58:41:3b:
-                    ab:06:e5:8a:28:80:fd:c3:a1:b5:dc:db:c7:4f:62:
-                    bd:cc:ff:ee:b5:e9:21:5f:9b:88:20:ab:c3:36:f9:
-                    82:22:3c:88:6e:d9:69:cd:ad:c0:2b:5e:19:68:e7:
-                    ff:2a:64:90:24:32:07:ab:2c:67:a9:ab:2d:75:ef:
-                    85:26:df:37:67:c3:53:31:0e:9c:8c:58:aa:24:f3:
-                    e2:5f:2b:1c:fc:72:45:34:94:9b:b4:69:cb:ef:a3:
-                    6d:8f:f7:ab:4c:83:77:84:e8:ac:e6:b7:17:58:e8:
-                    c2:47:ce:08:35:32:9a:45:79:15:e4:f4:07:92:ee:
-                    79:64:cc:41:6b:5d:a4:4c:46:72:2f:5a:7a:66:38:
-                    df:3d:58:8f:02:79:4b:ea:0f:8b:0c:33:cc:41:79:
-                    0f:3c:16:91:0c:67:44:6d:42:7e:1c:cb:2f:d6:1f:
-                    6b:fb
+                    00:ce:00:18:cc:64:70:ac:59:b0:45:9e:c3:ee:9e:
+                    9b:b2:56:59:43:aa:b7:98:6b:bb:86:86:c9:bb:b6:
+                    ed:54:b8:56:de:ec:18:06:62:59:27:3b:d2:16:4a:
+                    8a:86:ad:40:2b:69:6a:dc:21:12:4b:ca:fd:85:a8:
+                    01:dd:ec:2a:20:a2:6e:b0:c2:a7:79:88:f9:f4:34:
+                    95:fb:85:bf:f0:c7:1d:57:29:f8:a5:62:e3:b6:9e:
+                    52:f7:42:2a:0c:5a:5c:6d:b4:30:51:4e:c1:40:57:
+                    c6:58:57:18:47:9c:59:9d:b7:38:bb:cc:0c:68:aa:
+                    6c:68:76:be:6f:84:83:12:ef:60:2d:11:61:d8:01:
+                    f0:09:85:8c:80:fa:f0:f6:23:95:c7:97:c1:86:53:
+                    97:b5:d5:dc:5b:a8:f8:22:49:0a:70:2d:92:77:17:
+                    41:fd:0e:ba:5b:a7:ce:8f:60:a1:fc:5a:a7:87:19:
+                    1f:12:f6:c8:b2:32:f4:a8:22:72:ec:97:cc:98:48:
+                    24:b3:4d:c4:83:7b:9e:1d:15:62:63:37:f5:b6:0c:
+                    4f:b5:97:33:87:1f:67:cd:0b:bb:71:7b:38:60:c5:
+                    4f:2f:ad:40:44:0a:8e:af:0c:6c:5a:f4:00:6d:94:
+                    a3:f3:ae:f2:eb:5e:14:68:0a:03:5b:c7:89:09:d0:
+                    f9:bd
                Exponent: 65537 (0x10001)
        X509v3 extensions:
-            X509v3 Basic Constraints: 
+            X509v3 Subject Key Identifier:
+                4C:B9:F4:49:C1:82:B5:1E:3A:81:63:FA:0C:15:78:A5:F7:4A:AF:FF
+            X509v3 Authority Key Identifier:
+                keyid:3F:6C:37:71:8F:74:1B:28:5A:0F:C2:29:C1:2B:05:7E:D1:24:D4:54
+
+            X509v3 Basic Constraints:
                CA:FALSE
-            X509v3 Subject Alternative Name: 
-                DNS:*.pixiv.net, DNS:pixiv.net, DNS:*.secure.pixiv.net, DNS:pximg.net, DNS:*.pximg.net, DNS:wikipedia.org, DNS:*.wikipedia.org, DNS:google.com, DNS:*.google.com, IP Address:127.0.0.1
-            X509v3 Subject Key Identifier: 
-                A7:E1:07:03:F4:8A:62:A6:32:C3:98:CC:C1:3E:37:33:56:22:DA:21
+            X509v3 Key Usage:
+                Digital Signature, Key Encipherment
+            X509v3 Subject Alternative Name:
+                DNS:*.pixiv.net, DNS:pixiv.net, DNS:*.secure.pixiv.net, DNS:pixivision.net, DNS:*.pixivision.net, DNS:pixiv.me, DNS:*.pixiv.me, DNS:pximg.net, DNS:*.pximg.net, DNS:pixivsketch.net, DNS:*.pixivsketch.net, DNS:public-api.secure.pixiv.net, DNS:wikipedia.org, DNS:*.wikipedia.org, DNS:m.wikipedia.org, DNS:*.m.wikipedia.org, DNS:google.com, DNS:*.google.com, DNS:steamcommunity.com, DNS:*.steamcommunity.com, DNS:steampowered.com, DNS:*.steampowered.com, DNS:archiveofourown.org, DNS:*.archiveofourown.org, DNS:wikimedia.org, DNS:*.wikimedia.org
    Signature Algorithm: sha256WithRSAEncryption
-         8d:e9:35:fa:68:71:c0:12:f5:d1:4c:2a:91:29:96:e5:7c:26:
-         1c:05:66:29:31:42:c1:9f:fb:2f:6c:2f:47:20:1d:dd:d2:c4:
-         7f:4d:df:a6:0b:91:13:bc:38:28:87:aa:a5:f5:6b:88:fb:04:
-         92:ad:d2:3f:82:70:5e:de:e5:bd:74:f2:86:c0:22:61:61:30:
-         e1:02:02:1d:89:6d:97:38:cb:0b:32:bb:37:32:08:7f:5e:ab:
-         15:79:93:e6:8f:d0:40:78:5b:b0:a2:b0:d2:e5:04:01:65:74:
-         bf:57:42:ea:9c:5b:93:c6:96:26:34:bc:f0:d7:46:6a:ad:7c:
-         2f:92
+         74:95:98:78:3d:2d:7b:24:ae:59:9c:9e:84:d1:77:e0:47:92:
+         81:28:27:98:e8:4d:b0:83:8d:f9:92:d2:59:2c:e4:be:9f:14:
+         4f:3e:e1:1e:49:d3:4a:b7:37:22:4c:45:cd:29:8d:5b:aa:fe:
+         cb:63:59:21:e0:0b:ea:69:0c:5b:92:09:e6:25:fe:1a:7e:2f:
+         a6:3c:a4:71:a7:11:5c:5c:8c:aa:31:ff:42:c3:be:3d:d2:df:
+         37:9e:47:35:f6:94:d1:af:0a:99:7a:39:07:25:86:7f:ae:bf:
+         2d:a8:a6:5f:98:84:54:01:1d:09:32:b0:21:2b:23:d7:81:13:
+         99:3d:5c:9b:ba:ce:7b:53:8d:2f:c2:39:a5:93:9b:fa:e2:31:
+         ce:77:5a:e2:38:a3:f0:95:9a:a7:6b:67:92:93:a4:63:a5:24:
+         63:88:21:e9:38:4d:a4:21:d2:a3:67:3c:70:9a:f3:df:f6:45:
+         26:b4:18:23:05:04:9f:2f:7e:fd:db:85:b5:e4:c0:71:c6:b4:
+         52:d4:dc:cd:91:1f:65:f1:d9:17:8c:d9:03:38:f5:7c:2a:e2:
+         3c:e1:43:66:5a:01:cb:5e:56:6b:e4:78:83:17:01:f1:b0:25:
+         b1:00:c5:37:81:83:94:9d:36:7a:3e:aa:81:23:2b:b1:90:b8:
+         ea:fe:eb:e2
 -----BEGIN CERTIFICATE-----
-MIIDnDCCAwWgAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCQ04x
-ETAPBgNVBAgMCFNoYW5naGFpMREwDwYDVQQHDAhTaGFuZ2hhaTEUMBIGA1UECgwL
-TWFzaGlybyBMTEMxEDAOBgNVBAsMB01hc2hpcm8xJjAkBgNVBAMMHU1hc2hpcm8g
-SW50ZXJuZXQgQXV0aG9yaXR5IENBMB4XDTE4MDkxNjE2NTczMloXDTI4MDkxMzE2
-NTczMlowXjELMAkGA1UEBhMCQ04xETAPBgNVBAgMCFNoYW5naGFpMRQwEgYDVQQK
-DAtNYXNoaXJvIExMQzEQMA4GA1UECwwHTWFzaGlybzEUMBIGA1UEAwwLKi5waXhp
-di5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCphHdEL3fPWt5Z
-TM4VwbzbbUMeb/IuRvWkdLz2kmB3ss15v9dlK1R4SG2rL2v4Y8FpoR2ytXjkK7et
-YtYUqnokl3LSgffj17R2H5TedFywsWwxIS/EPlhBO6sG5YoogP3DobXc28dPYr3M
-/+616SFfm4ggq8M2+YIiPIhu2WnNrcArXhlo5/8qZJAkMgerLGepqy1174Um3zdn
-w1MxDpyMWKok8+JfKxz8ckU0lJu0acvvo22P96tMg3eE6KzmtxdY6MJHzgg1MppF
-eRXk9AeS7nlkzEFrXaRMRnIvWnpmON89WI8CeUvqD4sMM8xBeQ88FpEMZ0RtQn4c
-yy/WH2v7AgMBAAGjgb8wgbwwCQYDVR0TBAIwADCBjwYDVR0RBIGHMIGEggsqLnBp
-eGl2Lm5ldIIJcGl4aXYubmV0ghIqLnNlY3VyZS5waXhpdi5uZXSCCXB4aW1nLm5l
-dIILKi5weGltZy5uZXSCDXdpa2lwZWRpYS5vcmeCDyoud2lraXBlZGlhLm9yZ4IK
-Z29vZ2xlLmNvbYIMKi5nb29nbGUuY29thwR/AAABMB0GA1UdDgQWBBSn4QcD9Ipi
-pjLDmMzBPjczViLaITANBgkqhkiG9w0BAQsFAAOBgQCN6TX6aHHAEvXRTCqRKZbl
-fCYcBWYpMULBn/svbC9HIB3d0sR/Td+mC5ETvDgoh6ql9WuI+wSSrdI/gnBe3uW9
-dPKGwCJhYTDhAgIdiW2XOMsLMrs3Mgh/XqsVeZPmj9BAeFuworDS5QQBZXS/V0Lq
-nFuTxpYmNLzw10ZqrXwvkg==
+MIIFljCCBH6gAwIBAgIBETANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJDTjER
+MA8GA1UECBMIU2hhbmdoYWkxETAPBgNVBAcTCFNoYW5naGFpMRQwEgYDVQQKEwtN
+YXNoaXJvIExMQzErMCkGA1UEAxMiTWFzaGlybyBJbnRlcm5ldCBGYWtlIEF1dGhv
+cml0eSBDQTAeFw0yMDEwMTYxNzE4NDNaFw0zMDEwMTQxNzE4NDNaMH8xCzAJBgNV
+BAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTEUMBIGA1UEChMLTWFzaGlybyBMTEMx
+RzBFBgNVBAMUPlNOSeS7o+eQhumAmueUqOivgeS5pu+8iGh0dHBzOi8vMmhlbmcu
+eGluLzIwMTcvMDkvMTkvcGl4aXYv77yJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAzgAYzGRwrFmwRZ7D7p6bslZZQ6q3mGu7hobJu7btVLhW3uwYBmJZ
+JzvSFkqKhq1AK2lq3CESS8r9hagB3ewqIKJusMKneYj59DSV+4W/8McdVyn4pWLj
+tp5S90IqDFpcbbQwUU7BQFfGWFcYR5xZnbc4u8wMaKpsaHa+b4SDEu9gLRFh2AHw
+CYWMgPrw9iOVx5fBhlOXtdXcW6j4IkkKcC2SdxdB/Q66W6fOj2Ch/FqnhxkfEvbI
+sjL0qCJy7JfMmEgks03Eg3ueHRViYzf1tgxPtZczhx9nzQu7cXs4YMVPL61ARAqO
+rwxsWvQAbZSj867y614UaAoDW8eJCdD5vQIDAQABo4ICJDCCAiAwHQYDVR0OBBYE
+FEy59EnBgrUeOoFj+gwVeKX3Sq//MB8GA1UdIwQYMBaAFD9sN3GPdBsoWg/CKcEr
+BX7RJNRUMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMIIBxAYDVR0RBIIBuzCCAbeC
+CyoucGl4aXYubmV0gglwaXhpdi5uZXSCEiouc2VjdXJlLnBpeGl2Lm5ldIIOcGl4
+aXZpc2lvbi5uZXSCECoucGl4aXZpc2lvbi5uZXSCCHBpeGl2Lm1lggoqLnBpeGl2
+Lm1lgglweGltZy5uZXSCCyoucHhpbWcubmV0gg9waXhpdnNrZXRjaC5uZXSCESou
+cGl4aXZza2V0Y2gubmV0ghtwdWJsaWMtYXBpLnNlY3VyZS5waXhpdi5uZXSCDXdp
+a2lwZWRpYS5vcmeCDyoud2lraXBlZGlhLm9yZ4IPbS53aWtpcGVkaWEub3JnghEq
+Lm0ud2lraXBlZGlhLm9yZ4IKZ29vZ2xlLmNvbYIMKi5nb29nbGUuY29tghJzdGVh
+bWNvbW11bml0eS5jb22CFCouc3RlYW1jb21tdW5pdHkuY29tghBzdGVhbXBvd2Vy
+ZWQuY29tghIqLnN0ZWFtcG93ZXJlZC5jb22CE2FyY2hpdmVvZm91cm93bi5vcmeC
+FSouYXJjaGl2ZW9mb3Vyb3duLm9yZ4INd2lraW1lZGlhLm9yZ4IPKi53aWtpbWVk
+aWEub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQB0lZh4PS17JK5ZnJ6E0XfgR5KBKCeY
+6E2wg435ktJZLOS+nxRPPuEeSdNKtzciTEXNKY1bqv7LY1kh4AvqaQxbkgnmJf4a
+fi+mPKRxpxFcXIyqMf9Cw7490t83nkc19pTRrwqZejkHJYZ/rr8tqKZfmIRUAR0J
+MrAhKyPXgROZPVybus57U40vwjmlk5v64jHOd1riOKPwlZqna2eSk6RjpSRjiCHp
+OE2kIdKjZzxwmvPf9kUmtBgjBQSfL37924W15MBxxrRS1NzNkR9l8dkXjNkDOPV8
+KuI84UNmWgHLXlZr5HiDFwHxsCWxAMU3gYOUnTZ6PqqBIyuxkLjq/uvi
 -----END CERTIFICATE-----
--- a/conf/ca/pixiv.net.key
+++ b/conf/ca/pixiv.net.key
@ -1,28 +1,27 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCphHdEL3fPWt5Z
-TM4VwbzbbUMeb/IuRvWkdLz2kmB3ss15v9dlK1R4SG2rL2v4Y8FpoR2ytXjkK7et
-YtYUqnokl3LSgffj17R2H5TedFywsWwxIS/EPlhBO6sG5YoogP3DobXc28dPYr3M
-/+616SFfm4ggq8M2+YIiPIhu2WnNrcArXhlo5/8qZJAkMgerLGepqy1174Um3zdn
-w1MxDpyMWKok8+JfKxz8ckU0lJu0acvvo22P96tMg3eE6KzmtxdY6MJHzgg1MppF
-eRXk9AeS7nlkzEFrXaRMRnIvWnpmON89WI8CeUvqD4sMM8xBeQ88FpEMZ0RtQn4c
-yy/WH2v7AgMBAAECggEAWSrltYcmhXrt5JlC+izLk7x4hsUp5e/LfHMvhp/egHgc
-H0OrIHtXVmH61gX+zExky5RFU+CjM5pPZrPLmllGIINNka9t3npzYYMhQpaAvyzE
-lV84igilUcL6JomNT9ryIPqp9//fakGtRu0E+skjle/w/gZ7jCpYqnue5HgWcGpu
-cUTABq96kRzY8winNZcfbBw2uIdpKGDXMxWnepVbhNNzXpns0ivJ7+MrUSKLX1a2
-nCPQkRjAZHYMgRIKfPbSwcyRcHHsO5CyCY71uiqFBy2aDtamD/r9QOFTEdvTMddf
-aP1RU8eSb2mDDrWPySbkYTGuehcfXcroxBFkQnRn0QKBgQDbB6qyIF/bVVATZBpR
-TBu1CQuiowEbvSm+XCA2vig4A5IJ6JnUaS+wc2BBM2RUBLYbHKb4lEGGmpnGGHCD
-sxy64PhAvzWqbn9hvU3HwDwPZzUqWGHq9yaFbgD/LK/Vl57ow/oRV7a0u9hAJOPx
-mR70uqvfr6HTMbCmjY/k4TfvAwKBgQDGIVpLo+Bjz62c8YJEiOqQjB1yFuqRP4OH
-K6MmyMEc6H2619RyyrDbkMNVpwHNwChTUNcwAqFYvEqRGrvQ5dO8whYxEli/0cIR
-jOgzbGLXst3nIbzm30MeknnoWVCrMiqXeCNtwnUifKS4WvBs0Bdn4KBZTiytNN6K
-xhZJPgvhqQKBgDADKDnPuvN7agg2I0a65j/y8af/D1kjSClATJdza6GLttGROVdE
-j32gbPMd7to0Bi8/QqKu7QYykY7JALD97EhS1FhtEbiAbE/ijVBCJWhC+XaE1UIK
-V1lcWb+V7h1mFSF1BDYVAinwG2FENOta41xGJzLrbw+6jryTv30umXI9AoGBAL2k
-JPJrjBbdLJchDwgcaTAr/O88Ag8+1N0npoUz+Kt72QRjG4U4fynaGS29qdtPRwng
-QehBTEBMEa9sAEOGCDIPMACOSAZqdrAnyAWYg89j9EQMJexx3KPBnhAIlU8XuG68
-3mRrkYSN+3g+CwyL7StPdQul6Nts1GnOCnzWd7bpAoGBANkO5h+oUhd4y8tCX3vX
-mT98imjvCnvW1KTKa9YHL0OEH5aEPKDzUwHyqtUJCsw7YTk0+z/XtiVm9/V/1t76
-Dllt7KaEI6MszXD8QgBDpkCp8N2zmTT5URKbV33odGXYJPcA908RiqDCBmw3zxjZ
-cCSu7rDx8R2i8DFU9frXY81l
-----END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAzgAYzGRwrFmwRZ7D7p6bslZZQ6q3mGu7hobJu7btVLhW3uwY
+BmJZJzvSFkqKhq1AK2lq3CESS8r9hagB3ewqIKJusMKneYj59DSV+4W/8McdVyn4
+pWLjtp5S90IqDFpcbbQwUU7BQFfGWFcYR5xZnbc4u8wMaKpsaHa+b4SDEu9gLRFh
+2AHwCYWMgPrw9iOVx5fBhlOXtdXcW6j4IkkKcC2SdxdB/Q66W6fOj2Ch/Fqnhxkf
+EvbIsjL0qCJy7JfMmEgks03Eg3ueHRViYzf1tgxPtZczhx9nzQu7cXs4YMVPL61A
+RAqOrwxsWvQAbZSj867y614UaAoDW8eJCdD5vQIDAQABAoIBAQCgRA0G/2F1hTWR
+hIp02+rP3UQHVAsQR0iWycirBQ8xqVTUjCPI27z2vCCffRC25JUW8SXU6tncI6oH
+0QTazgCccSLi3B4FfN7R8hN5or4IqjCWfq3Wpc/5ZMWxXkVuZOKh6tzodPf+ggtq
+8R+PnwFNpZ065e4FhAlhYHiaNCLxl+sG4MHov+a1saGCuYRIiLnZv3pj165DZod8
+zNIRY7alcpzBbf+um/G4no6naRHJ0Kev9e1HgWjbVfZYtO+kiIowOvNq1XSLJ0KD
+ZO16XOAD5YrLW3hgCsdFxfyvwMpnCPJwbg2t6NbEeR/8gOn64zs1bkMLuvecY7rr
+c7yhZqVBAoGBAOhTYK3zj7/lc/xoUanR6Fr8QIRXE/YZ4f1EGDX4PT2Hga36gTwI
+IOS9Vjx/0kUlZFmvoCV7mMcDwJMTE8BBjYp+N/DvaRkDau67WDwJVFxoEZVvW5ni
+I0uoRIBaP4r8FkSI6j56BuKj+7msFS3zL+MgQ8ujvsztJq4uiFmnUogtAoGBAOL9
+i85EGOOi3vrrdEVy9goFcA5HT9qT+jvtUaqFwHCB4cZEsGx2hNaOVVWm6rBIQtb
+Zfg+VqEKaQisjcKAa/8HZ6xApdtSNyWR+OoA7VzRsc+SzhdHkgbsMQifQbEKEe49
+yFVm8xrP/rnVrq87gsrvQcyMH0FB4ljZ4wGWqiHRAoGBAIIYpoviVv3zZGbUl95L
+wByrIwm4pWHrjoQ/jHs0Xj7FUdX18EaImrrcV50bSskTrkUWtswmkR/otv7k8Ot5
+CeSi13qg5i5unoO+/yLnaokwcaBHsnjSjEdCm9FwOCMBFQsdzGZd+NsTTtPjTBzm
+EEvUdoJjWGXy6vUg85OYwfulAoGBAKYE9kAlr2vxbOlUxctf8riFEOuHmnGwUwPe
+lqo5axxZCmJwHzzV1NdErRxSfQZVvNJupdT72yZr08iJVCGHBfYAN35Pxj70EeuD
+qReVWAYERNW53MxAB3jStUZGHKjc4aJrQ6Pa6UGaEQdgVyRJFW9RsMFnVtDG3EL6
+EcMuq/6RAoGAWm7c5pdbj1p3bvOrfHpsWrv/qFzozB5LRk2bYwosMASSyLwX6+TF
+3QCWL7VOnLQJvQ5ffCWWSs7Ds9kJ/gvIVyelgT6DsyKwi19rjueRix3nFg1faAmI
+whLZvr+KVwLYjDYfNmKBwbV8KLZAf5fZ3q9l4lf3rjaQLcfL3LiaUUk=
+-----END RSA PRIVATE KEY-----
--- a/conf/cert.pem
+++ b/conf/cert.pem
@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICxDCCAaygAwIBAgIIVHb1I+71EegwDQYJKoZIhvcNAQELBQAwDzENMAsGA1UE
-AwwEV25tcDAeFw0xODA5MTYxNTMxMDZaFw0yODA5MTYxNTMxMDZaMA8xDTALBgNV
-BAMMBFdubXAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDF6c6zZZyP
-zref4Nmd6N0aqIQLeJcwhpSZNiw0S44+oROrZ8aVfoRLkBbe2uGDwpjh9G9C+RaX
-QukIuvQY0iPycM69oEk8xLfK2qLRn8gPjmmzLoqjkUDtvzGU9aYcNP5wkeOzQHFy
-w5ZEjqv9ZxrhTSeZr6m6cRNA2nexUjSp2j8cRcecXMxgfFdN4T2VkXwo0PSm5cb7
-tw3lSmOMaHEB156I7JP8zeacLiN6tmsqcq9bdl4BFzWNjMCYH+d3B78zhzRLiZjp
-aqDQwc/LggkbVwFgSeYIFgWGhztFMxCgItMYJqdgShK/xK09A5PFebONbEGRuejw
-88cPYCHkWFx3AgMBAAGjJDAiMCAGCWCGSAGG+EIBDQQTDBFHZW5lcmF0ZWQgYnkg
-V25tcDANBgkqhkiG9w0BAQsFAAOCAQEAAD+Vl7W/kX+fD6bZp4BBRHe9eYE7XM9B
-aft8KR6kxzGXdQqIT1dAfFeTd49XeLLMXeVl9idGHAinl64ZCrDyjEDEPsIAoYf2
-nzgpTrv9qExghRXp/1jTRZ6HBHEXHHLlDBHCfw+pHw6R53W28RN7Em7vvu222DpT
-0mRO1CSm+OCRuw1pPq5Z9SiNDI52bB6XIyq+QE7jNuQCWG8eRV66fVBdEr99wL2e
-6ZTVfKKM3sfvmHNY45roRhqTRyibA9X7fnz4fBa8uBmbSCBAfebI6HvzStInqJOQ
-DPdQyX9Ky87CRCyCRZFQJFe1eUfaMMQMN/pFNYiS518NFtIzSMHZZg==
+MIICxDCCAaygAwIBAgIIdFTrJJMBNZwwDQYJKoZIhvcNAQELBQAwDzENMAsGA1UE
+AwwEV25tcDAeFw0xODA5MjUxNDM3MDNaFw0yODA5MjUxNDM3MDNaMA8xDTALBgNV
+BAMMBFdubXAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCqQtQ07hG
+9gWcJNzRxREXpEODgKa8MPeaNw2pXFdU79Irp4ft0ilERmxZJ7THb3GZqsfIiMEN
+9Bm9h2GvF7NDydo7zdO2Yhn7ELqUs/Msl7yFGAyfg7uS+nxCsQRzVt/xiQR0xJtx
+fXGXEv92HDWRi6lLcjyyEgErx72upHBKYAl7lVHMHvZab1cmUuOz0KiMa0MC+/9p
+uOWsYjEqEgAnaBzb1eUo1/S12za2zWVCbKDV8xkCi86AVOLIIwMFPE9BREYvYY9D
+I+RoCWf0h/u0U/Nytw/T8EOcDLHkW1/siX7bYaFCmsvFvUr4hT5790YUmRpeGcw
+Wic1fsqcYTWZAgMBAAGjJDAiMCAGCWCGSAGG+EIBDQQTDBFHZW5lcmF0ZWQgYnkg
+V25tcDANBgkqhkiG9w0BAQsFAAOCAQEAHwCoHBxe5pBHLMys3mPFRkafPkr0vPiK
+Nxq1l2gjH8k6bW7ez9WraovpJiAIxTkJGYMT2exK9LchsadkRxJ4tZ/osOrBT6Qe
+nxKo8Oym+8QxgSVhYSdxOZm9SYpv9f2HTTVRvG7l2WyvDny1+Uh9zGg4MKW5yVXZ
+a6fmHlzcR/AGds2pKSirbLCmp5/R6rvHRR1nBgqP9FUdEFvbu4V4gCh2Z1oVGyoU
+atbI8U0DfmbDeHoWjkWG+KPfVxhNZJamIZ02t2/9edPLOLZFNoCreZr3F+BfkVil
+75E3KWFLjqphhYhFrT69C4yxp6jDt/UncDRgX/bqSERJDZae8GP91A==
 -----END CERTIFICATE-----
--- a/conf/key.pem
+++ b/conf/key.pem
@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAxenOs2Wcj863n+DZnejdGqiEC3iXMIaUmTYsNEuOPqETq2fG
-lX6ES5AW3trhg8KY4fRvQvkWl0LpCLr0GNIj8nDOvaBJPMS3ytqi0Z/ID45psy6K
-o5FA7b8xlPWmHDT+cJHjs0BxcsOWRI6r/Wca4U0nma+punETQNp3sVI0qdo/HEXH
-nFzMYHxXTeE9lZF8KND0puXG+7cN5UpjjGhxAdeeiOyT/M3mnC4jerZrKnKvW3Ze
-ARc1jYzAmB/ndwe/M4c0S4mY6Wqg0MHPy4IJG1cBYEnmCBYFhoc7RTMQoCLTGCan
-YEoSv8StPQOTxXmzjWxBkbno8PPHD2Ah5FhcdwIDAQABAoIBAC5fI3bGMqJBSaX0
-vZhxtMinvlSfuzD7/3pMhpv0Lg5/mEe7h3yEicPYrXsm5tsD7+VVa/JRwZjMbSSG
-BWaBajnGc7JbiX1rDDND+g1Ktknq0NpSZ9p+UKvD9f6Udgi64/kFPchEq7A7ooxK
-r4Kus04h0UsBrS+JifzSk2PhQoSfPDQ+RtzUy9qTh8dTj4CUf3CYBTMPDPmbvSRx
-qwsNOqrcMf9Wn/g2jk6FFtnjsN+lE3x2Zy+kuYDNfGNnUDg9XghalUXFOxnFqFcO
-UxttpbT3qoMOtk4agIh8HJ9697CgN7OfLWZ+dxpJYbOLiLLr6IotiEWI0bStTC4t
-CXRaZxUCgYEA7V10bfad9zpvilHfa+Q73z5eBfyfTAJYMvo/FhjKPgSqsBtkIIYz
-3GvZy4JqZbWYNvmvBCzQGehtRsZpzkKviUWDxYEbHDfL7lNh7DHrcjmrlUFWhT3I
-ZYgIPQASwpMPwRz6Xsc2T2YgBDRAX25PSGAY6tBAymGTarLltxOBHO0CgYEA1XN0
-UBWiR40KWjhHBowqSqYFb95LcqtE4pE8158tGqOAZDp9s3n16phNpvOlF9CH9ebC
-3SAPTk0ShNUkbcDb+mI0L8ZUkKIJOgA6ESJS9X++OEkK6Yqt8U0u8WgI79atQGoB
-6Zee5NbQP43223CwJE4K0YhDX+d+bAZMoGzMFnMCgYB3fQciX/ZvQSRrLgHZj0Aw
-hnXQb7ZFDh0WNHFTj1En3TOLiY5i7QvoVwaBcvpajwq8Cf73jBOKJz3zVehnY5x3
-7t2BrBdYoiHvrFvsCckrbCqa7RQ/6LUbn1n+Uy4ecueIYC0NTx1g5NkTJLaPE7mn
-hnCkrAchmfMa0EnhWlkxlQKBgCLKcLjk7dBvwrI13g3JJtOH//bd6rpEBDRRq/MR
-NM7Uu4aaqgZo6JZWQMHnkI8zJBYGiNh180i180DHZOqmtrQ28X6f+wSgBJT5mH1W
-dOMi8SRHc4nhWryr8ezTIjHFcfO/05P5bKKsCMFzKDtYQL2KIuVIKoMlPkvpMvAr
-C5DVAoGBAIQ/B0/pr9HDr23Vdnwd5har7rEomat+1LXAdtcJAGF3yIxMNSxqn7Ep
-KNGMfj5x6BrfXtujmCKbqcaXV0mpDIXpNyqJViCa6t6Z3Hjk/c4vBBods5ssHFeL
-W+62bkHmws1OFb61d/ko+GojOchLxeoLIQ41vIdzQQzv+Th8w8VM
+MIIEogIBAAKCAQEAgqkLUNO4RvYFnCTc0cURF6RDg4CmvDD3mjcNqVxXVO/SK6eH
+7dIpREZsWSe0x29xmarHyIjBDfQZvYdhrxezQ8naO83TtmIZ+xC6lLPzLJe8hRgM
+n4O7kvp8QrEEc1bf8YkEdMSbcX1xlxL/dhw1kYupS3I8shIBK8e9rqRwSmAJe5VR
+zB72Wm9XJlLjs9CojGtDAvv/abjlrGIxKhIAJ2gc29XlKNf0tds2ts1lQmyg1fMZ
+AovOgFTiyCMDBTxPQURGL2GPQ/iPkaAln9If7tFPzcrcP0/BDnAyx5Ftf7Il+22G
+hQprLxb1K+IU+e/dGFJkaXhnMFonNX7KnGE1mQIDAQABAoIBAAzM1hCfXTCJI42O
+HZqTTWmygZwIEM2OQoN3cegt5VmrJjzOlxtuTkqjrN5NwdZpODN6A+5vr0dYVY6N
+Ymgj0JULLkz+N10Ts+s2UquvYVr0q9b3adfVW506MCLccqIrWERc9vR1hQDo7XrZ
+CpvIhwWbgq9NzAe/NHbUhOREtGzPYwHFjWpzuZlXTeeLVIDIuQ7IqekLNi/JgebT
+FcTA8CzlKbgPueFwy8cQ21ZMqEY+1qRDIKKtcCVJ5tztbHJN5xrHgTWT+Jo8wOL5
+EHhUI+jTReTREOnYqnvWvJRmI5rUg81Z80krO/quYGnBXrSbqL/WcdTMYyth6sV6
+TL1Vw00CgYEAzR4UNBezpI/QbmRhmsG29gc+8X6t4ZnuByc+EnB8NHtjXWHJBccs
+uAklK4q7AqJMqt+JoyLBUjzxPp8eRYRzkXZ7J/VV1hnDqrB1xz/RrvWgyBS6qo8X
+QDutghbTP4tQQPlVGV6EvbOoxkkyDt7DiKTyqBM60z71zJNknGwrmBcCgYEAoxKW
+MDFIlnov011tAo0sCDbffqbbbn0e5QvLN/9tpV+lzGMDKLp+MrLTiKkZ+mnuuMQq
+4G/PegO/4B+LN9GUhIHA1pIy0Yu1ktguw33KEjjz+Uq1dAO0pGxezdvlpAHocRoO
+TLqNEyz/qfFNnIXA1//hOxkGug7GcxYeFE/Sfc8CgYBpZI0o/wy0/5gvQLDOHb7u
+x2ZWG6sogjlFv6orO1T2enfh4X6y01Zs8XYB23Sfs9kE63sDMbZ3lQy4CnY5bgcb
+tO8u5uZF7lMVfznlOSt6ZIdKhywquv9NZ9yNPUEqI2EHIZXSRTibaJbN24o3DcsW
+iPqN1eOh63XMuec2YHY93QKBgBhqK/pDJq8A1DA9CJkdMb55GLUJnkjIituYDHDx
+2SStUVFscYijg0lr5KfNSYpoWcln9VNs6g9GiG+xyVIuGqJMGucFNH6TADhgDYBP
+UPWxeTWVrd0UwPLtFrSTe6o2buqgEAwE0iJQ1mZHLmuEyv6L3NjQQmWQ2L1aTl6U
+JNuZAoGAEb13ZbzqLtaodrKMqJwKa6pzhi9F8+o/GOutV2PXOFgUBszrjyDShIUv
+sJ+C1y4+dFmgEulxZNVnzOg0t+wgD1cdr/MPsGhF96FGszLOUjKz15QyPoD8xkAS
+Fk3EBth9Pj4FQ+U2ACUdJbX0QaWWdCEwRca7PUzfEePqJllgZWM=
 -----END RSA PRIVATE KEY-----
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@ -1,233 +1,36 @@

 #user  nobody;
-worker_processes  1;
+worker_processes 1;

 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;

 #pid        logs/nginx.pid;
-
-
 events {
-    worker_connections  1024;
+    worker_connections 1024;
 }


 http {
-    include       mime.types;
-    default_type  application/octet-stream;
+    include mime.types;
+    default_type application/octet-stream;

    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
    #                  '$status $body_bytes_sent "$http_referer" '
    #                  '"$http_user_agent" "$http_x_forwarded_for"';

    #access_log  logs/access.log  main;
-
-    sendfile        on;
+    sendfile on;
    #tcp_nopush     on;

    #keepalive_timeout  0;
-    keepalive_timeout  65;
-    
+    keepalive_timeout 65;
+    client_max_body_size 100m;
    server_names_hash_max_size 512;
    server_names_hash_bucket_size 1024;

    #gzip  on;
-    
-    upstream www-pixiv-net { 
-        server 210.129.120.46:443;
-        server 210.129.120.52:443;
-        server 210.129.120.50:443;
-    }
-    
-    upstream sketch-pixiv-net { 
-        server 210.140.174.37:443;
-        server 210.140.170.179:443;
-        server 210.140.175.130:443;
-    }
-    
-    upstream imgaz-pixiv-net { 
-        server 210.140.131.145:443;
-        server 210.140.131.144:443;
-        server 210.140.131.147:443;
-        server 210.140.131.153:443;
-    }
-    
-    upstream i-pximg-net { 
-        server 210.140.92.140:443;
-        server 210.140.92.137:443;
-        server 210.140.92.139:443;
-        server 210.140.92.142:443;
-        server 210.140.92.134:443;
-        server 210.140.92.141:443;
-        server 210.140.92.143:443;
-        server 210.140.92.135:443;
-        server 210.140.92.136:443; 
-    }

-    server {
-        #listen 80;
-        listen 443 ssl;
-        server_name pixiv.net;
-        server_name www.pixiv.net;
-        server_name ssl.pixiv.net;
-        server_name accounts.pixiv.net;
-        server_name touch.pixiv.net;
-        server_name oauth.secure.pixiv.net;
-
-        ssl on;
-        ssl_certificate ca/pixiv.net.crt;
-        ssl_certificate_key ca/pixiv.net.key;
-        
-        client_max_body_size 50M;
-        
-    	location / {
-            proxy_pass https://www-pixiv-net;
-            proxy_set_header Host $http_host;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Real_IP $remote_addr;
-            proxy_set_header User-Agent $http_user_agent;
-            proxy_set_header Accept-Encoding ''; 
-            proxy_buffering off;
-        }
-	}
-    
-    server {
-        listen 443 ssl;
-        server_name i.pximg.net;
-
-        ssl on;
-        ssl_certificate ca/pixiv.net.crt;
-        ssl_certificate_key ca/pixiv.net.key;
-        
-    	location / {
-            proxy_pass https://i-pximg-net;
-            proxy_set_header Host $http_host;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Real_IP $remote_addr;
-            proxy_set_header User-Agent $http_user_agent;
-            proxy_set_header Accept-Encoding ''; 
-            proxy_buffering off;
-        }
-	}
-    
-    server {
-        listen 443 ssl;
-        server_name sketch.pixiv.net;
-
-        ssl on;
-        ssl_certificate ca/pixiv.net.crt;
-        ssl_certificate_key ca/pixiv.net.key;
-
-    	location / {
-            proxy_pass https://sketch-pixiv-net;
-            proxy_set_header Host $http_host;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Real_IP $remote_addr;
-            proxy_set_header User-Agent $http_user_agent;
-            proxy_set_header Accept-Encoding ''; 
-            proxy_buffering off;
-        }
-        
-        # Proxying WebSockets
-        location /ws/ {
-            proxy_pass https://sketch-pixiv-net;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host $host;
-        }
-	}
-    
-    server {
-        listen 443 ssl;
-        server_name factory.pixiv.net;
-
-        ssl on;
-        ssl_certificate ca/pixiv.net.crt;
-        ssl_certificate_key ca/pixiv.net.key;
-
-    	location / {
-            proxy_pass https://210.140.131.180/;
-            proxy_set_header Host $http_host;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Real_IP $remote_addr;
-            proxy_set_header User-Agent $http_user_agent;
-            proxy_set_header Accept-Encoding ''; 
-            proxy_buffering off;
-        }
-	}
-    
-    server {
-        listen 443 ssl;
-        server_name dic.pixiv.net;
-        server_name en-dic.pixiv.net;
-        server_name sensei.pixiv.net;
-        server_name fanbox.pixiv.net;
-        server_name payment.pixiv.net.pixiv.net;
-
-        ssl on;
-        ssl_certificate ca/pixiv.net.crt;
-        ssl_certificate_key ca/pixiv.net.key;
-        
-    	location / {
-            proxy_pass https://210.129.120.50/;
-            proxy_set_header Host $http_host;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Real_IP $remote_addr;
-            proxy_set_header User-Agent $http_user_agent;
-            proxy_set_header Accept-Encoding ''; 
-            proxy_buffering off;
-        }
-	}
-    
-    server {
-        listen 443 ssl;
-        server_name imgaz.pixiv.net;
-        server_name comic.pixiv.net;
-        server_name novel.pixiv.net;
-
-        ssl on;
-        ssl_certificate ca/pixiv.net.crt;
-        ssl_certificate_key ca/pixiv.net.key;
-        
-    	location / {
-            proxy_pass https://imgaz-pixiv-net;
-            proxy_set_header Host $http_host;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Real_IP $remote_addr;
-            proxy_set_header User-Agent $http_user_agent;
-            proxy_set_header Accept-Encoding ''; 
-            proxy_buffering off;
-        }
-	}
-
-    server {
-        listen 443 ssl;
-        server_name zh.wikipedia.org;
-        server_name zh-yue.wikipedia.org;
-        server_name wuu.wikipedia.org;
-        server_name ug.wikipedia.org;
-        server_name ja.wikipedia.org;
-        server_name zh.wikinews.org;
-        server_name zh.m.wikipedia.org;
-        server_name ug.m.wikipedia.org;
-        server_name zh.m.wikinews.org;
-
-        ssl on;
-        ssl_certificate ca/pixiv.net.crt;
-        ssl_certificate_key ca/pixiv.net.key;
-        
-    	location / {
-            proxy_pass https://103.102.166.224/;
-            proxy_set_header Host $http_host;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Real_IP $remote_addr;
-            proxy_set_header User-Agent $http_user_agent;
-            proxy_set_header Accept-Encoding ''; 
-            proxy_buffering off;
-        }
-	}
-    
+    include pixiv.conf;
 }
--- a/conf/pixiv.conf
+++ b/conf/pixiv.conf
@ -0,0 +1,502 @@
+upstream www-pixiv-net {
+    #server 104.18.12.135:443;
+    #server 104.18.13.135:443;
+    server 210.140.131.223:443;
+    server 210.140.131.225:443;
+    server 210.140.131.220:443;
+}
+
+upstream account-pixiv-net {
+    server 210.140.131.226:443;
+    server 210.140.131.218:443;
+    server 210.140.131.222:443;
+}
+
+upstream sketch-pixiv-net {
+    server 210.140.174.37:443;
+    server 210.140.170.179:443;
+    server 210.140.175.130:443;
+}
+
+upstream sketch-hls-server {
+    server 210.140.214.211:443;
+    server 210.140.214.212:443;
+    server 210.140.214.213:443;
+}
+
+upstream imgaz-pixiv-net {
+    server 210.140.131.145:443;
+    server 210.140.131.144:443;
+    server 210.140.131.147:443;
+    server 210.140.131.153:443;
+}
+
+upstream i-pximg-net {
+    server 210.140.92.140:443;
+    server 210.140.92.137:443;
+    server 210.140.92.139:443;
+    server 210.140.92.142:443;
+    server 210.140.92.134:443;
+    server 210.140.92.141:443;
+    server 210.140.92.143:443;
+    server 210.140.92.136:443;
+    server 210.140.92.138:443;
+    server 210.140.92.144:443;
+    server 210.140.92.145:443;
+}
+
+upstream app-api-pixiv-net {
+    server 210.140.131.218:443;
+    server 210.140.131.223:443;
+    server 210.140.131.226:443;
+}
+
+server {
+    listen 80 default_server;
+    rewrite ^(.*) https://$host$1 permanent;
+}
+
+server {
+    listen 443 ssl;
+    server_name www.pixiv.net;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    client_max_body_size 50M;
+
+    location / {
+        #proxy_ssl_server_name on;
+        proxy_pass https://www-pixiv-net;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name pixiv.net;
+    server_name ssl.pixiv.net;
+    server_name accounts.pixiv.net;
+    server_name touch.pixiv.net;
+    server_name oauth.secure.pixiv.net;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    client_max_body_size 50M;
+
+    location / {
+        proxy_pass https://account-pixiv-net;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name i.pximg.net;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        set $pximg_url i.pixiv.re;
+        
+        #rewrite ^/(.*)$ https://$pximg_url/$1 redirect;
+
+        # proxy_pass https://i-pximg-net;
+        # proxy_set_header Host $http_host;
+        
+        resolver 223.5.5.5;
+        proxy_pass https://$pximg_url;
+        proxy_set_header Host $pximg_url;
+        proxy_ssl_server_name on;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name sketch.pixiv.net;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://sketch-pixiv-net;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+
+    # Proxying WebSockets
+    location /ws/ {
+        proxy_pass https://sketch-pixiv-net;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name *.pixivsketch.net;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://sketch-hls-server;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name factory.pixiv.net;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://210.140.131.180/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name dic.pixiv.net;
+    server_name en-dic.pixiv.net;
+    server_name sensei.pixiv.net;
+    server_name fanbox.pixiv.net;
+    server_name payment.pixiv.net.pixiv.net;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://210.140.131.222/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name imgaz.pixiv.net;
+    server_name comic.pixiv.net;
+    server_name novel.pixiv.net;
+    server_name source.pixiv.net;
+    server_name i1.pixiv.net;
+    server_name i2.pixiv.net;
+    server_name i3.pixiv.net;
+    server_name i4.pixiv.net;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://imgaz-pixiv-net;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name app-api.pixiv.net;
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://app-api-pixiv-net;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name www.google.com;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location ^~ /recaptcha/ {
+        rewrite ^(.*)$ https://www.recaptcha.net$1 break;
+    }
+
+    location / {
+        default_type text/html;
+        charset utf-8;
+        return 200 'Pixiv-Nginx提醒：本工具默认代理了www.google.com，用于加载P站登陆时的验证码插件，如果你有方法正常访问www.google.com，并且不希望看到这个页面，那么将 <code>C:\Windows\System32\drivers\etc\hosts</code> 中 <code>127.0.0.1 www.google.com</code> 的那行记录删除即可。如果删除后刷新网页还是看到这个页面，请先清除一下浏览器缓存。';
+    }
+}
+
+upstream wikipedia-text-lb {
+    server 208.80.153.224:443;
+    #server 208.80.154.224:443;
+    server 91.198.174.192:443;
+    #server 103.102.166.224:443;
+}
+
+server {
+    listen 443 ssl;
+    server_name *.wikipedia.org;
+    server_name *.m.wikipedia.org;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://wikipedia-text-lb/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name wikimedia.org;
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://wikipedia-text-lb/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+upstream wikipedia-upload-lb {
+    server 208.80.153.240:443;
+    server 208.80.154.240:443;
+    server 91.198.174.208:443;
+    server 103.102.166.240:443;
+}
+
+server {
+    listen 443 ssl;
+    server_name upload.wikimedia.org;
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://wikipedia-upload-lb/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+server {
+    listen 443 ssl;
+    server_name *.steamcommunity.com;
+    server_name steamcommunity.com;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://23.61.176.149/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name *.steampowered.com;
+    server_name steampowered.com;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://104.112.84.145/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+server {
+    listen 443 ssl;
+    server_name *.archiveofourown.org;
+    server_name archiveofourown.org;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://104.153.64.122/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+server {
+    listen 443 ssl;
+    server_name nyaa.si;
+    server_name www.nyaa.si;
+    server_name sukebei.nyaa.si;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://185.178.208.182/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+upstream exhentai-lb {
+    server 178.175.128.252:443;
+    server 178.175.128.254:443;
+    server 178.175.129.252:443;
+    server 178.175.129.254:443;
+    server 178.175.132.20:443;
+    server 178.175.132.22:443;
+}
+
+server {
+    listen 443 ssl;
+    server_name exhentai.org;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://exhentai-lb/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+upstream e-hentai-lb {
+    server 104.20.26.25:443;
+    server 104.20.27.25:443;
+}
+
+server {
+    listen 443 ssl;
+    server_name e-hentai.org;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://e-hentai-lb/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name forums.e-hentai.org;
+
+
+    ssl_certificate ca/pixiv.net.crt;
+    ssl_certificate_key ca/pixiv.net.key;
+
+    location / {
+        proxy_pass https://94.100.18.243:443/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header User-Agent $http_user_agent;
+        proxy_set_header Accept-Encoding '';
+        proxy_buffering off;
+    }
+}
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@ -108,6 +108,7 @@ syn keyword ngxDirectiveControl contained set
 syn keyword ngxDirectiveError contained error_page
 syn keyword ngxDirectiveError contained post_action

+syn keyword ngxDirectiveDeprecated contained limit_zone
 syn keyword ngxDirectiveDeprecated contained proxy_downstream_buffer
 syn keyword ngxDirectiveDeprecated contained proxy_upstream_buffer
 syn keyword ngxDirectiveDeprecated contained spdy_chunk_size
@ -118,6 +119,7 @@ syn keyword ngxDirectiveDeprecated contained spdy_pool_size
 syn keyword ngxDirectiveDeprecated contained spdy_recv_buffer_size
 syn keyword ngxDirectiveDeprecated contained spdy_recv_timeout
 syn keyword ngxDirectiveDeprecated contained spdy_streams_index_size
+syn keyword ngxDirectiveDeprecated contained ssl
 syn keyword ngxDirectiveDeprecated contained upstream_conf

 syn keyword ngxDirective contained absolute_redirect
@ -136,6 +138,7 @@ syn keyword ngxDirective contained alias
 syn keyword ngxDirective contained allow
 syn keyword ngxDirective contained ancient_browser
 syn keyword ngxDirective contained ancient_browser_value
+syn keyword ngxDirective contained api
 syn keyword ngxDirective contained auth_basic
 syn keyword ngxDirective contained auth_basic_user_file
 syn keyword ngxDirective contained auth_http
@ -143,7 +146,11 @@ syn keyword ngxDirective contained auth_http_header
 syn keyword ngxDirective contained auth_http_pass_client_cert
 syn keyword ngxDirective contained auth_http_timeout
 syn keyword ngxDirective contained auth_jwt
+syn keyword ngxDirective contained auth_jwt_claim_set
+syn keyword ngxDirective contained auth_jwt_header_set
 syn keyword ngxDirective contained auth_jwt_key_file
+syn keyword ngxDirective contained auth_jwt_key_request
+syn keyword ngxDirective contained auth_jwt_leeway
 syn keyword ngxDirective contained auth_request
 syn keyword ngxDirective contained auth_request_set
 syn keyword ngxDirective contained autoindex
@ -229,6 +236,7 @@ syn keyword ngxDirective contained fastcgi_read_timeout
 syn keyword ngxDirective contained fastcgi_request_buffering
 syn keyword ngxDirective contained fastcgi_send_lowat
 syn keyword ngxDirective contained fastcgi_send_timeout
+syn keyword ngxDirective contained fastcgi_socket_keepalive
 syn keyword ngxDirective contained fastcgi_split_path_info
 syn keyword ngxDirective contained fastcgi_store
 syn keyword ngxDirective contained fastcgi_store_access
@ -255,6 +263,7 @@ syn keyword ngxDirective contained grpc_pass_header
 syn keyword ngxDirective contained grpc_read_timeout
 syn keyword ngxDirective contained grpc_send_timeout
 syn keyword ngxDirective contained grpc_set_header
+syn keyword ngxDirective contained grpc_socket_keepalive
 syn keyword ngxDirective contained grpc_ssl_certificate
 syn keyword ngxDirective contained grpc_ssl_certificate_key
 syn keyword ngxDirective contained grpc_ssl_ciphers
@ -330,6 +339,8 @@ syn keyword ngxDirective contained keepalive
 syn keyword ngxDirective contained keepalive_disable
 syn keyword ngxDirective contained keepalive_requests
 syn keyword ngxDirective contained keepalive_timeout
+syn keyword ngxDirective contained keyval
+syn keyword ngxDirective contained keyval_zone
 syn keyword ngxDirective contained kqueue_changes
 syn keyword ngxDirective contained kqueue_events
 syn keyword ngxDirective contained large_client_header_buffers
@ -367,6 +378,7 @@ syn keyword ngxDirective contained memcached_next_upstream_timeout
 syn keyword ngxDirective contained memcached_next_upstream_tries
 syn keyword ngxDirective contained memcached_read_timeout
 syn keyword ngxDirective contained memcached_send_timeout
+syn keyword ngxDirective contained memcached_socket_keepalive
 syn keyword ngxDirective contained merge_slashes
 syn keyword ngxDirective contained min_delete_depth
 syn keyword ngxDirective contained mirror
@ -375,9 +387,9 @@ syn keyword ngxDirective contained modern_browser
 syn keyword ngxDirective contained modern_browser_value
 syn keyword ngxDirective contained mp4
 syn keyword ngxDirective contained mp4_buffer_size
-syn keyword ngxDirective contained mp4_max_buffer_size
 syn keyword ngxDirective contained mp4_limit_rate
 syn keyword ngxDirective contained mp4_limit_rate_after
+syn keyword ngxDirective contained mp4_max_buffer_size
 syn keyword ngxDirective contained msie_padding
 syn keyword ngxDirective contained msie_refresh
 syn keyword ngxDirective contained multi_accept
@ -456,11 +468,13 @@ syn keyword ngxDirective contained proxy_protocol_timeout
 syn keyword ngxDirective contained proxy_read_timeout
 syn keyword ngxDirective contained proxy_redirect
 syn keyword ngxDirective contained proxy_request_buffering
+syn keyword ngxDirective contained proxy_requests
 syn keyword ngxDirective contained proxy_responses
 syn keyword ngxDirective contained proxy_send_lowat
 syn keyword ngxDirective contained proxy_send_timeout
 syn keyword ngxDirective contained proxy_set_body
 syn keyword ngxDirective contained proxy_set_header
+syn keyword ngxDirective contained proxy_socket_keepalive
 syn keyword ngxDirective contained proxy_ssl
 syn keyword ngxDirective contained proxy_ssl_certificate
 syn keyword ngxDirective contained proxy_ssl_certificate_key
@ -481,6 +495,7 @@ syn keyword ngxDirective contained proxy_temp_path
 syn keyword ngxDirective contained proxy_timeout
 syn keyword ngxDirective contained proxy_upload_rate
 syn keyword ngxDirective contained queue
+syn keyword ngxDirective contained random
 syn keyword ngxDirective contained random_index
 syn keyword ngxDirective contained read_ahead
 syn keyword ngxDirective contained real_ip_header
@ -533,6 +548,7 @@ syn keyword ngxDirective contained scgi_pass_request_headers
 syn keyword ngxDirective contained scgi_read_timeout
 syn keyword ngxDirective contained scgi_request_buffering
 syn keyword ngxDirective contained scgi_send_timeout
+syn keyword ngxDirective contained scgi_socket_keepalive
 syn keyword ngxDirective contained scgi_store
 syn keyword ngxDirective contained scgi_store_access
 syn keyword ngxDirective contained scgi_temp_file_write_size
@ -565,7 +581,6 @@ syn keyword ngxDirective contained ssi_min_file_chunk
 syn keyword ngxDirective contained ssi_silent_errors
 syn keyword ngxDirective contained ssi_types
 syn keyword ngxDirective contained ssi_value_length
-syn keyword ngxDirective contained ssl
 syn keyword ngxDirective contained ssl_buffer_size
 syn keyword ngxDirective contained ssl_certificate
 syn keyword ngxDirective contained ssl_certificate_key
@ -573,6 +588,7 @@ syn keyword ngxDirective contained ssl_ciphers
 syn keyword ngxDirective contained ssl_client_certificate
 syn keyword ngxDirective contained ssl_crl
 syn keyword ngxDirective contained ssl_dhparam
+syn keyword ngxDirective contained ssl_early_data
 syn keyword ngxDirective contained ssl_ecdh_curve
 syn keyword ngxDirective contained ssl_engine
 syn keyword ngxDirective contained ssl_handshake_timeout
@ -664,6 +680,7 @@ syn keyword ngxDirective contained uwsgi_pass_request_headers
 syn keyword ngxDirective contained uwsgi_read_timeout
 syn keyword ngxDirective contained uwsgi_request_buffering
 syn keyword ngxDirective contained uwsgi_send_timeout
+syn keyword ngxDirective contained uwsgi_socket_keepalive
 syn keyword ngxDirective contained uwsgi_ssl_certificate
 syn keyword ngxDirective contained uwsgi_ssl_certificate_key
 syn keyword ngxDirective contained uwsgi_ssl_ciphers
@ -701,6 +718,26 @@ syn keyword ngxDirective contained xslt_string_param
 syn keyword ngxDirective contained xslt_stylesheet
 syn keyword ngxDirective contained xslt_types
 syn keyword ngxDirective contained zone
+syn keyword ngxDirective contained zone_sync
+syn keyword ngxDirective contained zone_sync_buffers
+syn keyword ngxDirective contained zone_sync_connect_retry_interval
+syn keyword ngxDirective contained zone_sync_connect_timeout
+syn keyword ngxDirective contained zone_sync_interval
+syn keyword ngxDirective contained zone_sync_recv_buffer_size
+syn keyword ngxDirective contained zone_sync_server
+syn keyword ngxDirective contained zone_sync_ssl
+syn keyword ngxDirective contained zone_sync_ssl_certificate
+syn keyword ngxDirective contained zone_sync_ssl_certificate_key
+syn keyword ngxDirective contained zone_sync_ssl_ciphers
+syn keyword ngxDirective contained zone_sync_ssl_crl
+syn keyword ngxDirective contained zone_sync_ssl_name
+syn keyword ngxDirective contained zone_sync_ssl_password_file
+syn keyword ngxDirective contained zone_sync_ssl_protocols
+syn keyword ngxDirective contained zone_sync_ssl_server_name
+syn keyword ngxDirective contained zone_sync_ssl_trusted_certificate
+syn keyword ngxDirective contained zone_sync_ssl_verify
+syn keyword ngxDirective contained zone_sync_ssl_verify_depth
+syn keyword ngxDirective contained zone_sync_timeout

 " 3rd party modules list taken from
 " https://github.com/freebsd/freebsd-ports/blob/master/www/nginx-devel/Makefile
@ -876,6 +913,8 @@ syn keyword ngxDirectiveThirdParty contained more_set_input_headers

 " NGINX WebDAV missing commands support (PROPFIND & OPTIONS)
 " https://github.com/arut/nginx-dav-ext-module
+syn keyword ngxDirectiveThirdParty contained dav_ext_lock
+syn keyword ngxDirectiveThirdParty contained dav_ext_lock_zone
 syn keyword ngxDirectiveThirdParty contained dav_ext_methods

 " ngx_eval
@ -895,6 +934,7 @@ syn keyword ngxDirectiveThirdParty contained fancyindex_directories_first
 syn keyword ngxDirectiveThirdParty contained fancyindex_exact_size
 syn keyword ngxDirectiveThirdParty contained fancyindex_footer
 syn keyword ngxDirectiveThirdParty contained fancyindex_header
+syn keyword ngxDirectiveThirdParty contained fancyindex_hide_parent_dir
 syn keyword ngxDirectiveThirdParty contained fancyindex_hide_symlinks
 syn keyword ngxDirectiveThirdParty contained fancyindex_ignore
 syn keyword ngxDirectiveThirdParty contained fancyindex_localtime
@ -937,8 +977,17 @@ syn keyword ngxDirectiveThirdParty contained notice_type

 " nchan
 " https://github.com/slact/nchan
+syn keyword ngxDirectiveThirdParty contained nchan_access_control_allow_credentials
 syn keyword ngxDirectiveThirdParty contained nchan_access_control_allow_origin
 syn keyword ngxDirectiveThirdParty contained nchan_authorize_request
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_channels
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_message_padding_bytes
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_messages_per_channel_per_minute
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_publisher_distribution
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_subscriber_distribution
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_subscribers_per_channel
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_time
 syn keyword ngxDirectiveThirdParty contained nchan_channel_event_string
 syn keyword ngxDirectiveThirdParty contained nchan_channel_events_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_channel_group
@ -974,15 +1023,19 @@ syn keyword ngxDirectiveThirdParty contained nchan_publisher_upstream_request
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub_location
+syn keyword ngxDirectiveThirdParty contained nchan_redis_connect_timeout
 syn keyword ngxDirectiveThirdParty contained nchan_redis_fakesub_timer_interval
 syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_cache_timeout
 syn keyword ngxDirectiveThirdParty contained nchan_redis_namespace
+syn keyword ngxDirectiveThirdParty contained nchan_redis_nostore_fastpublish
+syn keyword ngxDirectiveThirdParty contained nchan_redis_optimize_target
 syn keyword ngxDirectiveThirdParty contained nchan_redis_pass
 syn keyword ngxDirectiveThirdParty contained nchan_redis_pass_inheritable
 syn keyword ngxDirectiveThirdParty contained nchan_redis_ping_interval
 syn keyword ngxDirectiveThirdParty contained nchan_redis_publish_msgpacked_max_size
 syn keyword ngxDirectiveThirdParty contained nchan_redis_server
 syn keyword ngxDirectiveThirdParty contained nchan_redis_storage_mode
+syn keyword ngxDirectiveThirdParty contained nchan_redis_subscribe_weights
 syn keyword ngxDirectiveThirdParty contained nchan_redis_url
 syn keyword ngxDirectiveThirdParty contained nchan_redis_wait_after_connecting
 syn keyword ngxDirectiveThirdParty contained nchan_shared_memory_size
@ -1280,6 +1333,7 @@ syn keyword ngxDirectiveThirdParty contained lua_package_cpath
 syn keyword ngxDirectiveThirdParty contained lua_package_path
 syn keyword ngxDirectiveThirdParty contained lua_regex_cache_max_entries
 syn keyword ngxDirectiveThirdParty contained lua_regex_match_limit
+syn keyword ngxDirectiveThirdParty contained lua_sa_restart
 syn keyword ngxDirectiveThirdParty contained lua_shared_dict
 syn keyword ngxDirectiveThirdParty contained lua_socket_buffer_size
 syn keyword ngxDirectiveThirdParty contained lua_socket_connect_timeout
@ -1355,9 +1409,15 @@ syn keyword ngxDirectiveThirdParty contained rules_enabled
 " https://www.phusionpassenger.com/library/config/nginx/reference/
 syn keyword ngxDirectiveThirdParty contained passenger_abort_on_startup_error
 syn keyword ngxDirectiveThirdParty contained passenger_abort_websockets_on_process_shutdown
+syn keyword ngxDirectiveThirdParty contained passenger_admin_panel_auth_type
+syn keyword ngxDirectiveThirdParty contained passenger_admin_panel_password
+syn keyword ngxDirectiveThirdParty contained passenger_admin_panel_url
+syn keyword ngxDirectiveThirdParty contained passenger_admin_panel_username
+syn keyword ngxDirectiveThirdParty contained passenger_anonymous_telemetry_proxy
 syn keyword ngxDirectiveThirdParty contained passenger_app_env
 syn keyword ngxDirectiveThirdParty contained passenger_app_file_descriptor_ulimit
 syn keyword ngxDirectiveThirdParty contained passenger_app_group_name
+syn keyword ngxDirectiveThirdParty contained passenger_app_log_file
 syn keyword ngxDirectiveThirdParty contained passenger_app_rights
 syn keyword ngxDirectiveThirdParty contained passenger_app_root
 syn keyword ngxDirectiveThirdParty contained passenger_app_type
@ -1373,8 +1433,10 @@ syn keyword ngxDirectiveThirdParty contained passenger_data_buffer_dir
 syn keyword ngxDirectiveThirdParty contained passenger_debugger
 syn keyword ngxDirectiveThirdParty contained passenger_default_group
 syn keyword ngxDirectiveThirdParty contained passenger_default_user
+syn keyword ngxDirectiveThirdParty contained passenger_disable_anonymous_telemetry
 syn keyword ngxDirectiveThirdParty contained passenger_disable_security_update_check
 syn keyword ngxDirectiveThirdParty contained passenger_document_root
+syn keyword ngxDirectiveThirdParty contained passenger_dump_config_manifest
 syn keyword ngxDirectiveThirdParty contained passenger_enabled
 syn keyword ngxDirectiveThirdParty contained passenger_env_var
 syn keyword ngxDirectiveThirdParty contained passenger_file_descriptor_log_file
@ -1402,6 +1464,7 @@ syn keyword ngxDirectiveThirdParty contained passenger_max_requests
 syn keyword ngxDirectiveThirdParty contained passenger_memory_limit
 syn keyword ngxDirectiveThirdParty contained passenger_meteor_app_settings
 syn keyword ngxDirectiveThirdParty contained passenger_min_instances
+syn keyword ngxDirectiveThirdParty contained passenger_monitor_log_file
 syn keyword ngxDirectiveThirdParty contained passenger_nodejs
 syn keyword ngxDirectiveThirdParty contained passenger_pass_header
 syn keyword ngxDirectiveThirdParty contained passenger_pool_idle_time
@ -1778,6 +1841,8 @@ syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_by_host
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_by_set_key
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_check_duplicate
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_max_node
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_histogram_buckets
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_check_duplicate
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_traffic
@ -1899,11 +1964,11 @@ syn keyword ngxDirectiveThirdParty contained form_auth_remote_user

 " ngx_http_accounting_module
 " https://github.com/Lax/ngx_http_accounting_module
-syn keyword ngxDirectiveThirdParty contained http_accounting
-syn keyword ngxDirectiveThirdParty contained http_accounting_id
-syn keyword ngxDirectiveThirdParty contained http_accounting_interval
-syn keyword ngxDirectiveThirdParty contained http_accounting_log
-syn keyword ngxDirectiveThirdParty contained http_accounting_perturb
+syn keyword ngxDirectiveThirdParty contained accounting
+syn keyword ngxDirectiveThirdParty contained accounting_id
+syn keyword ngxDirectiveThirdParty contained accounting_interval
+syn keyword ngxDirectiveThirdParty contained accounting_log
+syn keyword ngxDirectiveThirdParty contained accounting_perturb

 " concatenating files in a given context: CSS and JS files usually
 " https://github.com/alibaba/nginx-http-concat
--- a/docs/CHANGES
+++ b/docs/CHANGES
@ -1,7 +1,263 @@

-Changes with nginx 1.14.0                                        17 Apr 2018
+Changes with nginx 1.16.1                                        13 Aug 2019

-    *) 1.14.x stable branch.
+    *) Security: when using HTTP/2 a client might cause excessive memory
+       consumption and CPU usage (CVE-2019-9511, CVE-2019-9513,
+       CVE-2019-9516).
+
+
+Changes with nginx 1.16.0                                        23 Apr 2019
+
+    *) 1.16.x stable branch.
+
+
+Changes with nginx 1.15.12                                       16 Apr 2019
+
+    *) Bugfix: a segmentation fault might occur in a worker process if
+       variables were used in the "ssl_certificate" or "ssl_certificate_key"
+       directives and OCSP stapling was enabled.
+
+
+Changes with nginx 1.15.11                                       09 Apr 2019
+
+    *) Bugfix: in the "ssl_stapling_file" directive on Windows.
+
+
+Changes with nginx 1.15.10                                       26 Mar 2019
+
+    *) Change: when using a hostname in the "listen" directive nginx now
+       creates listening sockets for all addresses the hostname resolves to
+       (previously, only the first address was used).
+
+    *) Feature: port ranges in the "listen" directive.
+
+    *) Feature: loading of SSL certificates and secret keys from variables.
+
+    *) Workaround: the $ssl_server_name variable might be empty when using
+       OpenSSL 1.1.1.
+
+    *) Bugfix: nginx/Windows could not be built with Visual Studio 2015 or
+       newer; the bug had appeared in 1.15.9.
+
+
+Changes with nginx 1.15.9                                        26 Feb 2019
+
+    *) Feature: variables support in the "ssl_certificate" and
+       "ssl_certificate_key" directives.
+
+    *) Feature: the "poll" method is now available on Windows when using
+       Windows Vista or newer.
+
+    *) Bugfix: if the "select" method was used on Windows and an error
+       occurred while establishing a backend connection, nginx waited for
+       the connection establishment timeout to expire.
+
+    *) Bugfix: the "proxy_upload_rate" and "proxy_download_rate" directives
+       in the stream module worked incorrectly when proxying UDP datagrams.
+
+
+Changes with nginx 1.15.8                                        25 Dec 2018
+
+    *) Feature: the $upstream_bytes_sent variable.
+       Thanks to Piotr Sikora.
+
+    *) Feature: new directives in vim syntax highlighting scripts.
+       Thanks to Gena Makhomed.
+
+    *) Bugfix: in the "proxy_cache_background_update" directive.
+
+    *) Bugfix: in the "geo" directive when using unix domain listen sockets.
+
+    *) Workaround: the "ignoring stale global SSL error ... bad length"
+       alerts might appear in logs when using the "ssl_early_data" directive
+       with OpenSSL.
+
+    *) Bugfix: in nginx/Windows.
+
+    *) Bugfix: in the ngx_http_autoindex_module on 32-bit platforms.
+
+
+Changes with nginx 1.15.7                                        27 Nov 2018
+
+    *) Feature: the "proxy_requests" directive in the stream module.
+
+    *) Feature: the "delay" parameter of the "limit_req" directive.
+       Thanks to Vladislav Shabanov and Peter Shchuchkin.
+
+    *) Bugfix: memory leak on errors during reconfiguration.
+
+    *) Bugfix: in the $upstream_response_time, $upstream_connect_time, and
+       $upstream_header_time variables.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if the
+       ngx_http_mp4_module was used on 32-bit platforms.
+
+
+Changes with nginx 1.15.6                                        06 Nov 2018
+
+    *) Security: when using HTTP/2 a client might cause excessive memory
+       consumption (CVE-2018-16843) and CPU usage (CVE-2018-16844).
+
+    *) Security: processing of a specially crafted mp4 file with the
+       ngx_http_mp4_module might result in worker process memory disclosure
+       (CVE-2018-16845).
+
+    *) Feature: the "proxy_socket_keepalive", "fastcgi_socket_keepalive",
+       "grpc_socket_keepalive", "memcached_socket_keepalive",
+       "scgi_socket_keepalive", and "uwsgi_socket_keepalive" directives.
+
+    *) Bugfix: if nginx was built with OpenSSL 1.1.0 and used with OpenSSL
+       1.1.1, the TLS 1.3 protocol was always enabled.
+
+    *) Bugfix: working with gRPC backends might result in excessive memory
+       consumption.
+
+
+Changes with nginx 1.15.5                                        02 Oct 2018
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using OpenSSL 1.1.0h or newer; the bug had appeared in 1.15.4.
+
+    *) Bugfix: of minor potential bugs.
+
+
+Changes with nginx 1.15.4                                        25 Sep 2018
+
+    *) Feature: now the "ssl_early_data" directive can be used with OpenSSL.
+
+    *) Bugfix: in the ngx_http_uwsgi_module.
+       Thanks to Chris Caputo.
+
+    *) Bugfix: connections with some gRPC backends might not be cached when
+       using the "keepalive" directive.
+
+    *) Bugfix: a socket leak might occur when using the "error_page"
+       directive to redirect early request processing errors, notably errors
+       with code 400.
+
+    *) Bugfix: the "return" directive did not change the response code when
+       returning errors if the request was redirected by the "error_page"
+       directive.
+
+    *) Bugfix: standard error pages and responses of the
+       ngx_http_autoindex_module module used the "bgcolor" attribute, and
+       might be displayed incorrectly when using custom color settings in
+       browsers.
+       Thanks to Nova DasSarma.
+
+    *) Change: the logging level of the "no suitable key share" and "no
+       suitable signature algorithm" SSL errors has been lowered from "crit"
+       to "info".
+
+
+Changes with nginx 1.15.3                                        28 Aug 2018
+
+    *) Feature: now TLSv1.3 can be used with BoringSSL.
+
+    *) Feature: the "ssl_early_data" directive, currently available with
+       BoringSSL.
+
+    *) Feature: the "keepalive_timeout" and "keepalive_requests" directives
+       in the "upstream" block.
+
+    *) Bugfix: the ngx_http_dav_module did not truncate destination file
+       when copying a file over an existing one with the COPY method.
+
+    *) Bugfix: the ngx_http_dav_module used zero access rights on the
+       destination file and did not preserve file modification time when
+       moving a file between different file systems with the MOVE method.
+
+    *) Bugfix: the ngx_http_dav_module used default access rights when
+       copying a file with the COPY method.
+
+    *) Workaround: some clients might not work when using HTTP/2; the bug
+       had appeared in 1.13.5.
+
+    *) Bugfix: nginx could not be built with LibreSSL 2.8.0.
+
+
+Changes with nginx 1.15.2                                        24 Jul 2018
+
+    *) Feature: the $ssl_preread_protocol variable in the
+       ngx_stream_ssl_preread_module.
+
+    *) Feature: now when using the "reset_timedout_connection" directive
+       nginx will reset connections being closed with the 444 code.
+
+    *) Change: a logging level of the "http request", "https proxy request",
+       "unsupported protocol", and "version too low" SSL errors has been
+       lowered from "crit" to "info".
+
+    *) Bugfix: DNS requests were not resent if initial sending of a request
+       failed.
+
+    *) Bugfix: the "reuseport" parameter of the "listen" directive was
+       ignored if the number of worker processes was specified after the
+       "listen" directive.
+
+    *) Bugfix: when using OpenSSL 1.1.0 or newer it was not possible to
+       switch off "ssl_prefer_server_ciphers" in a virtual server if it was
+       switched on in the default server.
+
+    *) Bugfix: SSL session reuse with upstream servers did not work with the
+       TLS 1.3 protocol.
+
+
+Changes with nginx 1.15.1                                        03 Jul 2018
+
+    *) Feature: the "random" directive inside the "upstream" block.
+
+    *) Feature: improved performance when using the "hash" and "ip_hash"
+       directives with the "zone" directive.
+
+    *) Feature: the "reuseport" parameter of the "listen" directive now uses
+       SO_REUSEPORT_LB on FreeBSD 12.
+
+    *) Bugfix: HTTP/2 server push did not work if SSL was terminated by a
+       proxy server in front of nginx.
+
+    *) Bugfix: the "tcp_nopush" directive was always used on backend
+       connections.
+
+    *) Bugfix: sending a disk-buffered request body to a gRPC backend might
+       fail.
+
+
+Changes with nginx 1.15.0                                        05 Jun 2018
+
+    *) Change: the "ssl" directive is deprecated; the "ssl" parameter of the
+       "listen" directive should be used instead.
+
+    *) Change: now nginx detects missing SSL certificates during
+       configuration testing when using the "ssl" parameter of the "listen"
+       directive.
+
+    *) Feature: now the stream module can handle multiple incoming UDP
+       datagrams from a client within a single session.
+
+    *) Bugfix: it was possible to specify an incorrect response code in the
+       "proxy_cache_valid" directive.
+
+    *) Bugfix: nginx could not be built by gcc 8.1.
+
+    *) Bugfix: logging to syslog stopped on local IP address changes.
+
+    *) Bugfix: nginx could not be built by clang with CUDA SDK installed;
+       the bug had appeared in 1.13.8.
+
+    *) Bugfix: "getsockopt(TCP_FASTOPEN) ... failed" messages might appear
+       in logs during binary upgrade when using unix domain listen sockets
+       on FreeBSD.
+
+    *) Bugfix: nginx could not be built on Fedora 28 Linux.
+
+    *) Bugfix: request processing rate might exceed configured rate when
+       using the "limit_req" directive.
+
+    *) Bugfix: in handling of client addresses when using unix domain listen
+       sockets to work with datagrams on Linux.
+
+    *) Bugfix: in memory allocation error handling.


 Changes with nginx 1.13.12                                       10 Apr 2018
--- a/docs/CHANGES.ru
+++ b/docs/CHANGES.ru
@ -1,7 +1,271 @@

-Изменения в nginx 1.14.0                                          17.04.2018
+Изменения в nginx 1.16.1                                          13.08.2019

-    *) Стабильная ветка 1.14.x.
+    *) Безопасность: при использовании HTTP/2 клиент мог вызвать чрезмерное
+       потребление памяти и ресурсов процессора (CVE-2019-9511,
+       CVE-2019-9513, CVE-2019-9516).
+
+
+Изменения в nginx 1.16.0                                          23.04.2019
+
+    *) Стабильная ветка 1.16.x.
+
+
+Изменения в nginx 1.15.12                                         16.04.2019
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если в директивах ssl_certificate или ssl_certificate_key
+       использовались переменные и был включён OCSP stapling.
+
+
+Изменения в nginx 1.15.11                                         09.04.2019
+
+    *) Исправление: в директиве ssl_stapling_file на Windows.
+
+
+Изменения в nginx 1.15.10                                         26.03.2019
+
+    *) Изменение: теперь при использовании имени хоста в директиве listen
+       nginx создаёт listen-сокеты для всех адресов, соответствующих этому
+       имени (ранее использовался только первый адрес).
+
+    *) Добавление: диапазоны портов в директиве listen.
+
+    *) Добавление: возможность загрузки SSL-сертификатов и секретных ключей
+       из переменных.
+
+    *) Изменение: переменная $ssl_server_name могла быть пустой при
+       использовании OpenSSL 1.1.1.
+
+    *) Исправление: nginx/Windows не собирался с Visual Studio 2015 и новее;
+       ошибка появилась в 1.15.9.
+
+
+Изменения в nginx 1.15.9                                          26.02.2019
+
+    *) Добавление: директивы ssl_certificate и ssl_certificate_key
+       поддерживают переменные.
+
+    *) Добавление: метод poll теперь доступен на Windows при использовании
+       Windows Vista и новее.
+
+    *) Исправление: если при использовании метода select на Windows
+       происходила ошибка при установлении соединения с бэкендом, nginx
+       ожидал истечения таймаута на установление соединения.
+
+    *) Исправление: директивы proxy_upload_rate и proxy_download_rate в
+       модуле stream работали некорректно при проксировании UDP-пакетов.
+
+
+Изменения в nginx 1.15.8                                          25.12.2018
+
+    *) Добавление: переменная $upstream_bytes_sent.
+       Спасибо Piotr Sikora.
+
+    *) Добавление: новые директивы в скриптах подсветки синтаксиса для vim.
+       Спасибо Геннадию Махомеду.
+
+    *) Исправление: в директиве proxy_cache_background_update.
+
+    *) Исправление: в директиве geo при использовании unix domain
+       listen-сокетов.
+
+    *) Изменение: при использовании директивы ssl_early_data с OpenSSL в
+       логах могли появляться сообщения "ignoring stale global SSL error ...
+       bad length".
+
+    *) Исправление: в nginx/Windows.
+
+    *) Исправление: в модуле ngx_http_autoindex_module на 32-битных
+       платформах.
+
+
+Изменения в nginx 1.15.7                                          27.11.2018
+
+    *) Добавление: директива proxy_requests в модуле stream.
+
+    *) Добавление: параметр "delay" директивы "limit_req".
+       Спасибо Владиславу Шабанову и Петру Щучкину.
+
+    *) Исправление: утечки памяти в случае ошибок при переконфигурации.
+
+    *) Исправление: в переменных $upstream_response_time,
+       $upstream_connect_time и $upstream_header_time.
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если использовался модуль ngx_http_mp4_module на 32-битных
+       платформах.
+
+
+Изменения в nginx 1.15.6                                          06.11.2018
+
+    *) Безопасность: при использовании HTTP/2 клиент мог вызвать чрезмерное
+       потреблению памяти (CVE-2018-16843) и ресурсов процессора
+       (CVE-2018-16844).
+
+    *) Безопасность: при обработке специально созданного mp4-файла модулем
+       ngx_http_mp4_module содержимое памяти рабочего процесса могло быть
+       отправлено клиенту (CVE-2018-16845).
+
+    *) Добавление: директивы proxy_socket_keepalive,
+       fastcgi_socket_keepalive, grpc_socket_keepalive,
+       memcached_socket_keepalive, scgi_socket_keepalive и
+       uwsgi_socket_keepalive.
+
+    *) Исправление: если nginx был собран с OpenSSL 1.1.0, а использовался с
+       OpenSSL 1.1.1, протокол TLS 1.3 всегда был разрешён.
+
+    *) Исправление: при работе с gRPC-бэкендами могло расходоваться большое
+       количество памяти.
+
+
+Изменения в nginx 1.15.5                                          02.10.2018
+
+    *) Исправление: при использовании OpenSSL 1.1.0h и новее в рабочем
+       процессе мог произойти segmentation fault; ошибка появилась в 1.15.4.
+
+    *) Исправление: незначительных потенциальных ошибок.
+
+
+Изменения в nginx 1.15.4                                          25.09.2018
+
+    *) Добавление: теперь директиву ssl_early_data можно использовать с
+       OpenSSL.
+
+    *) Исправление: в модуле ngx_http_uwsgi_module.
+       Спасибо Chris Caputo.
+
+    *) Исправление: соединения к некоторым gRPC-бэкендам могли не
+       кэшироваться при использовании директивы keepalive.
+
+    *) Исправление: при использовании директивы error_page для
+       перенаправления ошибок, возникающих на ранних этапах обработки
+       запроса, в частности ошибок с кодом 400, могла происходить утечка
+       сокетов.
+
+    *) Исправление: директива return при возврате ошибок не изменяла код
+       ответа, если запрос был перенаправлен с помощью директивы error_page.
+
+    *) Исправление: стандартные сообщения об ошибках и ответы модуля
+       ngx_http_autoindex_module содержали атрибут bgcolor, что могло
+       приводить к их некорректному отображению при использовании
+       пользовательских настроек цветов в браузерах.
+       Спасибо Nova DasSarma.
+
+    *) Изменение: уровень логгирования ошибок SSL "no suitable key share" и
+       "no suitable signature algorithm" понижен с уровня crit до info.
+
+
+Изменения в nginx 1.15.3                                          28.08.2018
+
+    *) Добавление: теперь TLSv1.3 можно использовать с BoringSSL.
+
+    *) Добавление: директива ssl_early_data, сейчас доступна при
+       использовании BoringSSL.
+
+    *) Добавление: директивы keepalive_timeout и keepalive_requests в блоке
+       upstream.
+
+    *) Исправление: модуль ngx_http_dav_module при копировании файла поверх
+       существующего файла с помощью метода COPY не обнулял целевой файл.
+
+    *) Исправление: модуль ngx_http_dav_module при перемещении файла между
+       файловыми системами с помощью метода MOVE устанавливал нулевые права
+       доступа на результирующий файл и не сохранял время изменения файла.
+
+    *) Исправление: модуль ngx_http_dav_module при копировании файла с
+       помощью метода COPY для результирующего файла использовал права
+       доступа по умолчанию.
+
+    *) Изменение: некоторые клиенты могли не работать при использовании
+       HTTP/2; ошибка появилась в 1.13.5.
+
+    *) Исправление: nginx не собирался с LibreSSL 2.8.0.
+
+
+Изменения в nginx 1.15.2                                          24.07.2018
+
+    *) Добавление: переменная $ssl_preread_protocol в модуле
+       ngx_stream_ssl_preread_module.
+
+    *) Добавление: теперь при использовании директивы
+       reset_timedout_connection nginx сбрасывает соединения, закрываемые с
+       кодом 444.
+
+    *) Изменение: уровень логгирования ошибок SSL "http request", "https
+       proxy request", "unsupported protocol" и "version too low" понижен с
+       уровня crit до info.
+
+    *) Исправление: запросы к DNS-серверу не отправлялись повторно, если при
+       первой попытке отправки происходила ошибка.
+
+    *) Исправление: параметр reuseport директивы listen игнорировался, если
+       количество рабочих процессов было задано после директивы listen.
+
+    *) Исправление: при использовании OpenSSL 1.1.0 и новее директиву
+       ssl_prefer_server_ciphers нельзя было выключить в виртуальном
+       сервере, если она была включена в сервере по умолчанию.
+
+    *) Исправление: повторное использование SSL-сессий к бэкендам не
+       работало с протоколом TLS 1.3.
+
+
+Изменения в nginx 1.15.1                                          03.07.2018
+
+    *) Добавление: директива random в блоке upstream.
+
+    *) Добавление: улучшена производительность при использовании директив
+       hash и ip_hash совместно с директивой zone.
+
+    *) Добавление: параметр reuseport директивы listen теперь использует
+       SO_REUSEPORT_LB на FreeBSD 12.
+
+    *) Исправление: HTTP/2 server push не работал, если SSL терминировался
+       прокси-сервером перед nginx'ом.
+
+    *) Исправление: директива tcp_nopush всегда использовалась для
+       соединений к бэкендам.
+
+    *) Исправление: при отправке сохранённого на диск тела запроса на
+       gRPC-бэкенд могли возникать ошибки.
+
+
+Изменения в nginx 1.15.0                                          05.06.2018
+
+    *) Изменение: директива "ssl" теперь считается устаревшей; вместо неё
+       следует использовать параметр ssl директивы listen.
+
+    *) Изменение: теперь при использовании директивы listen с параметром ssl
+       nginx определяет отсутствие SSL-сертификатов при тестировании
+       конфигурации.
+
+    *) Добавление: теперь модуль stream умеет обрабатывать несколько
+       входящих UDP-пакетов от клиента в рамках одной сессии.
+
+    *) Исправление: в директиве proxy_cache_valid можно было указать
+       некорректный код ответа.
+
+    *) Исправление: nginx не собирался gcc 8.1.
+
+    *) Исправление: логгирование в syslog останавливалось при изменении
+       локального IP-адреса.
+
+    *) Исправление: nginx не собирался компилятором clang, если был
+       установлен CUDA SDK; ошибка появилась в 1.13.8.
+
+    *) Исправление: при использовании unix domain listen-сокетов на FreeBSD
+       в процессе обновления исполняемого файла в логе могли появляться
+       сообщения "getsockopt(TCP_FASTOPEN) ... failed".
+
+    *) Исправление: nginx не собирался на Fedora 28 Linux.
+
+    *) Исправление: при использовании директивы limit_req заданная скорость
+       обработки запросов могла не соблюдаться.
+
+    *) Исправление: в обработке адресов клиентов при использовании unix
+       domain listen-сокетов для работы с датаграммами на Linux.
+
+    *) Исправление: в обработке ошибок выделения памяти.


 Изменения в nginx 1.13.12                                         10.04.2018
--- a/docs/LICENSE
+++ b/docs/LICENSE
@ -1,6 +1,6 @@
 /* 
- * Copyright (C) 2002-2018 Igor Sysoev
- * Copyright (C) 2011-2018 Nginx, Inc.
+ * Copyright (C) 2002-2019 Igor Sysoev
+ * Copyright (C) 2011-2019 Nginx, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/docs/OpenSSL.LICENSE
+++ b/docs/OpenSSL.LICENSE
@ -4,22 +4,20 @@

  The OpenSSL toolkit stays under a double license, i.e. both the conditions of
  the OpenSSL License and the original SSLeay license apply to the toolkit.
-  See below for the actual license texts. Actually both licenses are BSD-style
-  Open Source licenses. In case of any license issues related to OpenSSL
-  please contact openssl-core@openssl.org.
+  See below for the actual license texts.

  OpenSSL License
  ---------------

 /* ====================================================================
- * Copyright (c) 1998-2018 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
@ -74,21 +72,21 @@
 * This package is an SSL implementation written
 * by Eric Young (eay@cryptsoft.com).
 * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
 * This library is free for commercial and non-commercial use as long as
 * the following conditions are aheared to.  The following conditions
 * apply to all code found in this distribution, be it the RC4, RSA,
 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
 * included with this distribution is covered by the same copyright terms
 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
 * Copyright remains Eric Young's, and as such any Copyright notices in
 * the code are not to be removed.
 * If this package is used in a product, Eric Young should be given attribution
 * as the author of the parts of the library used.
 * This can be in the form of a textual message at program startup or
 * in documentation (online or textual) provided with the package.
- * 
+ *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
@ -103,10 +101,10 @@
 *     Eric Young (eay@cryptsoft.com)"
 *    The word 'cryptographic' can be left out if the rouines from the library
 *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
 *    the apps directory (application code) you must include an acknowledgement:
 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@ -118,7 +116,7 @@
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
- * 
+ *
 * The licence and distribution terms for any publically available version or
 * derivative of this code cannot be changed.  i.e. this code cannot simply be
 * copied and put under another distribution licence
--- a/docs/PCRE.LICENCE
+++ b/docs/PCRE.LICENCE
@ -25,7 +25,7 @@ Email domain:     cam.ac.uk
 University of Cambridge Computing Service,
 Cambridge, England.

-Copyright (c) 1997-2018 University of Cambridge
+Copyright (c) 1997-2019 University of Cambridge
 All rights reserved.


@ -34,9 +34,9 @@ PCRE JUST-IN-TIME COMPILATION SUPPORT

 Written by:       Zoltan Herczeg
 Email local part: hzmester
-Emain domain:     freemail.hu
+Email domain:     freemail.hu

-Copyright(c) 2010-2018 Zoltan Herczeg
+Copyright(c) 2010-2019 Zoltan Herczeg
 All rights reserved.


@ -45,9 +45,9 @@ STACK-LESS JUST-IN-TIME COMPILER

 Written by:       Zoltan Herczeg
 Email local part: hzmester
-Emain domain:     freemail.hu
+Email domain:     freemail.hu

-Copyright(c) 2009-2018 Zoltan Herczeg
+Copyright(c) 2009-2019 Zoltan Herczeg
 All rights reserved.


--- a/128
+++ b/128
@ -1,3 +1,8 @@
+#UTF-8 encoded 
+#www.google.com域名仅用于登陆验证
+#如果你不需要这个功能，请把下一行删掉
+127.0.0.1       www.google.com
+
 #Pixiv Start
 127.0.0.1       pixiv.net 
 127.0.0.1       www.pixiv.net 
@ -15,28 +20,111 @@
 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       source.pixiv.net
+127.0.0.1       i1.pixiv.net 
+127.0.0.1       i2.pixiv.net 
+127.0.0.1       i3.pixiv.net 
+127.0.0.1       i4.pixiv.net
+127.0.0.1       hls1.pixivsketch.net
+127.0.0.1       hls2.pixivsketch.net
+127.0.0.1       hls3.pixivsketch.net
+127.0.0.1       hls4.pixivsketch.net
+127.0.0.1       hls5.pixivsketch.net
+127.0.0.1       hls6.pixivsketch.net
+127.0.0.1       hls7.pixivsketch.net
+127.0.0.1       hls8.pixivsketch.net
+127.0.0.1       hls9.pixivsketch.net
+127.0.0.1       hls10.pixivsketch.net
+127.0.0.1       hls11.pixivsketch.net
+127.0.0.1       hls12.pixivsketch.net
+127.0.0.1       hls13.pixivsketch.net
+127.0.0.1       hls14.pixivsketch.net
+127.0.0.1       hls15.pixivsketch.net
+127.0.0.1       hls16.pixivsketch.net
+127.0.0.1       hls17.pixivsketch.net
+127.0.0.1       hls18.pixivsketch.net
+127.0.0.1       hls19.pixivsketch.net
+127.0.0.1       hls20.pixivsketch.net
+127.0.0.1       hlsa1.pixivsketch.net
+127.0.0.1       hlsa2.pixivsketch.net
+127.0.0.1       hlsa3.pixivsketch.net
+127.0.0.1       hlsa4.pixivsketch.net
+127.0.0.1       hlsa5.pixivsketch.net
+127.0.0.1       hlsa6.pixivsketch.net
+127.0.0.1       hlsa7.pixivsketch.net
+127.0.0.1       hlsa8.pixivsketch.net
+127.0.0.1       hlsa10.pixivsketch.net
+127.0.0.1       hlsa11.pixivsketch.net
+127.0.0.1       hlsa12.pixivsketch.net
+127.0.0.1       hlsa13.pixivsketch.net
+127.0.0.1       hlsa14.pixivsketch.net
+127.0.0.1       hlsa15.pixivsketch.net
+127.0.0.1       hlsa16.pixivsketch.net
+127.0.0.1       hlsa17.pixivsketch.net
+127.0.0.1       hlsa18.pixivsketch.net
+127.0.0.1       hlsa19.pixivsketch.net
+127.0.0.1       hlsc1.pixivsketch.net
+127.0.0.1       hlsc2.pixivsketch.net
+127.0.0.1       hlsc3.pixivsketch.net
+127.0.0.1       hlsc4.pixivsketch.net
+127.0.0.1       hlsc5.pixivsketch.net
+127.0.0.1       hlsc6.pixivsketch.net
+127.0.0.1       hlse1.pixivsketch.net
+127.0.0.1       hlse2.pixivsketch.net
+127.0.0.1       hlse3.pixivsketch.net
+127.0.0.1       hlse4.pixivsketch.net
+127.0.0.1       hlse5.pixivsketch.net
+127.0.0.1       hlse6.pixivsketch.net
+127.0.0.1       hlse7.pixivsketch.net
+127.0.0.1       hlse8.pixivsketch.net
+127.0.0.1       hlse9.pixivsketch.net
+127.0.0.1       hlst1.pixivsketch.net
 127.0.0.1       i.pximg.net
-210.140.131.145 source.pixiv.net
-210.129.120.50  app-api.pixiv.net  
-74.120.148.207  g-client-proxy.pixiv.net 
-210.140.131.145 i1.pixiv.net 
-210.140.131.145 i2.pixiv.net 
-210.140.131.145 i3.pixiv.net 
-210.140.131.145 i4.pixiv.net 
+127.0.0.1       app-api.pixiv.net  
+13.226.113.16    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.140.92.140  pixiv.pximg.net  
+210.140.92.139  s.pximg.net
+210.140.131.246  api.booth.pm
+210.140.131.220  myaccount.pixiv.net
 #Pixiv End

-# 顺手修一下维基百科
+# 顺手修一下维基百科
 # Wikipedia Start
-127.0.0.1 zh.wikipedia.org #中文维基百科桌面版
-127.0.0.1 zh-yue.wikipedia.org #粤文维基百科桌面版
-127.0.0.1 wuu.wikipedia.org #吴语维基百科桌面版
-127.0.0.1 ug.wikipedia.org #维吾尔文维基百科桌面版
-127.0.0.1 ja.wikipedia.org #日文维基百科桌面版
-127.0.0.1 zh.wikinews.org #中文维基新闻桌面版
-127.0.0.1 zh.m.wikipedia.org #中文维基百科移动版
-127.0.0.1 ug.m.wikipedia.org #维吾尔文维基百科移动版
-127.0.0.1 zh.m.wikinews.org #中文维基新闻移动版
-# Wikipedia End
+127.0.0.1 en.wikipedia.org
+127.0.0.1 zh.wikipedia.org #中文维基百科桌面版
+127.0.0.1 en.m.wikipedia.org
+127.0.0.1 zh.m.wikipedia.org
+127.0.0.1 zh-yue.wikipedia.org #粤文维基百科桌面版
+127.0.0.1 wuu.wikipedia.org #吴语维基百科桌面版
+127.0.0.1 ug.wikipedia.org #维吾尔文维基百科桌面版
+127.0.0.1 ja.wikipedia.org #日文维基百科桌面版
+127.0.0.1 zh.wikinews.org #中文维基新闻桌面版
+# Wikipedia End
+
+# Wikimedia Start
+127.0.0.1 wikimedia.org
+127.0.0.1 upload.wikimedia.org
+# Wikimedia End
+
+# 顺手修一下Steam
+# Steam Start
+127.0.0.1 store.steampowered.com
+127.0.0.1 steamcommunity.com
+# Steam end
+
+# AO3 Start
+127.0.0.1 archiveofourown.org
+# AO3 end
+
+# Exhentai Start
+127.0.0.1 exhentai.org
+127.0.0.1 e-hentai.org
+127.0.0.1 forums.e-hentai.org
+# Exhentai end
+
+# Nyaa Start
+127.0.0.1	nyaa.si
+127.0.0.1	www.nyaa.si
+127.0.0.1	sukebei.nyaa.si
+# Nyaae End
--- a/html/50x.html
+++ b/html/50x.html
@ -15,7 +15,7 @@
 <p>Sorry, the page you are looking for is currently unavailable.<br/>
 Please try again later.</p>
 <p>If you are the system administrator of this resource then you should check
-the <a href="http://nginx.org/r/error_log">error log</a> for details.</p>
+the error log for details.</p>
 <p><em>Faithfully yours, nginx.</em></p>
 </body>
 </html>
--- a/logs/nginx.pid
+++ b/logs/nginx.pid
@ -1 +1 @@
-2180
+4624
--- a/nginx.exe
+++ b/nginx.exe
--- a/图片无法显示备用配置/nginx.conf
+++ b/图片无法显示备用配置/nginx.conf
@ -0,0 +1,249 @@
+
+#user  nobody;
+worker_processes  1;
+
+#error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
+#pid        logs/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+    
+    server_names_hash_max_size 512;
+    server_names_hash_bucket_size 1024;
+
+    #gzip  on;
+    
+    upstream www-pixiv-net { 
+        server 210.140.131.182:443;
+        server 210.140.131.180:443;
+        server 210.140.131.184:443;
+    }
+    
+    upstream sketch-pixiv-net { 
+        server 210.140.174.37:443;
+        server 210.140.170.179:443;
+        server 210.140.175.130:443;
+    }
+    
+    upstream imgaz-pixiv-net { 
+        server 210.140.131.145:443;
+        server 210.140.131.144:443;
+        server 210.140.131.147:443;
+        server 210.140.131.153:443;
+    }
+    
+    upstream i-pximg-net { 
+        server 210.140.92.140:443;
+        server 210.140.92.137:443;
+        server 210.140.92.139:443;
+        server 210.140.92.142:443;
+        server 210.140.92.134:443;
+        server 210.140.92.141:443;
+        server 210.140.92.143:443;
+        server 210.140.92.135:443;
+        server 210.140.92.136:443; 
+    }
+    
+    server {
+        listen 80 default_server;  
+        rewrite ^(.*) https://$host$1 permanent;
+    }
+
+    server {
+        listen 443 ssl;
+        server_name pixiv.net;
+        server_name www.pixiv.net;
+        server_name ssl.pixiv.net;
+        server_name accounts.pixiv.net;
+        server_name touch.pixiv.net;
+        server_name oauth.secure.pixiv.net;
+
+        ssl on;
+        ssl_certificate ca/pixiv.net.crt;
+        ssl_certificate_key ca/pixiv.net.key;
+        
+        client_max_body_size 50M;
+        
+    	location / {
+            proxy_pass https://www-pixiv-net;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Real_IP $remote_addr;
+            proxy_set_header User-Agent $http_user_agent;
+            proxy_set_header Accept-Encoding ''; 
+            proxy_buffering off;
+        }
+	}
+    
+    server {
+        listen 443 ssl;
+        server_name i.pximg.net;
+
+        ssl on;
+        ssl_certificate ca/pixiv.net.crt;
+        ssl_certificate_key ca/pixiv.net.key;
+        
+    	location / {
+            rewrite ^/(.*)$ https://i.pixiv.cat/$1 redirect;
+        }
+	}
+    
+    server {
+        listen 443 ssl;
+        server_name sketch.pixiv.net;
+
+        ssl on;
+        ssl_certificate ca/pixiv.net.crt;
+        ssl_certificate_key ca/pixiv.net.key;
+
+    	location / {
+            proxy_pass https://sketch-pixiv-net;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Real_IP $remote_addr;
+            proxy_set_header User-Agent $http_user_agent;
+            proxy_set_header Accept-Encoding ''; 
+            proxy_buffering off;
+        }
+        
+        # Proxying WebSockets
+        location /ws/ {
+            proxy_pass https://sketch-pixiv-net;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host $host;
+        }
+	}
+    
+    server {
+        listen 443 ssl;
+        server_name factory.pixiv.net;
+
+        ssl on;
+        ssl_certificate ca/pixiv.net.crt;
+        ssl_certificate_key ca/pixiv.net.key;
+
+    	location / {
+            proxy_pass https://210.140.131.180/;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Real_IP $remote_addr;
+            proxy_set_header User-Agent $http_user_agent;
+            proxy_set_header Accept-Encoding ''; 
+            proxy_buffering off;
+        }
+	}
+    
+    server {
+        listen 443 ssl;
+        server_name dic.pixiv.net;
+        server_name en-dic.pixiv.net;
+        server_name sensei.pixiv.net;
+        server_name fanbox.pixiv.net;
+        server_name payment.pixiv.net.pixiv.net;
+
+        ssl on;
+        ssl_certificate ca/pixiv.net.crt;
+        ssl_certificate_key ca/pixiv.net.key;
+        
+    	location / {
+            proxy_pass https://210.140.131.222/;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Real_IP $remote_addr;
+            proxy_set_header User-Agent $http_user_agent;
+            proxy_set_header Accept-Encoding ''; 
+            proxy_buffering off;
+        }
+	}
+    
+    server {
+        listen 443 ssl;
+        server_name imgaz.pixiv.net;
+        server_name comic.pixiv.net;
+        server_name novel.pixiv.net;
+        server_name source.pixiv.net;
+        server_name i1.pixiv.net;
+        server_name i2.pixiv.net;
+        server_name i3.pixiv.net;
+        server_name i4.pixiv.net;
+
+        ssl on;
+        ssl_certificate ca/pixiv.net.crt;
+        ssl_certificate_key ca/pixiv.net.key;
+        
+    	location / {
+            proxy_pass https://imgaz-pixiv-net;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Real_IP $remote_addr;
+            proxy_set_header User-Agent $http_user_agent;
+            proxy_set_header Accept-Encoding ''; 
+            proxy_buffering off;
+        }
+	}
+
+    server {
+        listen 443 ssl;
+        server_name zh.wikipedia.org;
+        server_name zh-yue.wikipedia.org;
+        server_name wuu.wikipedia.org;
+        server_name ug.wikipedia.org;
+        server_name ja.wikipedia.org;
+        server_name zh.wikinews.org;
+        server_name zh.m.wikipedia.org;
+        server_name ug.m.wikipedia.org;
+        server_name zh.m.wikinews.org;
+
+        ssl on;
+        ssl_certificate ca/pixiv.net.crt;
+        ssl_certificate_key ca/pixiv.net.key;
+        
+    	location / {
+            proxy_pass https://103.102.166.224/;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Real_IP $remote_addr;
+            proxy_set_header User-Agent $http_user_agent;
+            proxy_set_header Accept-Encoding ''; 
+            proxy_buffering off;
+        }
+	}
+    
+    server {
+        listen 443 ssl;
+        server_name  www.google.com;
+        
+        ssl on;
+        ssl_certificate ca/pixiv.net.crt;
+        ssl_certificate_key ca/pixiv.net.key;
+
+        location / {
+            rewrite ^/(.*)$ https://pages.shino.cc/$1 redirect;
+        }
+    }
+    
+}
--- a/图片无法显示备用配置/使用方法.txt
+++ b/图片无法显示备用配置/使用方法.txt
@ -0,0 +1 @@
+用本文件夹内的 nginx.conf 替换根目录 conf 文件夹中的 nginx.conf 文件
--- a/自签证书傻瓜式批处理包/config_childCA.txt
+++ b/自签证书傻瓜式批处理包/config_childCA.txt
@ -0,0 +1,51 @@
+[ req ]
+default_bits				= 2048
+
+prompt					= no
+distinguished_name			= req_distinguished_name
+req_extensions				= v3_req
+
+[ req_distinguished_name ]
+countryName				= CN
+organizationName			= FuckGFW Foundation
+commonName				= PixivCA
+
+[ alternate_names ]
+DNS.01 = *.pixiv.net
+DNS.02 = pixiv.net
+DNS.03 = *.secure.pixiv.net
+DNS.04 = pixivision.net
+DNS.05 = *.pixivision.net
+DNS.06 = pixiv.me
+DNS.07 = *.pixiv.me
+DNS.08 = pximg.net
+DNS.09 = *.pximg.net
+DNS.10 = pixivsketch.net
+DNS.11 = *.pixivsketch.net
+DNS.12 = public-api.secure.pixiv.net
+DNS.13 = wikipedia.org
+DNS.14 = *.wikipedia.org
+DNS.15 = m.wikipedia.org
+DNS.16 = *.m.wikipedia.org
+DNS.17 = google.com
+DNS.18 = *.google.com
+DNS.19 = steamcommunity.com
+DNS.20 = *.steamcommunity.com
+DNS.21 = steampowered.com
+DNS.22 = *.steampowered.com
+DNS.23 = archiveofourown.org
+DNS.24 = *.archiveofourown.org
+DNS.25 = nyaa.si
+DNS.26 = *.nyaa.si
+DNS.27 = wikimedia.org
+DNS.28 = upload.wikimedia.org
+DNS.29 = exhentai.org
+DNS.30 = e-hentai.org
+DNS.31 = forums.e-hentai.org
+
+[ v3_req ]
+keyUsage				= digitalSignature
+extendedKeyUsage			= serverAuth,clientAuth
+basicConstraints			= CA:false
+subjectAltName				= @alternate_names
+subjectKeyIdentifier			= hash
--- a/自签证书傻瓜式批处理包/config_rootCA.txt
+++ b/自签证书傻瓜式批处理包/config_rootCA.txt
@ -0,0 +1,17 @@
+[ req ]
+default_bits			= 2048
+
+prompt				= no
+distinguished_name		= req_distinguished_name
+v3_extensions			= v3_ext
+
+[ req_distinguished_name ]
+countryName			= CN
+organizationName		= FuckGFW Foundation
+commonName			= Pixiv.net
+
+[ v3_ext ]
+keyUsage			= keyCertSign,cRLSign
+basicConstraints		= CA:true
+subjectKeyIdentifier		= hash
+authorityKeyIdentifier		= keyid,issuer
--- a/自签证书傻瓜式批处理包/config_signCA.txt
+++ b/自签证书傻瓜式批处理包/config_signCA.txt
@ -0,0 +1,24 @@
+[ ca ]
+default_ca		= myca
+
+[ myca ]
+serial			= ./crtserial.srl
+database		= ./index.txt
+new_certs_dir		= ./
+certificate		= ./rootCA.crt
+private_key		= ./rootCA.key
+default_md		= sha256
+default_days		= 365
+unique_subject		= no
+policy			= my_policy
+copy_extensions		= copy
+
+
+[ my_policy ]
+countryName		= optional
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
--- a/自签证书傻瓜式批处理包/★使用说明★.txt
+++ b/自签证书傻瓜式批处理包/★使用说明★.txt
@ -0,0 +1,5 @@
+1.下载 OpenSSL（https://slproweb.com/products/Win32OpenSSL.html）安装，设置为「环境变量」（自行百度，只要在CMD中输入openssl有反应就行，而不是「'openssl' 不是内部或外部命令，也不是可运行的程序或批处理文件」）。
+
+2.第一次使用时直接使用「【限初次使用】一键生成根证书和子证书.bat」并将rootCA.crt安装到系统受信任的根证书列表即可，生成的Pixiv.key和Pixiv.crt可替换软件自带的CA。
+
+3.需要添加域名时打开「config_childCA.txt」加入，完后使用「【修改config_childCA.txt后使用】重新签发子证书.bat」，将新生成的Pixiv.crt替换Nginx目录原先的文件，在系统host文件添加「127.0.0.1 域名」的字段, 并修改根目录「/conf/pixiv.conf」。
--- a/自签证书傻瓜式批处理包/【修改config_childCA.txt后使用】重新签发子证书.bat
+++ b/自签证书傻瓜式批处理包/【修改config_childCA.txt后使用】重新签发子证书.bat
@ -0,0 +1,4 @@
+del /f /s /q pixiv.net.csr
+del /f /s /q pixiv.net.crt
+openssl req -new -sha256 -key pixiv.net.key -out pixiv.net.csr -config config_childCA.txt
+openssl ca -config config_signCA.txt -in pixiv.net.csr -out pixiv.net.crt
--- a/自签证书傻瓜式批处理包/【可选】清理生成证书后产生的垃圾文件.bat
+++ b/自签证书傻瓜式批处理包/【可选】清理生成证书后产生的垃圾文件.bat
@ -0,0 +1,7 @@
+del /f /s /q *.pem
+del /f /s /q crtserial.srl.old
+del /f /s /q index.txt.old
+del /f /s /q index.txt.attr
+del /f /s /q index.txt.attr.old
+echo 01 > crtserial.srl
+break > index.txt
--- a/自签证书傻瓜式批处理包/【限初次使用】一键生成根证书和子证书.bat
+++ b/自签证书傻瓜式批处理包/【限初次使用】一键生成根证书和子证书.bat
@ -0,0 +1,7 @@
+echo 01 > crtserial.srl
+break > index.txt
+openssl genrsa -out pixiv.net.key 2048
+openssl genrsa -out rootCA.key 2048
+openssl req -new -x509 -key rootCA.key -out rootCA.crt -days 3650 -config config_rootCA.txt
+openssl req -new -sha256 -key pixiv.net.key -out pixiv.net.csr -config config_childCA.txt
+openssl ca -config config_signCA.txt -in pixiv.net.csr -out pixiv.net.crt
--- a/自签证书傻瓜式批处理包/演示01：一键生成证书.gif
+++ b/自签证书傻瓜式批处理包/演示01：一键生成证书.gif
--- a/自签证书傻瓜式批处理包/演示02：添加域名.gif
+++ b/自签证书傻瓜式批处理包/演示02：添加域名.gif
--- a/配置文件（非Windows用户使用）/ca.cer
+++ b/配置文件（非Windows用户使用）/ca.cer
--- a/配置文件（非Windows用户使用）/ca/pixiv.net.crt
+++ b/配置文件（非Windows用户使用）/ca/pixiv.net.crt
@ -1,71 +1,93 @@
 Certificate:
    Data:
        Version: 3 (0x2)
-        Serial Number: 5 (0x5)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=CN, ST=Shanghai, L=Shanghai, O=Mashiro LLC, OU=Mashiro, CN=Mashiro Internet Authority CA
+        Serial Number: 17 (0x11)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=CN, ST=Shanghai, L=Shanghai, O=Mashiro LLC, CN=Mashiro Internet Fake Authority CA
        Validity
-            Not Before: Sep 16 16:57:32 2018 GMT
-            Not After : Sep 13 16:57:32 2028 GMT
-        Subject: C=CN, ST=Shanghai, O=Mashiro LLC, OU=Mashiro, CN=*.pixiv.net
+            Not Before: Oct 16 17:18:43 2020 GMT
+            Not After : Oct 14 17:18:43 2030 GMT
+        Subject: C=CN, ST=Shanghai, O=Mashiro LLC, CN=SNI\xE4\xBB\xA3\xE7\x90\x86\xE9\x80\x9A\xE7\x94\xA8\xE8\xAF\x81\xE4\xB9\xA6\xEF\xBC\x88https://2heng.xin/2017/09/19/pixiv/\xEF\xBC\x89
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                Modulus:
-                    00:a9:84:77:44:2f:77:cf:5a:de:59:4c:ce:15:c1:
-                    bc:db:6d:43:1e:6f:f2:2e:46:f5:a4:74:bc:f6:92:
-                    60:77:b2:cd:79:bf:d7:65:2b:54:78:48:6d:ab:2f:
-                    6b:f8:63:c1:69:a1:1d:b2:b5:78:e4:2b:b7:ad:62:
-                    d6:14:aa:7a:24:97:72:d2:81:f7:e3:d7:b4:76:1f:
-                    94:de:74:5c:b0:b1:6c:31:21:2f:c4:3e:58:41:3b:
-                    ab:06:e5:8a:28:80:fd:c3:a1:b5:dc:db:c7:4f:62:
-                    bd:cc:ff:ee:b5:e9:21:5f:9b:88:20:ab:c3:36:f9:
-                    82:22:3c:88:6e:d9:69:cd:ad:c0:2b:5e:19:68:e7:
-                    ff:2a:64:90:24:32:07:ab:2c:67:a9:ab:2d:75:ef:
-                    85:26:df:37:67:c3:53:31:0e:9c:8c:58:aa:24:f3:
-                    e2:5f:2b:1c:fc:72:45:34:94:9b:b4:69:cb:ef:a3:
-                    6d:8f:f7:ab:4c:83:77:84:e8:ac:e6:b7:17:58:e8:
-                    c2:47:ce:08:35:32:9a:45:79:15:e4:f4:07:92:ee:
-                    79:64:cc:41:6b:5d:a4:4c:46:72:2f:5a:7a:66:38:
-                    df:3d:58:8f:02:79:4b:ea:0f:8b:0c:33:cc:41:79:
-                    0f:3c:16:91:0c:67:44:6d:42:7e:1c:cb:2f:d6:1f:
-                    6b:fb
+                    00:ce:00:18:cc:64:70:ac:59:b0:45:9e:c3:ee:9e:
+                    9b:b2:56:59:43:aa:b7:98:6b:bb:86:86:c9:bb:b6:
+                    ed:54:b8:56:de:ec:18:06:62:59:27:3b:d2:16:4a:
+                    8a:86:ad:40:2b:69:6a:dc:21:12:4b:ca:fd:85:a8:
+                    01:dd:ec:2a:20:a2:6e:b0:c2:a7:79:88:f9:f4:34:
+                    95:fb:85:bf:f0:c7:1d:57:29:f8:a5:62:e3:b6:9e:
+                    52:f7:42:2a:0c:5a:5c:6d:b4:30:51:4e:c1:40:57:
+                    c6:58:57:18:47:9c:59:9d:b7:38:bb:cc:0c:68:aa:
+                    6c:68:76:be:6f:84:83:12:ef:60:2d:11:61:d8:01:
+                    f0:09:85:8c:80:fa:f0:f6:23:95:c7:97:c1:86:53:
+                    97:b5:d5:dc:5b:a8:f8:22:49:0a:70:2d:92:77:17:
+                    41:fd:0e:ba:5b:a7:ce:8f:60:a1:fc:5a:a7:87:19:
+                    1f:12:f6:c8:b2:32:f4:a8:22:72:ec:97:cc:98:48:
+                    24:b3:4d:c4:83:7b:9e:1d:15:62:63:37:f5:b6:0c:
+                    4f:b5:97:33:87:1f:67:cd:0b:bb:71:7b:38:60:c5:
+                    4f:2f:ad:40:44:0a:8e:af:0c:6c:5a:f4:00:6d:94:
+                    a3:f3:ae:f2:eb:5e:14:68:0a:03:5b:c7:89:09:d0:
+                    f9:bd
                Exponent: 65537 (0x10001)
        X509v3 extensions:
-            X509v3 Basic Constraints: 
+            X509v3 Subject Key Identifier:
+                4C:B9:F4:49:C1:82:B5:1E:3A:81:63:FA:0C:15:78:A5:F7:4A:AF:FF
+            X509v3 Authority Key Identifier:
+                keyid:3F:6C:37:71:8F:74:1B:28:5A:0F:C2:29:C1:2B:05:7E:D1:24:D4:54
+
+            X509v3 Basic Constraints:
                CA:FALSE
-            X509v3 Subject Alternative Name: 
-                DNS:*.pixiv.net, DNS:pixiv.net, DNS:*.secure.pixiv.net, DNS:pximg.net, DNS:*.pximg.net, DNS:wikipedia.org, DNS:*.wikipedia.org, DNS:google.com, DNS:*.google.com, IP Address:127.0.0.1
-            X509v3 Subject Key Identifier: 
-                A7:E1:07:03:F4:8A:62:A6:32:C3:98:CC:C1:3E:37:33:56:22:DA:21
+            X509v3 Key Usage:
+                Digital Signature, Key Encipherment
+            X509v3 Subject Alternative Name:
+                DNS:*.pixiv.net, DNS:pixiv.net, DNS:*.secure.pixiv.net, DNS:pixivision.net, DNS:*.pixivision.net, DNS:pixiv.me, DNS:*.pixiv.me, DNS:pximg.net, DNS:*.pximg.net, DNS:pixivsketch.net, DNS:*.pixivsketch.net, DNS:public-api.secure.pixiv.net, DNS:wikipedia.org, DNS:*.wikipedia.org, DNS:m.wikipedia.org, DNS:*.m.wikipedia.org, DNS:google.com, DNS:*.google.com, DNS:steamcommunity.com, DNS:*.steamcommunity.com, DNS:steampowered.com, DNS:*.steampowered.com, DNS:archiveofourown.org, DNS:*.archiveofourown.org, DNS:wikimedia.org, DNS:*.wikimedia.org
    Signature Algorithm: sha256WithRSAEncryption
-         8d:e9:35:fa:68:71:c0:12:f5:d1:4c:2a:91:29:96:e5:7c:26:
-         1c:05:66:29:31:42:c1:9f:fb:2f:6c:2f:47:20:1d:dd:d2:c4:
-         7f:4d:df:a6:0b:91:13:bc:38:28:87:aa:a5:f5:6b:88:fb:04:
-         92:ad:d2:3f:82:70:5e:de:e5:bd:74:f2:86:c0:22:61:61:30:
-         e1:02:02:1d:89:6d:97:38:cb:0b:32:bb:37:32:08:7f:5e:ab:
-         15:79:93:e6:8f:d0:40:78:5b:b0:a2:b0:d2:e5:04:01:65:74:
-         bf:57:42:ea:9c:5b:93:c6:96:26:34:bc:f0:d7:46:6a:ad:7c:
-         2f:92
+         74:95:98:78:3d:2d:7b:24:ae:59:9c:9e:84:d1:77:e0:47:92:
+         81:28:27:98:e8:4d:b0:83:8d:f9:92:d2:59:2c:e4:be:9f:14:
+         4f:3e:e1:1e:49:d3:4a:b7:37:22:4c:45:cd:29:8d:5b:aa:fe:
+         cb:63:59:21:e0:0b:ea:69:0c:5b:92:09:e6:25:fe:1a:7e:2f:
+         a6:3c:a4:71:a7:11:5c:5c:8c:aa:31:ff:42:c3:be:3d:d2:df:
+         37:9e:47:35:f6:94:d1:af:0a:99:7a:39:07:25:86:7f:ae:bf:
+         2d:a8:a6:5f:98:84:54:01:1d:09:32:b0:21:2b:23:d7:81:13:
+         99:3d:5c:9b:ba:ce:7b:53:8d:2f:c2:39:a5:93:9b:fa:e2:31:
+         ce:77:5a:e2:38:a3:f0:95:9a:a7:6b:67:92:93:a4:63:a5:24:
+         63:88:21:e9:38:4d:a4:21:d2:a3:67:3c:70:9a:f3:df:f6:45:
+         26:b4:18:23:05:04:9f:2f:7e:fd:db:85:b5:e4:c0:71:c6:b4:
+         52:d4:dc:cd:91:1f:65:f1:d9:17:8c:d9:03:38:f5:7c:2a:e2:
+         3c:e1:43:66:5a:01:cb:5e:56:6b:e4:78:83:17:01:f1:b0:25:
+         b1:00:c5:37:81:83:94:9d:36:7a:3e:aa:81:23:2b:b1:90:b8:
+         ea:fe:eb:e2
 -----BEGIN CERTIFICATE-----
-MIIDnDCCAwWgAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCQ04x
-ETAPBgNVBAgMCFNoYW5naGFpMREwDwYDVQQHDAhTaGFuZ2hhaTEUMBIGA1UECgwL
-TWFzaGlybyBMTEMxEDAOBgNVBAsMB01hc2hpcm8xJjAkBgNVBAMMHU1hc2hpcm8g
-SW50ZXJuZXQgQXV0aG9yaXR5IENBMB4XDTE4MDkxNjE2NTczMloXDTI4MDkxMzE2
-NTczMlowXjELMAkGA1UEBhMCQ04xETAPBgNVBAgMCFNoYW5naGFpMRQwEgYDVQQK
-DAtNYXNoaXJvIExMQzEQMA4GA1UECwwHTWFzaGlybzEUMBIGA1UEAwwLKi5waXhp
-di5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCphHdEL3fPWt5Z
-TM4VwbzbbUMeb/IuRvWkdLz2kmB3ss15v9dlK1R4SG2rL2v4Y8FpoR2ytXjkK7et
-YtYUqnokl3LSgffj17R2H5TedFywsWwxIS/EPlhBO6sG5YoogP3DobXc28dPYr3M
-/+616SFfm4ggq8M2+YIiPIhu2WnNrcArXhlo5/8qZJAkMgerLGepqy1174Um3zdn
-w1MxDpyMWKok8+JfKxz8ckU0lJu0acvvo22P96tMg3eE6KzmtxdY6MJHzgg1MppF
-eRXk9AeS7nlkzEFrXaRMRnIvWnpmON89WI8CeUvqD4sMM8xBeQ88FpEMZ0RtQn4c
-yy/WH2v7AgMBAAGjgb8wgbwwCQYDVR0TBAIwADCBjwYDVR0RBIGHMIGEggsqLnBp
-eGl2Lm5ldIIJcGl4aXYubmV0ghIqLnNlY3VyZS5waXhpdi5uZXSCCXB4aW1nLm5l
-dIILKi5weGltZy5uZXSCDXdpa2lwZWRpYS5vcmeCDyoud2lraXBlZGlhLm9yZ4IK
-Z29vZ2xlLmNvbYIMKi5nb29nbGUuY29thwR/AAABMB0GA1UdDgQWBBSn4QcD9Ipi
-pjLDmMzBPjczViLaITANBgkqhkiG9w0BAQsFAAOBgQCN6TX6aHHAEvXRTCqRKZbl
-fCYcBWYpMULBn/svbC9HIB3d0sR/Td+mC5ETvDgoh6ql9WuI+wSSrdI/gnBe3uW9
-dPKGwCJhYTDhAgIdiW2XOMsLMrs3Mgh/XqsVeZPmj9BAeFuworDS5QQBZXS/V0Lq
-nFuTxpYmNLzw10ZqrXwvkg==
+MIIFljCCBH6gAwIBAgIBETANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJDTjER
+MA8GA1UECBMIU2hhbmdoYWkxETAPBgNVBAcTCFNoYW5naGFpMRQwEgYDVQQKEwtN
+YXNoaXJvIExMQzErMCkGA1UEAxMiTWFzaGlybyBJbnRlcm5ldCBGYWtlIEF1dGhv
+cml0eSBDQTAeFw0yMDEwMTYxNzE4NDNaFw0zMDEwMTQxNzE4NDNaMH8xCzAJBgNV
+BAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTEUMBIGA1UEChMLTWFzaGlybyBMTEMx
+RzBFBgNVBAMUPlNOSeS7o+eQhumAmueUqOivgeS5pu+8iGh0dHBzOi8vMmhlbmcu
+eGluLzIwMTcvMDkvMTkvcGl4aXYv77yJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAzgAYzGRwrFmwRZ7D7p6bslZZQ6q3mGu7hobJu7btVLhW3uwYBmJZ
+JzvSFkqKhq1AK2lq3CESS8r9hagB3ewqIKJusMKneYj59DSV+4W/8McdVyn4pWLj
+tp5S90IqDFpcbbQwUU7BQFfGWFcYR5xZnbc4u8wMaKpsaHa+b4SDEu9gLRFh2AHw
+CYWMgPrw9iOVx5fBhlOXtdXcW6j4IkkKcC2SdxdB/Q66W6fOj2Ch/FqnhxkfEvbI
+sjL0qCJy7JfMmEgks03Eg3ueHRViYzf1tgxPtZczhx9nzQu7cXs4YMVPL61ARAqO
+rwxsWvQAbZSj867y614UaAoDW8eJCdD5vQIDAQABo4ICJDCCAiAwHQYDVR0OBBYE
+FEy59EnBgrUeOoFj+gwVeKX3Sq//MB8GA1UdIwQYMBaAFD9sN3GPdBsoWg/CKcEr
+BX7RJNRUMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMIIBxAYDVR0RBIIBuzCCAbeC
+CyoucGl4aXYubmV0gglwaXhpdi5uZXSCEiouc2VjdXJlLnBpeGl2Lm5ldIIOcGl4
+aXZpc2lvbi5uZXSCECoucGl4aXZpc2lvbi5uZXSCCHBpeGl2Lm1lggoqLnBpeGl2
+Lm1lgglweGltZy5uZXSCCyoucHhpbWcubmV0gg9waXhpdnNrZXRjaC5uZXSCESou
+cGl4aXZza2V0Y2gubmV0ghtwdWJsaWMtYXBpLnNlY3VyZS5waXhpdi5uZXSCDXdp
+a2lwZWRpYS5vcmeCDyoud2lraXBlZGlhLm9yZ4IPbS53aWtpcGVkaWEub3JnghEq
+Lm0ud2lraXBlZGlhLm9yZ4IKZ29vZ2xlLmNvbYIMKi5nb29nbGUuY29tghJzdGVh
+bWNvbW11bml0eS5jb22CFCouc3RlYW1jb21tdW5pdHkuY29tghBzdGVhbXBvd2Vy
+ZWQuY29tghIqLnN0ZWFtcG93ZXJlZC5jb22CE2FyY2hpdmVvZm91cm93bi5vcmeC
+FSouYXJjaGl2ZW9mb3Vyb3duLm9yZ4INd2lraW1lZGlhLm9yZ4IPKi53aWtpbWVk
+aWEub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQB0lZh4PS17JK5ZnJ6E0XfgR5KBKCeY
+6E2wg435ktJZLOS+nxRPPuEeSdNKtzciTEXNKY1bqv7LY1kh4AvqaQxbkgnmJf4a
+fi+mPKRxpxFcXIyqMf9Cw7490t83nkc19pTRrwqZejkHJYZ/rr8tqKZfmIRUAR0J
+MrAhKyPXgROZPVybus57U40vwjmlk5v64jHOd1riOKPwlZqna2eSk6RjpSRjiCHp
+OE2kIdKjZzxwmvPf9kUmtBgjBQSfL37924W15MBxxrRS1NzNkR9l8dkXjNkDOPV8
+KuI84UNmWgHLXlZr5HiDFwHxsCWxAMU3gYOUnTZ6PqqBIyuxkLjq/uvi
 -----END CERTIFICATE-----
--- a/配置文件（非Windows用户使用）/ca/pixiv.net.key
+++ b/配置文件（非Windows用户使用）/ca/pixiv.net.key
@ -1,28 +1,27 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCphHdEL3fPWt5Z
-TM4VwbzbbUMeb/IuRvWkdLz2kmB3ss15v9dlK1R4SG2rL2v4Y8FpoR2ytXjkK7et
-YtYUqnokl3LSgffj17R2H5TedFywsWwxIS/EPlhBO6sG5YoogP3DobXc28dPYr3M
-/+616SFfm4ggq8M2+YIiPIhu2WnNrcArXhlo5/8qZJAkMgerLGepqy1174Um3zdn
-w1MxDpyMWKok8+JfKxz8ckU0lJu0acvvo22P96tMg3eE6KzmtxdY6MJHzgg1MppF
-eRXk9AeS7nlkzEFrXaRMRnIvWnpmON89WI8CeUvqD4sMM8xBeQ88FpEMZ0RtQn4c
-yy/WH2v7AgMBAAECggEAWSrltYcmhXrt5JlC+izLk7x4hsUp5e/LfHMvhp/egHgc
-H0OrIHtXVmH61gX+zExky5RFU+CjM5pPZrPLmllGIINNka9t3npzYYMhQpaAvyzE
-lV84igilUcL6JomNT9ryIPqp9//fakGtRu0E+skjle/w/gZ7jCpYqnue5HgWcGpu
-cUTABq96kRzY8winNZcfbBw2uIdpKGDXMxWnepVbhNNzXpns0ivJ7+MrUSKLX1a2
-nCPQkRjAZHYMgRIKfPbSwcyRcHHsO5CyCY71uiqFBy2aDtamD/r9QOFTEdvTMddf
-aP1RU8eSb2mDDrWPySbkYTGuehcfXcroxBFkQnRn0QKBgQDbB6qyIF/bVVATZBpR
-TBu1CQuiowEbvSm+XCA2vig4A5IJ6JnUaS+wc2BBM2RUBLYbHKb4lEGGmpnGGHCD
-sxy64PhAvzWqbn9hvU3HwDwPZzUqWGHq9yaFbgD/LK/Vl57ow/oRV7a0u9hAJOPx
-mR70uqvfr6HTMbCmjY/k4TfvAwKBgQDGIVpLo+Bjz62c8YJEiOqQjB1yFuqRP4OH
-K6MmyMEc6H2619RyyrDbkMNVpwHNwChTUNcwAqFYvEqRGrvQ5dO8whYxEli/0cIR
-jOgzbGLXst3nIbzm30MeknnoWVCrMiqXeCNtwnUifKS4WvBs0Bdn4KBZTiytNN6K
-xhZJPgvhqQKBgDADKDnPuvN7agg2I0a65j/y8af/D1kjSClATJdza6GLttGROVdE
-j32gbPMd7to0Bi8/QqKu7QYykY7JALD97EhS1FhtEbiAbE/ijVBCJWhC+XaE1UIK
-V1lcWb+V7h1mFSF1BDYVAinwG2FENOta41xGJzLrbw+6jryTv30umXI9AoGBAL2k
-JPJrjBbdLJchDwgcaTAr/O88Ag8+1N0npoUz+Kt72QRjG4U4fynaGS29qdtPRwng
-QehBTEBMEa9sAEOGCDIPMACOSAZqdrAnyAWYg89j9EQMJexx3KPBnhAIlU8XuG68
-3mRrkYSN+3g+CwyL7StPdQul6Nts1GnOCnzWd7bpAoGBANkO5h+oUhd4y8tCX3vX
-mT98imjvCnvW1KTKa9YHL0OEH5aEPKDzUwHyqtUJCsw7YTk0+z/XtiVm9/V/1t76
-Dllt7KaEI6MszXD8QgBDpkCp8N2zmTT5URKbV33odGXYJPcA908RiqDCBmw3zxjZ
-cCSu7rDx8R2i8DFU9frXY81l
-----END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAzgAYzGRwrFmwRZ7D7p6bslZZQ6q3mGu7hobJu7btVLhW3uwY
+BmJZJzvSFkqKhq1AK2lq3CESS8r9hagB3ewqIKJusMKneYj59DSV+4W/8McdVyn4
+pWLjtp5S90IqDFpcbbQwUU7BQFfGWFcYR5xZnbc4u8wMaKpsaHa+b4SDEu9gLRFh
+2AHwCYWMgPrw9iOVx5fBhlOXtdXcW6j4IkkKcC2SdxdB/Q66W6fOj2Ch/Fqnhxkf
+EvbIsjL0qCJy7JfMmEgks03Eg3ueHRViYzf1tgxPtZczhx9nzQu7cXs4YMVPL61A
+RAqOrwxsWvQAbZSj867y614UaAoDW8eJCdD5vQIDAQABAoIBAQCgRA0G/2F1hTWR
+hIp02+rP3UQHVAsQR0iWycirBQ8xqVTUjCPI27z2vCCffRC25JUW8SXU6tncI6oH
+0QTazgCccSLi3B4FfN7R8hN5or4IqjCWfq3Wpc/5ZMWxXkVuZOKh6tzodPf+ggtq
+8R+PnwFNpZ065e4FhAlhYHiaNCLxl+sG4MHov+a1saGCuYRIiLnZv3pj165DZod8
+zNIRY7alcpzBbf+um/G4no6naRHJ0Kev9e1HgWjbVfZYtO+kiIowOvNq1XSLJ0KD
+ZO16XOAD5YrLW3hgCsdFxfyvwMpnCPJwbg2t6NbEeR/8gOn64zs1bkMLuvecY7rr
+c7yhZqVBAoGBAOhTYK3zj7/lc/xoUanR6Fr8QIRXE/YZ4f1EGDX4PT2Hga36gTwI
+IOS9Vjx/0kUlZFmvoCV7mMcDwJMTE8BBjYp+N/DvaRkDau67WDwJVFxoEZVvW5ni
+I0uoRIBaP4r8FkSI6j56BuKj+7msFS3zL+MgQ8ujvsztJq4uiFmnUogtAoGBAOL9
+i85EGOOi3vrrdEVy9goFcA5HT9qT+jvtUaqFwHCB4cZEsGx2hNaOVVWm6rBIQtb
+Zfg+VqEKaQisjcKAa/8HZ6xApdtSNyWR+OoA7VzRsc+SzhdHkgbsMQifQbEKEe49
+yFVm8xrP/rnVrq87gsrvQcyMH0FB4ljZ4wGWqiHRAoGBAIIYpoviVv3zZGbUl95L
+wByrIwm4pWHrjoQ/jHs0Xj7FUdX18EaImrrcV50bSskTrkUWtswmkR/otv7k8Ot5
+CeSi13qg5i5unoO+/yLnaokwcaBHsnjSjEdCm9FwOCMBFQsdzGZd+NsTTtPjTBzm
+EEvUdoJjWGXy6vUg85OYwfulAoGBAKYE9kAlr2vxbOlUxctf8riFEOuHmnGwUwPe
+lqo5axxZCmJwHzzV1NdErRxSfQZVvNJupdT72yZr08iJVCGHBfYAN35Pxj70EeuD
+qReVWAYERNW53MxAB3jStUZGHKjc4aJrQ6Pa6UGaEQdgVyRJFW9RsMFnVtDG3EL6
+EcMuq/6RAoGAWm7c5pdbj1p3bvOrfHpsWrv/qFzozB5LRk2bYwosMASSyLwX6+TF
+3QCWL7VOnLQJvQ5ffCWWSs7Ds9kJ/gvIVyelgT6DsyKwi19rjueRix3nFg1faAmI
+whLZvr+KVwLYjDYfNmKBwbV8KLZAf5fZ3q9l4lf3rjaQLcfL3LiaUUk=
+-----END RSA PRIVATE KEY-----
--- a/配置文件（非Windows用户使用）/hosts
+++ b/配置文件（非Windows用户使用）/hosts
@ -1,3 +1,8 @@
+#UTF-8 encoded 
+#www.google.com域名仅用于登陆验证
+#如果你不需要这个功能，请把下一行删掉
+127.0.0.1       www.google.com
+
 #Pixiv Start
 127.0.0.1       pixiv.net 
 127.0.0.1       www.pixiv.net 
@ -15,28 +20,105 @@
 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       source.pixiv.net
+127.0.0.1       i1.pixiv.net 
+127.0.0.1       i2.pixiv.net 
+127.0.0.1       i3.pixiv.net 
+127.0.0.1       i4.pixiv.net
+127.0.0.1       hls1.pixivsketch.net
+127.0.0.1       hls2.pixivsketch.net
+127.0.0.1       hls3.pixivsketch.net
+127.0.0.1       hls4.pixivsketch.net
+127.0.0.1       hls5.pixivsketch.net
+127.0.0.1       hls6.pixivsketch.net
+127.0.0.1       hls7.pixivsketch.net
+127.0.0.1       hls8.pixivsketch.net
+127.0.0.1       hls9.pixivsketch.net
+127.0.0.1       hls10.pixivsketch.net
+127.0.0.1       hls11.pixivsketch.net
+127.0.0.1       hls12.pixivsketch.net
+127.0.0.1       hls13.pixivsketch.net
+127.0.0.1       hls14.pixivsketch.net
+127.0.0.1       hls15.pixivsketch.net
+127.0.0.1       hls16.pixivsketch.net
+127.0.0.1       hls17.pixivsketch.net
+127.0.0.1       hls18.pixivsketch.net
+127.0.0.1       hls19.pixivsketch.net
+127.0.0.1       hls20.pixivsketch.net
+127.0.0.1       hlsa1.pixivsketch.net
+127.0.0.1       hlsa2.pixivsketch.net
+127.0.0.1       hlsa3.pixivsketch.net
+127.0.0.1       hlsa4.pixivsketch.net
+127.0.0.1       hlsa5.pixivsketch.net
+127.0.0.1       hlsa6.pixivsketch.net
+127.0.0.1       hlsa7.pixivsketch.net
+127.0.0.1       hlsa8.pixivsketch.net
+127.0.0.1       hlsa10.pixivsketch.net
+127.0.0.1       hlsa11.pixivsketch.net
+127.0.0.1       hlsa12.pixivsketch.net
+127.0.0.1       hlsa13.pixivsketch.net
+127.0.0.1       hlsa14.pixivsketch.net
+127.0.0.1       hlsa15.pixivsketch.net
+127.0.0.1       hlsa16.pixivsketch.net
+127.0.0.1       hlsa17.pixivsketch.net
+127.0.0.1       hlsa18.pixivsketch.net
+127.0.0.1       hlsa19.pixivsketch.net
+127.0.0.1       hlsc1.pixivsketch.net
+127.0.0.1       hlsc2.pixivsketch.net
+127.0.0.1       hlsc3.pixivsketch.net
+127.0.0.1       hlsc4.pixivsketch.net
+127.0.0.1       hlsc5.pixivsketch.net
+127.0.0.1       hlsc6.pixivsketch.net
+127.0.0.1       hlse1.pixivsketch.net
+127.0.0.1       hlse2.pixivsketch.net
+127.0.0.1       hlse3.pixivsketch.net
+127.0.0.1       hlse4.pixivsketch.net
+127.0.0.1       hlse5.pixivsketch.net
+127.0.0.1       hlse6.pixivsketch.net
+127.0.0.1       hlse7.pixivsketch.net
+127.0.0.1       hlse8.pixivsketch.net
+127.0.0.1       hlse9.pixivsketch.net
+127.0.0.1       hlst1.pixivsketch.net
 127.0.0.1       i.pximg.net
-210.140.131.145 source.pixiv.net
-210.129.120.50  app-api.pixiv.net  
-74.120.148.207  g-client-proxy.pixiv.net 
-210.140.131.145 i1.pixiv.net 
-210.140.131.145 i2.pixiv.net 
-210.140.131.145 i3.pixiv.net 
-210.140.131.145 i4.pixiv.net 
+127.0.0.1       app-api.pixiv.net  
+13.226.113.16    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.140.92.140  pixiv.pximg.net  
+210.140.92.139  s.pximg.net
+210.140.131.246  api.booth.pm
+210.140.131.220  myaccount.pixiv.net
 #Pixiv End

-# 顺手修一下维基百科
+# 顺手修一下维基百科
 # Wikipedia Start
-127.0.0.1 zh.wikipedia.org #中文维基百科桌面版
-127.0.0.1 zh-yue.wikipedia.org #粤文维基百科桌面版
-127.0.0.1 wuu.wikipedia.org #吴语维基百科桌面版
-127.0.0.1 ug.wikipedia.org #维吾尔文维基百科桌面版
-127.0.0.1 ja.wikipedia.org #日文维基百科桌面版
-127.0.0.1 zh.wikinews.org #中文维基新闻桌面版
-127.0.0.1 zh.m.wikipedia.org #中文维基百科移动版
-127.0.0.1 ug.m.wikipedia.org #维吾尔文维基百科移动版
-127.0.0.1 zh.m.wikinews.org #中文维基新闻移动版
-# Wikipedia End
+127.0.0.1 en.wikipedia.org
+127.0.0.1 zh.wikipedia.org #中文维基百科桌面版
+127.0.0.1 en.m.wikipedia.org
+127.0.0.1 zh.m.wikipedia.org
+127.0.0.1 zh-yue.wikipedia.org #粤文维基百科桌面版
+127.0.0.1 wuu.wikipedia.org #吴语维基百科桌面版
+127.0.0.1 ug.wikipedia.org #维吾尔文维基百科桌面版
+127.0.0.1 ja.wikipedia.org #日文维基百科桌面版
+127.0.0.1 zh.wikinews.org #中文维基新闻桌面版
+# Wikipedia End
+
+# Wikimedia Start
+127.0.0.1 wikimedia.org
+127.0.0.1 upload.wikimedia.org
+# Wikimedia End
+
+# 顺手修一下Steam
+# Steam Start
+127.0.0.1 store.steampowered.com
+127.0.0.1 steamcommunity.com
+# Steam end
+
+# AO3 Start
+127.0.0.1 archiveofourown.org
+# AO3 end
+
+# Nyaa Start
+127.0.0.1	nyaa.si
+127.0.0.1	www.nyaa.si
+127.0.0.1	sukebei.nyaa.si
+# Nyaae End
--- a/配置文件（非Windows用户使用）/nginx.conf
+++ b/配置文件（非Windows用户使用）/nginx.conf
@ -36,9 +36,9 @@ http {
    #gzip  on;
    
    upstream www-pixiv-net { 
-        server 210.129.120.46:443;
-        server 210.129.120.52:443;
-        server 210.129.120.50:443;
+        server 210.140.131.182:443;
+        server 210.140.131.180:443;
+        server 210.140.131.184:443;
    }
    
    upstream sketch-pixiv-net { 
@ -65,9 +65,13 @@ http {
        server 210.140.92.135:443;
        server 210.140.92.136:443; 
    }
+    
+    server {
+        listen 80 default_server;  
+        rewrite ^(.*) https://$host$1 permanent;
+    }

    server {
-        #listen 80;
        listen 443 ssl;
        server_name pixiv.net;
        server_name www.pixiv.net;
@ -172,7 +176,7 @@ http {
        ssl_certificate_key ca/pixiv.net.key;
        
    	location / {
-            proxy_pass https://210.129.120.50/;
+            proxy_pass https://210.140.131.222/;
            proxy_set_header Host $http_host;
            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
            proxy_set_header X-Real_IP $remote_addr;
@ -187,6 +191,11 @@ http {
        server_name imgaz.pixiv.net;
        server_name comic.pixiv.net;
        server_name novel.pixiv.net;
+        server_name source.pixiv.net;
+        server_name i1.pixiv.net;
+        server_name i2.pixiv.net;
+        server_name i3.pixiv.net;
+        server_name i4.pixiv.net;

        ssl on;
        ssl_certificate ca/pixiv.net.crt;
@ -203,24 +212,22 @@ http {
        }
 	}

+    upstream wikipedia-server { 
+        server 198.35.26.96:443;
+        server 103.102.166.224:443;
+    }
+    
    server {
        listen 443 ssl;
-        server_name zh.wikipedia.org;
-        server_name zh-yue.wikipedia.org;
-        server_name wuu.wikipedia.org;
-        server_name ug.wikipedia.org;
-        server_name ja.wikipedia.org;
-        server_name zh.wikinews.org;
-        server_name zh.m.wikipedia.org;
-        server_name ug.m.wikipedia.org;
-        server_name zh.m.wikinews.org;
+        server_name *.wikipedia.org;
+        server_name *.m.wikipedia.org;

        ssl on;
        ssl_certificate ca/pixiv.net.crt;
        ssl_certificate_key ca/pixiv.net.key;
        
    	location / {
-            proxy_pass https://103.102.166.224/;
+            proxy_pass https://wikipedia-server/;
            proxy_set_header Host $http_host;
            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
            proxy_set_header X-Real_IP $remote_addr;
@ -230,4 +237,17 @@ http {
        }
 	}
    
+    server {
+        listen 443 ssl;
+        server_name  www.google.com;
+        
+        ssl on;
+        ssl_certificate ca/pixiv.net.crt;
+        ssl_certificate_key ca/pixiv.net.key;
+
+        location / {
+            rewrite ^/(.*)$ https://www.recaptcha.net/$1 redirect;
+        }
+    }
+    
 }
Author	SHA1	Message	Date
Mashiro	45539c9334	Update README.md	2023-03-15 01:05:45 +08:00
Mashiro	f34dee5ebb	Update LICENSE	2023-03-13 21:46:09 +08:00
Mashiro	a2a8734147	Update README.md	2021-10-23 23:06:11 +08:00
mashirozx	3d5ff59de0	proxy instead of rewrite	2021-10-23 22:59:56 +08:00
mashirozx	241d025459	更换pximg镜像	2021-10-23 22:36:59 +08:00
Mashiro	0bdc796281	Update README.md	2021-10-21 13:45:22 +08:00
Mashiro	3a705a35e0	Update README.md	2021-10-21 13:39:22 +08:00
mashirozx	20cdd42069	Update i.pximg.net proxy	2021-01-24 17:44:59 +08:00
mashirozx	a892ef014c	Upgrade Nginx 1.18.0	2021-01-24 17:37:52 +08:00
mashirozx	95b279a94a	docs: remove donation	2020-12-14 13:12:26 +08:00
shengheng.lu	65dc2cf08e	feat: update e-hentai support and login support	2020-12-11 18:58:56 +08:00
ShioMile	636ec38d81	注释清理现已无法访问的维基百科上游IP (#51 )	2020-12-10 13:44:50 +08:00
Mashiro	2290278d6b	Merge pull request #50 from allenx555/master add exhentai support	2020-12-05 13:52:51 +08:00
shengheng.lu	394034568b	fix: fix nginx upload body size conf	2020-12-05 13:35:31 +08:00
shengheng.lu	ead7f839c1	feat: add exhentai support	2020-12-05 13:27:36 +08:00
Mashiro	4af9751f6c	Update pixiv.net.crt	2020-10-17 01:25:13 +08:00
Mashiro	225256fdfb	Update pixiv.net.crt	2020-10-17 01:24:04 +08:00
jingkaimori	f1a21c873a	perf: 反代维基图像站，部分修复#26 (#49 ) * 反代维基图像站，部分修复mashirozx#26 TODO:Mashiro签发新的证书，包含wikimedia.org和upload.wikimedia.org。 * 添加wikimedia证书配置和hosts配置	2020-10-17 01:21:21 +08:00
Mashiro	c3d514e93c	Delete 一键修改hosts.bat	2020-10-10 01:04:59 +08:00
ShioMile	d52796603b	pref: 修复维基百科 ip、新增Nyaa；新增自签证书批处理包 (#48 ) * fix Wikipedia ip 198.35.26.96 早已被封锁； 103.102.166.224 不稳定。 * add nyaa.si * update hosts * add batch file for self-sign cert * Add files via upload * Delete crtserial.srl * fix bat * fix: remove unexist extensions * add gif teaching	2020-10-10 01:03:18 +08:00
Mashiro	bfe9a4bcca	perf: add `app-api-pixiv-net`	2020-09-16 10:45:41 +08:00
Mashiro	a8d5d94f54	Update hosts	2020-09-16 10:40:33 +08:00
Mashiro	37d0fbdb6a	Merge pull request #44 from jingkaimori/master 将7号帮助文件的字符编码改为utf-8以增强兼容性。	2020-08-19 00:59:48 +08:00
Mashiro	24d181d398	Merge pull request #46 from ZeroSimple/master 添加一键修改Hosts脚本	2020-06-05 15:55:35 +08:00
Henry He	213f863b1a	Update 一键修改hosts.bat	2020-06-03 19:42:06 +08:00
Henry He	030c49e325	添加一键修改Hosts脚本	2020-06-01 19:08:37 +08:00
jingkaimori	50f768922a	将7号帮助文件的字符编码改为utf-8以增强兼容性。	2020-05-13 09:33:25 +08:00
Mashiro	ef8d815d52	perf: update nginx to 1.16.1 and optimize configuration files	2020-04-16 21:13:34 +08:00
Mashiro	055cdfd8cf	Update hosts	2020-03-07 16:50:35 +08:00
Mashiro	efd1efe0f2	Update 6.安全及隐私声明.txt	2020-03-07 16:46:04 +08:00
Mashiro	d4fb3ad785	Update and rename 6.日志上传注意事项.txt to 6.安全及隐私声明.txt	2020-03-07 16:40:46 +08:00
Mashiro	1bbdb7cb65	Merge pull request #41 from ZeroSimple/master 新增对Archive of our own的访问支持	2020-03-07 00:27:37 -06:00
Henry He	9cd793dd8f	Add files via upload	2020-03-07 13:04:50 +08:00
Mashiro	e1074329b9	Merge pull request #39 from Henvy-Mango/fix update hosts steamcommunity	2020-03-06 21:43:54 -06:00
Mashiro	1865142d9e	Merge branch 'master' into fix	2020-03-06 21:43:41 -06:00
Mashiro	1eed15e507	Merge pull request #37 from swamdrgon/patch-5 Update hosts	2020-03-06 21:42:13 -06:00
Mashiro	01ea484ffc	Merge pull request #36 from swamdrgon/patch-4 upstream www-pixiv-net IP update	2020-03-06 21:41:35 -06:00
Henry He	245bbdba7b	Update hosts	2020-03-06 15:05:22 +08:00
Henry He	044891de59	新增对Archive of our own的支持	2020-03-06 15:03:48 +08:00
Mangogo	159a5cb270	fix	2020-02-17 14:59:12 +08:00
swamdrgon	a145d78636	Update hosts 增加hls服务器域名，更改部分域名地址	2020-02-09 19:44:44 +08:00
swamdrgon	dd7fc38920	Update nginx.conf update steamcommunity IP	2020-02-09 10:24:57 +08:00
swamdrgon	a729f59c45	Merge pull request #1 from swamdrgon/swamdrgon-patch-1 Update nginx.conf	2020-01-30 21:03:57 +08:00
swamdrgon	fac6818590	Update nginx.conf 根据 issue #33 删除google 反代的部分	2020-01-30 21:02:48 +08:00
swamdrgon	da4a816104	upstream www-pixiv-net IP update	2020-01-30 20:53:52 +08:00
Mashiro	d080525ba2	Merge pull request #32 from swamdrgon/patch-3 Update hosts	2019-12-28 01:04:31 +08:00
swamdrgon	47e041cab7	Update hosts 增加hls服务器域名	2019-12-27 23:30:28 +08:00
swamdrgon	2ef0c6ab67	Update hosts 增加api.booth.pm ；myaccount.pixiv.net ；i.pximg.net域名，更新 s.pximg.net；pixiv.pximg.net ；g-client-proxy.pixiv.net ip地址	2019-12-27 23:26:29 +08:00
Mashiro	051d83190b	Merge pull request #30 from swamdrgon/patch-2 update upstream IP address	2019-12-22 21:10:14 -06:00
swamdrgon	b0eac26b55	update upstream IP address 更新 www.pixiv.net ; *.pixivsketch.net ; i.pximg.net 相应IP地址。	2019-12-22 00:20:23 +08:00
Mashiro	6173fe9964	Update hosts	2019-09-14 21:44:18 +08:00
Mashiro	3313580c02	Merge pull request #16 from swamdrgon/patch-1 增加hls服务器地址	2019-09-14 21:38:14 +08:00
Mashiro	29eebec8a2	Merge branch 'master' into patch-1	2019-09-14 21:38:00 +08:00
swamdrgon	cf53836a1c	Update hosts 增加一个hls服务器地址	2019-09-13 21:29:23 +08:00
Mashiro	b655295778	bug fix	2019-08-09 22:05:05 +08:00
swamdrgon	79fe4be715	support for pixivsktech live	2019-06-29 16:52:42 +08:00
swamdrgon	0f95ebc2fa	support pixivsketch live	2019-06-29 16:46:47 +08:00
Mashiro	88e977bb82	update cer	2019-06-28 14:22:31 +08:00
Mashiro	840ea9b4bd	wildcard support for wikipedia & steam community	2019-06-27 21:20:47 +08:00
Mashiro	5e90308657	Merge pull request #15 from wordlesswind/patch-1 更换换行符	2019-06-27 20:48:58 +08:00
清靈語	02bf17e793	更换换行符	2019-06-27 20:45:44 +08:00
Mashiro	ef1025ef43	fix recaptcha	2019-06-27 20:01:30 +08:00
Mashiro	14a91c53b7	修复 Firefox 证书错误	2019-01-28 23:58:05 +08:00
Mashiro	262d7e49c6	Update nginx.conf	2019-01-27 18:25:24 +08:00
Mashiro	7c6329bce7	更换 CA 证书	2019-01-27 15:02:56 +08:00
Mashiro	a0f5d199bb	Update README.md	2019-01-25 11:44:37 +08:00
Mashiro	bf364a6a83	修复百科（dic.pixiv.net）	2019-01-24 19:37:25 +08:00
Mashiro	c994ce74f0	Update README.md	2019-01-22 10:55:02 +08:00
Mashiro	08281ebec7	解决图片无法显示问题	2019-01-22 10:51:04 +08:00
Mashiro	2644885707	Update README.md	2018-12-23 12:23:04 +08:00
Mashiro	903a2fe6be	Update IP addresses	2018-11-29 18:11:32 +08:00
Mashiro	a07a98b77c	Recaptcha localization	2018-09-22 23:11:05 +08:00
Mashiro	81d1b24b9f	Port 80 auto rewrite	2018-09-18 02:15:42 +08:00
Mashiro	bdd4e7f0c1	Update README	2018-09-18 01:37:12 +08:00
Mashiro	0cf14c8dd6	Update README	2018-09-18 01:35:38 +08:00
				`@ -0,0 +1 @@`
				`用本文件夹内的 nginx.conf 替换根目录 conf 文件夹中的 nginx.conf 文件`