Add basic auth support, auth mechanism in order, keep-alive during auth

HISTORY.txt

@@ -1,14 +1,19 @@
 TBD
-- Add support for issue #58 - authentication with user/password when SSPI is
+- Added support for issue #58 - authentication with user/password when SSPI is
   unavailable or not preferred.
-- Pull PR #68 to handle case where no longer behind PAC proxy
-- Fix minor bug in file:// PAC file handling
+- Pulled PR #68 to handle case where no longer behind PAC proxy
+- Fixed minor bug in file:// PAC file handling
 - Implemented #65 - support for specifying PAC in INI
 - Implemented #73 - force auth mechanism in INI
-- Merge PR #85 - sanitize authorization header, shutdown socket, defer
+- Merged PR #85 - sanitize authorization header, shutdown socket, defer
   connection header during auth (#71), drop completely for CONNECT, forward
   error body, 2.7 fix
-- Switch to Python 3.7, drop 3.4 support
+- Switched to Python 3.7, drop 3.4 support
+- Merged PR #80 - fallback to DIRECT if no proxy found via auto or PAC discovery
+- Added basic auth support (PR #82)
+- Fixed issue where an empty domain was breaking password access
+- Fixed #88, issue 2 in #71, PR #83 - use auth mechanism in order
+- Added code to keep-alive during authentication - issue 3 in #71
 
 v0.4.0 - 2018-09-04
 - Implemented #18 - support for multiple NTLM proxies that will be iterated

README.md

@@ -207,8 +207,8 @@ Configuration:
   Force instead of discovering upstream proxy type
     By default, Px will attempt to discover the upstream proxy type and either
     use pywin32/ntlm-auth for NTLM auth or winkerberos for Kerberos or Negotiate
-    auth. This option will force either NTLM or Kerberos and not query the
-    upstream proxy type. Case sensitive 'NTLM' or 'Kerberos'.
+    auth. This option will force either NTLM, Kerberos or Basic and not query the
+    upstream proxy type.
 
   --workers=  settings:workers=
   Number of parallel workers (processes). Valid integer, default: 2

px.ini

@@ -61,8 +61,8 @@ username =
 ; Force instead of discovering upstream proxy type
 ;   By default, Px will attempt to discover the upstream proxy type and either
 ;   use pywin32/ntlm-auth for NTLM auth or winkerberos for Kerberos or Negotiate
-;   auth. This option will force either NTLM or Kerberos and not query the
-;   upstream proxy type. Case sensitive 'NTLM' or 'Kerberos'.
+;   auth. This option will force either NTLM, Kerberos or Basic and not query the
+;   upstream proxy type.
 auth =
 
 [settings]