1

diff --git a/reqf/cookie.go b/reqf/cookie.go
index 00c82b35793a879bb89cf94a53d9ec6b18b2e4b9..7756aecc3de51235cea10eb7a16805a3513b55d9 100644 (file)
--- a/reqf/cookie.go
+++ b/reqf/cookie.go
@@ -1,65 +1,65 @@
 package part
 
 import (
-       "time"
-       "strings"
-       "net/http"
        "encoding/json"
+       "net/http"
+       "strings"
+       "time"
 )
 
 type CookieJson struct {
-    Name  string `json:"Name"`
-    Value string `json:"Value"`
+       Name  string `json:"Name"`
+       Value string `json:"Value"`
 
-    Path       string `json:"Path"`    // optional
-    Domain     string `json:"Domain"`    // optional
-    Expires    string `json:"Expires"` // time.Time in RFC1123
-    RawExpires string `json:"RawExpires"`    // for reading cookies only
+       Path       string `json:"Path"`       // optional
+       Domain     string `json:"Domain"`     // optional
+       Expires    string `json:"Expires"`    // time.Time in RFC1123
+       RawExpires string `json:"RawExpires"` // for reading cookies only
 
-    // MaxAge=0 means no 'Max-Age' attribute specified.
-    // MaxAge<0 means delete cookie now, equivalently 'Max-Age: 0'
-    // MaxAge>0 means Max-Age attribute present and given in seconds
-    MaxAge   int `json:"MaxAge"`
-    Secure   bool `json:"Secure"`
-    HttpOnly bool `json:"HttpOnly"`
-    SameSite http.SameSite `json:"SameSite"` // Go 1.11
-    Raw      string `json:"Raw"`
-    Unparsed []string `json:"Unparsed"` // Raw text of unparsed attribute-value pairs
+       // MaxAge=0 means no 'Max-Age' attribute specified.
+       // MaxAge<0 means delete cookie now, equivalently 'Max-Age: 0'
+       // MaxAge>0 means Max-Age attribute present and given in seconds
+       MaxAge   int           `json:"MaxAge"`
+       Secure   bool          `json:"Secure"`
+       HttpOnly bool          `json:"HttpOnly"`
+       SameSite http.SameSite `json:"SameSite"` // Go 1.11
+       Raw      string        `json:"Raw"`
+       Unparsed []string      `json:"Unparsed"` // Raw text of unparsed attribute-value pairs
 }
 
-func (t *CookieJson) ToJson() ([]byte,error) {
+func (t *CookieJson) ToJson() ([]byte, error) {
        return json.Marshal(t)
 }
 
-func (t *CookieJson) FromJson(cookie_in_json []byte) (error) {
+func (t *CookieJson) FromJson(cookie_in_json []byte) error {
        return json.Unmarshal(cookie_in_json, t)
 }
 
-func (t *CookieJson) ToCookie() (http.Cookie,error) {
-       exp,e := time.Parse(time.RFC1123, t.Expires)
+func (t *CookieJson) ToCookie() (http.Cookie, error) {
+       exp, e := time.Parse(time.RFC1123, t.Expires)
        if exp.IsZero() {
-               exp = time.Now().Add(time.Duration(t.MaxAge)*time.Second)
+               exp = time.Now().Add(time.Duration(t.MaxAge) * time.Second)
        }
        return http.Cookie{
-               Name:t.Name,
-               Value:t.Value,
-               Path:t.Path,
-               Domain:t.Domain,
-               Expires:exp,
-               RawExpires:t.RawExpires,
-               MaxAge:t.MaxAge,
-               Secure:t.Secure,
-               HttpOnly:t.HttpOnly,
-               SameSite:t.SameSite,
-               Raw:t.Raw,
-               Unparsed:t.Unparsed,
-       },e
+               Name:       t.Name,
+               Value:      t.Value,
+               Path:       t.Path,
+               Domain:     t.Domain,
+               Expires:    exp,
+               RawExpires: t.RawExpires,
+               MaxAge:     t.MaxAge,
+               Secure:     t.Secure,
+               HttpOnly:   t.HttpOnly,
+               SameSite:   t.SameSite,
+               Raw:        t.Raw,
+               Unparsed:   t.Unparsed,
+       }, e
 }
 
 func (t *CookieJson) FromCookie(cookie *http.Cookie) {
        exp_t := cookie.Expires
        if exp_t.IsZero() {
-               exp_t = time.Now().Add(time.Duration(cookie.MaxAge)*time.Second)
+               exp_t = time.Now().Add(time.Duration(cookie.MaxAge) * time.Second)
        }
        exp := exp_t.Format(time.RFC1123)
 
@@ -78,30 +78,59 @@ func (t *CookieJson) FromCookie(cookie *http.Cookie) {
 }
 
 func Cookies_String_2_Map(Cookies string) (o map[string]string) {
-    o = make(map[string]string)
-    list := strings.Split(Cookies, `; `)
-    for _,v := range list {
-        s := strings.SplitN(v, "=", 2)
-        if len(s) != 2 {continue}
-        o[s[0]] = s[1]
-    }
-    return
+       o = make(map[string]string)
+       list := strings.Split(Cookies, `; `)
+       for _, v := range list {
+               s := strings.SplitN(v, "=", 2)
+               if len(s) != 2 {
+                       continue
+               }
+               o[s[0]] = s[1]
+       }
+       return
 }
 
 func Map_2_Cookies_String(Cookies map[string]string) (o string) {
-    if len(Cookies) == 0 {return ""}
-    for k,v := range Cookies {
-        o += k +`=`+ v + `; `
-    }
-    t := []rune(o)
-    o = string(t[:len(t)-2])
-    return
+       if len(Cookies) == 0 {
+               return ""
+       }
+       for k, v := range Cookies {
+               o += k + `=` + v + `; `
+       }
+       t := []rune(o)
+       o = string(t[:len(t)-2])
+       return
 }
 
 func Cookies_List_2_Map(Cookies []*http.Cookie) (o map[string]string) {
-    o = make(map[string]string)
-    for _,v := range Cookies {
+       o = make(map[string]string)
+       for _, v := range Cookies {
                o[v.Name] = v.Value
-    }
-    return
-}
\ No newline at end of file
+       }
+       return
+}
+
+func Cookies_String_2_List(Cookies string) (o []*http.Cookie) {
+       list := strings.Split(Cookies, `; `)
+       for _, v := range list {
+               s := strings.SplitN(v, "=", 2)
+               if len(s) != 2 {
+                       continue
+               }
+               o = append(o, &http.Cookie{
+                       Name:  s[0],
+                       Value: s[1],
+               })
+       }
+       return
+}
+
+func Cookies_Map_2_List(Cookies map[string]string) (o []*http.Cookie) {
+       for k, v := range Cookies {
+               o = append(o, &http.Cookie{
+                       Name:  k,
+                       Value: v,
+               })
+       }
+       return
+}