Merge pull request #664 from suzaku/simplify

len(k) is guaranteed to be greater than 1 in this case

Author: dhui

util.go

@@ -53,7 +53,7 @@ func FilterCustomQuery(u *nurl.URL) *nurl.URL {
 	ux := *u
 	vx := make(nurl.Values)
 	for k, v := range ux.Query() {
-		if len(k) <= 1 || (len(k) > 1 && k[0:2] != "x-") {
+		if len(k) <= 1 || k[0:2] != "x-" {
 			vx[k] = v
 		}
 	}

util_test.go

@@ -21,12 +21,15 @@ func TestSuint(t *testing.T) {
 }
 
 func TestFilterCustomQuery(t *testing.T) {
-	n, err := nurl.Parse("foo://host?a=b&x-custom=foo&c=d")
+	n, err := nurl.Parse("foo://host?a=b&x-custom=foo&c=d&ok=y")
 	if err != nil {
 		t.Fatal(err)
 	}
 	nx := FilterCustomQuery(n).Query()
 	if nx.Get("x-custom") != "" {
 		t.Fatalf("didn't expect x-custom")
 	}
+	if nx.Get("ok") != "y" {
+		t.Fatalf("expected ok=y, got %v", nx.Get("ok"))
+	}
 }