From e2351034e6e66649e693bda74829a54b92508200 Mon Sep 17 00:00:00 2001
From: z3APA3A <3APA3A@3proxy.ru>
Date: Mon, 22 Feb 2016 22:43:22 +0300
Subject: [PATCH] Change encoding to utf-8 in strings
---
doc/html/plugins/StringsPlugin.html | 4 ++--
src/proxy.c | 28 ++++++++++++++--------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/doc/html/plugins/StringsPlugin.html b/doc/html/plugins/StringsPlugin.html
index de00c92..f0f76cc 100644
--- a/doc/html/plugins/StringsPlugin.html
+++ b/doc/html/plugins/StringsPlugin.html
@@ -2,10 +2,10 @@
3proxy strings substitution plugin
May be used to make interface more pretty or to translate proxy server
messages to different language. All messages are taken from proxy.c and
-moved to external text file (e.g. rus-win1251.3ps). On the moment of
+moved to external text file (e.g. rus.3ps). On the moment of
writing there are 15 sections. Sections are delimited with "[end]".
Example:
-plugin "StringsPlugin.dll" start c:\3proxy\bin\rus-win1251.3ps
+plugin "StringsPlugin.dll" start c:\3proxy\bin\rus.3ps
Download:
diff --git a/src/proxy.c b/src/proxy.c
index 197df73..46bba1f 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -14,49 +14,49 @@
char * proxy_stringtable[] = {
/* 0 */ "HTTP/1.0 400 Bad Request\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"400 Bad Request\r\n"
"400 Bad Request
\r\n",
/* 1 */ "HTTP/1.0 502 Bad Gateway\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"502 Bad Gateway\r\n"
"502 Bad Gateway
Host Not Found or connection failed
\r\n",
/* 2 */ "HTTP/1.0 503 Service Unavailable\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"503 Service Unavailable\r\n"
"503 Service Unavailable
You have exceeded your traffic limit
\r\n",
/* 3 */ "HTTP/1.0 503 Service Unavailable\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"503 Service Unavailable\r\n"
"503 Service Unavailable
Recursion detected
\r\n",
/* 4 */ "HTTP/1.0 501 Not Implemented\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"501 Not Implemented\r\n"
"501 Not Implemented
Required action is not supported by proxy server
\r\n",
/* 5 */ "HTTP/1.0 502 Bad Gateway\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"502 Bad Gateway\r\n"
"502 Bad Gateway
Failed to connect parent proxy
\r\n",
/* 6 */ "HTTP/1.0 500 Internal Error\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"500 Internal Error\r\n"
"500 Internal Error
Internal proxy error during processing your request
\r\n",
@@ -64,7 +64,7 @@ char * proxy_stringtable[] = {
/* 7 */ "HTTP/1.0 407 Proxy Authentication Required\r\n"
"Proxy-Authenticate: Basic realm=\"proxy\"\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"407 Proxy Authentication Required\r\n"
"407 Proxy Authentication Required
Access to requested resource disallowed by administrator or you need valid username/password to use this resource
\r\n",
@@ -76,14 +76,14 @@ char * proxy_stringtable[] = {
/* 10*/ "HTTP/1.0 404 Not Found\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"404 Not Found\r\n"
"404 Not Found
File not found\r\n",
/* 11*/ "HTTP/1.0 403 Forbidden\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"403 Access Denied\r\n"
"403 Access Denied
Access control list denies you to access this resource\r\n",
@@ -94,7 +94,7 @@ char * proxy_stringtable[] = {
#endif
"Proxy-Authenticate: basic realm=\"proxy\"\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"407 Proxy Authentication Required\r\n"
"407 Proxy Authentication Required
Access to requested resource disallowed by administrator or you need valid username/password to use this resource
\r\n",
@@ -106,13 +106,13 @@ char * proxy_stringtable[] = {
/* 14*/ "HTTP/1.0 403 Forbidden\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"",
/* 15*/ "HTTP/1.0 503 Service Unavailable\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"503 Service Unavailable\r\n"
"503 Service Unavailable
Your request violates configured policy
\r\n",
@@ -120,7 +120,7 @@ char * proxy_stringtable[] = {
/* 16*/ "HTTP/1.0 401 Authentication Required\r\n"
"WWW-Authenticate: basic realm=\"FTP Server\"\r\n"
"Proxy-Connection: close\r\n"
- "Content-type: text/html; charset=us-ascii\r\n"
+ "Content-type: text/html; charset=utf-8\r\n"
"\r\n"
"401 FTP Server requires authentication\r\n"
"401 FTP Server requires authentication
This FTP server rejects anonymous access
\r\n",