Merge branch 'develop', version 0.7.5

nzlov · Jul 25, 2013 · 29b0ed4 · 29b0ed4
2 parents 7a28cf1 + d906877
commit 29b0ed4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+0.7.5 (2013-07-25)
+    * Fix crash on IPv6 client authentication
+    * Provide ARMv6 binary
+
 0.7.4 (2013-07-15)
     * Fix adding extra connection header for client request with both
       "Proxy-Connection" and "Connection" headers

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 COW 是一个利用二级代理自动化穿越防火墙的 HTTP 代理服务器。它能自动检测被墙网站，仅对这些网站使用二级代理。
 
-当前版本：0.7.4 [CHANGELOG](CHANGELOG)
+当前版本：0.7.5 [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
@@ -15,7 +15,7 @@ import (
 )
 
 const (
-	version           = "0.7.4"
+	version           = "0.7.5"
 	defaultListenAddr = "127.0.0.1:7777"
 )
 

diff --git a/http.go b/http.go
@@ -497,7 +497,7 @@ func parseRequest(c *clientConn, r *Request) (err error) {
 
 	// Read request header
 	if err = r.parseHeader(reader, r.raw, r.URL); err != nil {
-		errl.Printf("Parsing request header: %v\n", err)
+		errl.Printf("Parsing request header: %v %v\n", err, r)
 		return err
 	}
 	if r.ConnectionKeepAlive {

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