Merge branch 'develop', version 0.9.8

cyfdecyf · Jun 19, 2016 · 41c0fb1 · 41c0fb1
2 parents 3794685 + 1f2130f
commit 41c0fb1
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,11 @@
+0.9.8 (2016-06-19)
+    * Fix OTA support bug in shadowsocks (report by @defia)
+    * Fix WeChat image url problem (by @breath-co2 @haha1903)
+    * Fix connection reset detection (by @fgid)
+
+0.9.7 (2016-05-04)
+    * Support shadowsocks OTA
+
 0.9.6 (2015-06-07)
     * Reload config by sending SIGUSR1 on Unix system
     * Load blocked/direct/stat file from same directory as rc file by default

diff --git a/README-en.md b/README-en.md
@@ -2,7 +2,7 @@
 
 COW is a HTTP proxy to simplify bypassing the great firewall. It tries to automatically identify blocked websites and only use parent proxy for those sites.
 
-Current version: 0.9.7 [CHANGELOG](CHANGELOG)
+Current version: 0.9.8 [CHANGELOG](CHANGELOG)
 [![Build Status](https://travis-ci.org/cyfdecyf/cow.png?branch=master)](https://travis-ci.org/cyfdecyf/cow)
 
 ## Features

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ COW 是一个简化穿墙的 HTTP 代理服务器。它能自动检测被墙网
 
 [English README](README-en.md).
 
-当前版本：0.9.7 [CHANGELOG](CHANGELOG)
+当前版本：0.9.8 [CHANGELOG](CHANGELOG)
 [![Build Status](https://travis-ci.org/cyfdecyf/cow.png?branch=master)](https://travis-ci.org/cyfdecyf/cow)
 
 **欢迎在 develop branch 进行开发并发送 pull request :)**

diff --git a/config.go b/config.go
@@ -16,7 +16,7 @@ import (
 )
 
 const (
-	version               = "0.9.7"
+	version               = "0.9.8"
 	defaultListenAddr     = "127.0.0.1:7777"
 	defaultEstimateTarget = "example.com"
 )

diff --git a/http.go b/http.go
@@ -306,7 +306,9 @@ func ParseRequestURIBytes(rawurl []byte) (*URL, error) {
 			port = "443"
 		}
 	}
-
+        // Fixed wechat image url bug, url like http://[::ffff:183.192.196.102]/mmsns/lVxxxxxx
+        host = strings.TrimSuffix(strings.TrimPrefix(host, "[::ffff:"), "]")
+        hostport = net.JoinHostPort(host, port)
 	return &URL{hostport, host, port, host2Domain(host), path}, nil
 }
 

diff --git a/install-cow.sh b/install-cow.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=0.9.7
+version=0.9.8
 
 arch=`uname -m`
 case $arch in

diff --git a/pac.go b/pac.go
@@ -116,6 +116,8 @@ function host2Domain(host) {
 function FindProxyForURL(url, host) {
 	if (url.substring(0,4) == "ftp:")
 		return direct;
+	if (host.substring(0,7) == "::ffff:")
+		return direct;
 	if (host.indexOf(".local", host.length - 6) !== -1) {
 		return direct;
 	}

diff --git a/proxy_unix.go b/proxy_unix.go
@@ -5,11 +5,12 @@ package main
 import (
 	"net"
 	"syscall"
+	"strings"
 )
 
 func isErrConnReset(err error) bool {
 	if ne, ok := err.(*net.OpError); ok {
-		return ne.Err == syscall.ECONNRESET
+		return strings.Contains(ne.Err.Error(), syscall.ECONNRESET.Error())
 	}
 	return false
 }