Merge branch 'main' into main

conf/Discord.conf

@@ -30,6 +30,7 @@ server {
 
     include cert.conf;
 
+
     location / {
         proxy_pass https://DiscordApp-com/;
         include proxy.params;

conf/Pixiv.conf

@@ -9,12 +9,18 @@ upstream www-pixiv-net {
     server 210.140.131.224:443;
     server 210.140.131.225:443;
     server 210.140.131.226:443;
+    keepalive 16;	
+    keepalive_timeout 120;
+    keepalive_requests 10000;
 }
 
 upstream account-pixiv-net {
     server 210.140.131.219:443;
     server 210.140.131.223:443;
     server 210.140.131.226:443;
+    keepalive 16;	
+    keepalive_timeout 120;
+    keepalive_requests 10000;
 }
 
 upstream ssl-pixiv-net {
@@ -27,13 +33,15 @@ upstream sketch-pixiv-net {
     server 210.140.174.37:443;
     server 210.140.170.179:443;
     server 210.140.175.130:443;
+    keepalive 16;	
+    keepalive_timeout 120;
+    keepalive_requests 10000;
 }
 
 upstream sketch-hls-server {
     server 210.140.214.211:443;
     server 210.140.214.212:443;
     server 210.140.214.213:443;
-
     keepalive 16;	
     keepalive_timeout 120;
     keepalive_requests 10000;
@@ -46,6 +54,7 @@ upstream imgaz-pixiv-net {
     server 210.140.131.153:443;
 }
 
+
 upstream i-pximg-net {
     server 210.140.92.141:443;
     server 210.140.92.142:443;
@@ -111,6 +120,7 @@ server {
     location / {
         proxy_pass https://www-pixiv-net;
         proxy_connect_timeout 4;
+
         keepalive_timeout 120;
         proxy_set_header Connection "";
         include proxy.params;
@@ -136,6 +146,7 @@ server {
     location / {
         proxy_pass https://account-pixiv-net/;
         proxy_connect_timeout 4;
+
         keepalive_timeout 120;
         proxy_set_header Connection "";
         include proxy.params;
@@ -174,7 +185,9 @@ server {
         keepalive_timeout 120;
         proxy_set_header Connection "";
         proxy_next_upstream_timeout 60;
-        proxy_connect_timeout 4;
+        proxy_connect_timeout 5;
+        keepalive_timeout 120;
+        proxy_set_header Connection "";
         proxy_set_header Referer "https://www.pixiv.net/";
         proxy_set_header Sec-Fetch-Site "cross-site";
 
@@ -193,6 +206,9 @@ server {
 
     location / {
         proxy_pass https://fanbox-cc/;
+        proxy_connect_timeout 5;
+        keepalive_timeout 120;
+        proxy_set_header Connection "";
         include proxy.params;
         allow all;
     }
@@ -207,6 +223,9 @@ server {
 
     location / {
         proxy_pass https://sketch-pixiv-net;
+        proxy_connect_timeout 5;
+        keepalive_timeout 120;
+        proxy_set_header Connection "";
         include proxy.params;
     }
 
@@ -249,6 +268,9 @@ server {
 
     location / {
         proxy_pass https://imgaz-pixiv-net;
+        proxy_connect_timeout 5;
+        keepalive_timeout 120;
+        proxy_set_header Connection "";
         include proxy.params;
     }
 }
@@ -398,7 +420,7 @@ server {
 
     location / {
         proxy_pass https://Github-com/;
-        proxy_connect_timeout 4;
+        proxy_connect_timeout 5;
         keepalive_timeout 120;
         proxy_set_header Connection "";
         proxy_headers_hash_max_size 8192;
@@ -422,7 +444,7 @@ server {
 
     location / {
         proxy_pass https://githubusercontent-com/;
-        proxy_connect_timeout 4;
+        proxy_connect_timeout 5;
         keepalive_timeout 120;
         proxy_set_header Connection "";
         proxy_next_upstream_timeout 32;
@@ -482,4 +504,4 @@ server {
         include proxy.params;
     }
 }
-#    EA End
+#    EA End

conf/Steam.conf

@@ -46,7 +46,8 @@ server {
     include cert.conf;
     
     location ^.*(discussions|comment|forum).*$ {
-        proxy_pass https://str003.steam302.xyz/;
+        set $rewrite_host  "str003.steam302.xyz";
+        proxy_pass https://$rewrite_host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Real_IP $remote_addr;
         include proxy.params;
@@ -58,6 +59,7 @@ server {
         proxy_next_upstream_timeout 60;
         proxy_connect_timeout 6;
         include proxy.params;
+
     }
 }
 
@@ -156,7 +158,6 @@ server {
 
     location / {
         #set $rewrite_host  "${http_host}.edgesuite.net";
-        resolver public1.alidns.com valid=300 ipv4=on ipv6=off;
         #proxy_pass https://$rewrite_host;
         proxy_pass https://steamstatic-akamai;
         proxy_connect_timeout 5;
@@ -247,6 +248,7 @@ server {
         set $rewrite_host  "video.steamstatic.com.edgesuite.net";
         resolver public1.alidns.com valid=300 ipv4=on ipv6=off;
         proxy_pass https://$rewrite_host;
+
         proxy_http_version 1.1;
         proxy_connect_timeout 5;
         keepalive_timeout 120;
@@ -270,8 +272,7 @@ server {
     include cert.conf;
 
     location / {
-        set $rewrite_host  "${http_host}.edgesuite.net";
+        #set $rewrite_host  "${http_host}.edgesuite.net";
-        resolver public1.alidns.com valid=300 ipv4=on ipv6=off;
         proxy_pass https://steamstatic-akamai;
         proxy_connect_timeout 5;
         keepalive_timeout 120;

conf/Twitch.conf

@@ -6,6 +6,7 @@ upstream twitch-tv {
     server 151.101.194.167:443;
     server 151.101.230.167:443;
 #    server twitch.map.fastly.net:443;
+
 }
 
 server {
@@ -26,6 +27,7 @@ server {
     location / {
         set $twitch_tv twitch.map.fastly.net;
         proxy_pass https://$twitch_tv/;
+
         include proxy.params;
     }
 }
@@ -124,6 +126,7 @@ server {
     location / {
         set $rewrite_host "dbc180c27b3635f9e5b006f3a037b87e.steam302.xyz";
         proxy_pass https://$rewrite_host/;
+
         include proxy.params;
     }
 }
@@ -164,6 +167,7 @@ server {
     include cert.conf;
 
     location / {
+        resolver 9.9.9.12 valid=60;
         set $panels_twitch_tv d1ut6fykkt3imt.cloudfront.net;
         proxy_pass https://$panels_twitch_tv:443/;
         include proxy.params;
@@ -282,6 +286,7 @@ server {
     }
 }
 
+
 server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
@@ -306,6 +311,7 @@ server {
     location / {
         set $rewrite_host "985a89155dd090eacda1b82388e334ed.steam302.xyz";
         proxy_pass https://$rewrite_host/;
+
         include proxy.params;
     }
 }
@@ -398,6 +404,7 @@ server {
     }
 }
 
+
 server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;

conf/instagram.conf

@@ -86,5 +86,6 @@ server {
         proxy_buffers 16 32k;
         proxy_busy_buffers_size 128k;
         include proxy.params;
+
     }
 }