From 98d97efb507761503e31e021f598378ac6e445b6 Mon Sep 17 00:00:00 2001 From: lte2000 <35422407+lte2000@users.noreply.github.com> Date: Sat, 9 Nov 2019 17:20:01 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"Send=20Basic=20vs=20basic=20for=20Bas?= =?UTF-8?q?ic=20HTTP=20auth=20to=20deal=20with=20reportedly=20broke?= =?UTF-8?q?=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/auth.c | 2 +- src/proxy.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/auth.c b/src/auth.c index 7a3e79f..f34b20b 100644 --- a/src/auth.c +++ b/src/auth.c @@ -55,7 +55,7 @@ int clientnegotiate(struct chain * redir, struct clientparam * param, struct soc len += sprintf((char *)buf + len, ":%hu HTTP/1.0\r\nConnection: keep-alive\r\n", ntohs(*SAPORT(addr))); if(user){ - len += sprintf((char *)buf + len, "Proxy-authorization: Basic "); + len += sprintf((char *)buf + len, "Proxy-authorization: basic "); sprintf((char *)username, "%.128s:%.128s", user, pass?pass:(unsigned char *)""); en64(username, buf+len, (int)strlen((char *)username)); len = (int)strlen((char *)buf); diff --git a/src/proxy.c b/src/proxy.c index 43e1d26..16565f7 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -92,7 +92,7 @@ char * proxy_stringtable[] = { #ifndef NOCRYPT "Proxy-Authenticate: NTLM\r\n" #endif - "Proxy-Authenticate: Basic realm=\"proxy\"\r\n" + "Proxy-Authenticate: basic realm=\"proxy\"\r\n" "Connection: close\r\n" "Content-type: text/html; charset=utf-8\r\n" "\r\n" @@ -118,7 +118,7 @@ char * proxy_stringtable[] = { "

503 Service Unavailable

Your request violates configured policy

\r\n", /* 16*/ "HTTP/1.0 401 Authentication Required\r\n" - "WWW-Authenticate: Basic realm=\"FTP Server\"\r\n" + "WWW-Authenticate: basic realm=\"FTP Server\"\r\n" "Connection: close\r\n" "Content-type: text/html; charset=utf-8\r\n" "\r\n" @@ -859,7 +859,7 @@ for(;;){ sprintf((char*)buf+strlen((char *)buf), "Connection: %s\r\n", keepalive? "keep-alive":"close"); } if(param->extusername){ - sprintf((char*)buf + strlen((char *)buf), "%s: Basic ", (redirect)?"Proxy-Authorization":"Authorization"); + sprintf((char*)buf + strlen((char *)buf), "%s: basic ", (redirect)?"Proxy-Authorization":"Authorization"); sprintf((char*)username, "%.128s:%.128s", param->extusername, param->extpassword?param->extpassword:(unsigned char*)""); en64(username, buf+strlen((char *)buf), (int)strlen((char *)username)); sprintf((char*)buf + strlen((char *)buf), "\r\n");