Fix jar hostname handling

Update firebird version

jar.go

@@ -9,51 +9,25 @@ import (
 
 type cookieMap map[string]map[string]*http.Cookie
 
+// An http cookiejar implementation that doesn't suck ass.
 type KiwiJar struct {
 	cookieMap
-	mutex *sync.Mutex
+	mutex sync.Mutex
+
+	init func()
 }
 
-func newCookieMap() cookieMap {
-	return make(cookieMap, 2)
-}
+func NewKiwiJar() *KiwiJar {
+	kj := new(KiwiJar)
+	kj.init = sync.OnceFunc(func() {
+		kj.cookieMap = make(cookieMap, 2)
+	})
 
-func NewKiwiJar(domain *url.URL, cookies string) (kj *KiwiJar, err error) {
-	kj = &KiwiJar{
-		cookieMap: newCookieMap(),
-		mutex:     &sync.Mutex{},
-	}
-	kj.newDomain(domain)
-
-	if cookies == "" {
-		return
-	}
-
-	cs, err := parseCookieString(cookies)
-	if err != nil {
-		return
-	}
-	kj.SetCookies(domain, cs)
-
-	return
-}
-
-func (kj *KiwiJar) checkAlloc(u *url.URL) {
-	if kj.cookieMap == nil || kj.cookieMap[u.Hostname()] == nil {
-		kj.newDomain(u)
-	}
-}
-
-func (kj *KiwiJar) SetCookies(u *url.URL, cookies []*http.Cookie) {
-	kj.checkAlloc(u)
-
-	for _, c := range cookies {
-		kj.SetCookie(u, c)
-	}
+	return kj
 }
 
 func (kj *KiwiJar) Cookies(u *url.URL) []*http.Cookie {
-	kj.checkAlloc(u)
+	kj.newDomain(u)
 
 	hn := u.Hostname()
 	res := make(chan []*http.Cookie, 1)
@@ -62,16 +36,9 @@ func (kj *KiwiJar) Cookies(u *url.URL) []*http.Cookie {
 		kj.mutex.Lock()
 		defer kj.mutex.Unlock()
 
-		cl := len(kj.cookieMap[hn])
-		cs := make([]*http.Cookie, cl)
-		i := 0
+		cs := make([]*http.Cookie, 0, len(kj.cookieMap[hn]))
 		for _, c := range kj.cookieMap[hn] {
-			if i >= cl {
-				break
-			}
-
-			cs[i] = c
-			i++
+			cs = append(cs, c)
 		}
 
 		res <- cs
@@ -80,6 +47,22 @@ func (kj *KiwiJar) Cookies(u *url.URL) []*http.Cookie {
 	return <-res
 }
 
+func (kj *KiwiJar) ParseString(u *url.URL, cookies string) error {
+	if cookies == "" {
+		return nil
+	}
+
+	cs, err := parseCookieString(cookies)
+	if err != nil {
+		return err
+	}
+
+	kj.init()
+	kj.SetCookies(u, cs)
+
+	return nil
+}
+
 func (kj *KiwiJar) CookieString(u *url.URL) (cookies string) {
 	cs := kj.Cookies(u)
 	for _, c := range cs {
@@ -94,7 +77,7 @@ func (kj *KiwiJar) CookieString(u *url.URL) (cookies string) {
 }
 
 func (kj *KiwiJar) GetCookie(u *url.URL, name string) *http.Cookie {
-	kj.checkAlloc(u)
+	kj.newDomain(u)
 
 	res := make(chan *http.Cookie, 1)
 
@@ -108,35 +91,57 @@ func (kj *KiwiJar) GetCookie(u *url.URL, name string) *http.Cookie {
 	return <-res
 }
 
+func (kj *KiwiJar) set(u *url.URL, cookie *http.Cookie) {
+	kj.mutex.Lock()
+	defer kj.mutex.Unlock()
+
+	kj.cookieMap[u.Hostname()][cookie.Name] = cookie
+}
+
 func (kj *KiwiJar) SetCookie(u *url.URL, cookie *http.Cookie) {
-	kj.checkAlloc(u)
+	kj.newDomain(u)
 
 	done := make(chan bool, 1)
 
 	go func() {
-		kj.mutex.Lock()
-		defer kj.mutex.Unlock()
-
-		kj.cookieMap[u.Hostname()][cookie.Name] = cookie
-		done <- true
+		defer close(done)
+		kj.set(u, cookie)
 	}()
 
 	<-done
 }
 
-func (kj *KiwiJar) newDomain(domain *url.URL) {
-	if kj.cookieMap == nil {
-		kj.cookieMap = newCookieMap()
+func (kj *KiwiJar) SetCookies(u *url.URL, cookies []*http.Cookie) {
+	kj.newDomain(u)
+
+	var wg sync.WaitGroup
+
+	for _, c := range cookies {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			kj.set(u, c)
+		}()
+	}
+
+	wg.Wait()
+}
+
+func (kj *KiwiJar) newDomain(u *url.URL) {
+	kj.init()
+	if kj.cookieMap[u.Hostname()] != nil {
+		return
 	}
 
 	done := make(chan bool, 1)
 
 	go func() {
+		defer close(done)
+
 		kj.mutex.Lock()
 		defer kj.mutex.Unlock()
 
-		kj.cookieMap[domain.Hostname()] = make(map[string]*http.Cookie, 16)
-		done <- true
+		kj.cookieMap[u.Hostname()] = make(map[string]*http.Cookie, 16)
 	}()
 
 	<-done