fix #39

v3aqb · Jan 22, 2015 · 8eb2e91 · 8eb2e91
1 parent 1a4af69
commit 8eb2e91
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/fgfw-lite/connection.py b/fgfw-lite/connection.py
@@ -56,8 +56,8 @@ def do_tunnel(soc, netloc, pp, timeout):
     s = ['CONNECT %s:%s HTTP/1.1\r\n' % (netloc[0], netloc[1]), ]
     if pp.parse.username:
         a = '%s:%s' % (pp.parse.username, pp.parse.password)
-        s.append('Proxy-Authorization: Basic %s' % base64.b64encode(a.encode()))
-    s.append('\r\n\r\n')
+        s.append('Proxy-Authorization: Basic %s\r\n' % base64.b64encode(a.encode()))
+    s.append('Host: %s:%s\r\n\r\n' % (netloc[0], netloc[1]))
     soc.settimeout(timeout)
     soc.sendall(''.join(s).encode())
     remoterfile = soc.makefile('rb', 0)

diff --git a/fgfw-lite/update.json b/fgfw-lite/update.json
@@ -5,15 +5,15 @@
     "./README.md": "71c8458d827269966bd72ccbcbb833cc9a504b545a5febb4e19e5dff4bd8b235",
     "./fgfw-lite/apfilter.py": "530d6ccc9c1be8c0d0c002ad1b1e9fbc30a3ab298129e6a78f3a5b2178b7e0b9",
     "./fgfw-lite/cloud.txt": "a7e695ba483793bd616fb5fbc12feacf3fa39e514721524a64306cc0f07213ba",
-    "./fgfw-lite/connection.py": "17dee9141ed7e124e7fa367222356614024feb396d3a0e82825f6d7dbe6fcf9b",
+    "./fgfw-lite/connection.py": "a9ba9ffbfbce520627fdcbc1c821d94cfa8dc3fdb9276b0e988dbca7bdf57fba",
     "./fgfw-lite/ctypes_libsodium.py": "b0247da98cbfe91e72e2ecac7bf271e524301912e0a5d37e4e5d5b7cd4308286",
     "./fgfw-lite/dh.py": "5e9d2b5179168385fea9e9fbb7dd341e0826b84b39234414b5e09b1b40b6583b",
     "./fgfw-lite/encrypt.py": "69ca5edc88f85cb58489b8eb2a9e128de34635340a73cd81404ef935bbcde8b1",
     "./fgfw-lite/fgfw-lite.py": "1a8d44d475919e1402c2467e71ec8c5d98b62ac778faa2b77183d2894d6898fb",
     "./fgfw-lite/httputil.py": "b7916d4f5cff65d0f2fc2995e54550b8e71a7c3c27ab4ac3148747b88881ebf0",
     "./fgfw-lite/hxsocks.py": "6b7d8a7599135a8dc1033eae08e2debd471aff2aeb7c371a66099b412d611ac8",
     "./fgfw-lite/parent_proxy.py": "33618b1da287028dec120a25bc2148138fba775bc723cd0ba02c60242072a982",
-    "./fgfw-lite/resolver.py": "1893f76fc06d38e61c78cb6bb4a93883f375faaa7311e0ebe66dae06398a80cd",
+    "./fgfw-lite/resolver.py": "65900f843e8c658147317f80f23e4d87d8164e28d5bea01d9f5d72583b89759b",
     "./fgfw-lite/shadowsocks.py": "47011745ad2227ed4a7355bf737e5ea1f8b0e7964fd193b99c8fa5e0821503b9",
     "./fgfw-lite/singleton.py": "2fc7ed8cfc47b001053a257f9e8ad521edcef446776adaee022122eb6dbda152",
     "./fgfw-lite/streamcipher.py": "3be7f63c6e2f788f116bcdcb0e7f891a45c7e109af4c2ce19e6677af989c456f",
@@ -23,7 +23,7 @@
     "./fgfw-lite/ui_redirectorrules.py": "b1fe3ce85f0893b2ea520325e3e257f5bfba60b1f1268a0a06235efc04a345ac",
     "./fgfw-lite/ui_remoteresolver.py": "25033c41b07a99c0dd265152fa45e9156f5667a8139f6e98b01a2af103cfa015",
     "./fgfw-lite/ui_settings.py": "8b6d859aa54444e34646d90d529759f71d2488d9bc03941b2b417121cb4c30ec",
-    "./fgfw-lite/util.py": "1764abe9f86a473dac0a2f6c9d4adf6eefc3c33e24d5fc333f06f361ddcfb725",
+    "./fgfw-lite/util.py": "95c0f77a190106c4d98d98bc740769d4f4259169c79016774d4649668aaaf69b",
     "./goagent/GeoIP.dat": "642680a7c98da514dfbd1b4921cf590fca9a913141843fd773e7330145579d3c",
     "./goagent/cacert.pem": "eb1288b800cb2fdf7c5d8d14fb79a5c00a8b05722c7f2a08763919ef6df11dc3",
     "./goagent/proxy.py": "01f583fc19c5fd8a229317fded5712dbc5286c9ccbeaf9959b6e10104587ef24",

diff --git a/version.ini b/version.ini
@@ -13,7 +13,7 @@ fgfw-lite-ui_mainwindow.py = 82625cc9119fc2a77ede733c6202ee09ec1fa4fac2e2c9ee29e
 fgfw-lite-ui_redirectorrules.py = b1fe3ce85f0893b2ea520325e3e257f5bfba60b1f1268a0a06235efc04a345ac
 fgfw-lite-ui_remoteresolver.py = 25033c41b07a99c0dd265152fa45e9156f5667a8139f6e98b01a2af103cfa015
 fgfw-lite-ui_settings.py = 8b6d859aa54444e34646d90d529759f71d2488d9bc03941b2b417121cb4c30ec
-fgfw-lite-util.py = 1764abe9f86a473dac0a2f6c9d4adf6eefc3c33e24d5fc333f06f361ddcfb725
+fgfw-lite-util.py = 95c0f77a190106c4d98d98bc740769d4f4259169c79016774d4649668aaaf69b
 FW_Lite.exe = 266498c1e92c1858850fcadd6589a87a6e505259b156a8b09356e8a6584bfe40
 FW_Lite.pyw = aeb00688bf585c033267af31035aa417d96b0cdb7e78a3d0b13148b19ec1b0fb
 goagent-proxy.sample.ini = 9badde4fb3723074819a968ed4d05ca2475b00938196b1ea212db82b73a811b3
@@ -26,9 +26,9 @@ userconf.sample.ini = d1f0f1d65ffd7aa6573d1c54a491b3cd97489c19448d6a64fb1ed16134
 fgfw-lite-apfilter.py = 530d6ccc9c1be8c0d0c002ad1b1e9fbc30a3ab298129e6a78f3a5b2178b7e0b9
 release_note.txt = 1ab815f89a3e6f2f6306a39800a74aaca91a4ec55ab2da1b9b3648cb24d8193c
 fgfw-lite-shadowsocks.py = 47011745ad2227ed4a7355bf737e5ea1f8b0e7964fd193b99c8fa5e0821503b9
-fgfw-lite-resolver.py = 1893f76fc06d38e61c78cb6bb4a93883f375faaa7311e0ebe66dae06398a80cd
+fgfw-lite-resolver.py = 65900f843e8c658147317f80f23e4d87d8164e28d5bea01d9f5d72583b89759b
 fgfw-lite-parent_proxy.py = 33618b1da287028dec120a25bc2148138fba775bc723cd0ba02c60242072a982
-fgfw-lite-connection.py = 17dee9141ed7e124e7fa367222356614024feb396d3a0e82825f6d7dbe6fcf9b
+fgfw-lite-connection.py = a9ba9ffbfbce520627fdcbc1c821d94cfa8dc3fdb9276b0e988dbca7bdf57fba
 fgfw-lite-httputil.py = b7916d4f5cff65d0f2fc2995e54550b8e71a7c3c27ab4ac3148747b88881ebf0
 fgfw-lite-ctypes_libsodium.py = b0247da98cbfe91e72e2ecac7bf271e524301912e0a5d37e4e5d5b7cd4308286
 fgfw-lite-dh.py = 5e9d2b5179168385fea9e9fbb7dd341e0826b84b39234414b5e09b1b40b6583b