Merge pull request #769 from JessonChan/develop
improve and typo fixed
Showing
1 changed file
with
6 additions
and
10 deletions
| ... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
| 14 | 14 | ||
| 15 | // Usage: | 15 | // Usage: |
| 16 | // | 16 | // |
| 17 | // import "github.com/astaxie/beego/context" | 17 | // import "github.com/astaxie/beego/httplib" |
| 18 | // | 18 | // |
| 19 | // b := httplib.Post("http://beego.me/") | 19 | // b := httplib.Post("http://beego.me/") |
| 20 | // b.Param("username","astaxie") | 20 | // b.Param("username","astaxie") |
| ... | @@ -53,7 +53,7 @@ var defaultSetting = BeegoHttpSettings{false, "beegoServer", 60 * time.Second, 6 | ... | @@ -53,7 +53,7 @@ var defaultSetting = BeegoHttpSettings{false, "beegoServer", 60 * time.Second, 6 |
| 53 | var defaultCookieJar http.CookieJar | 53 | var defaultCookieJar http.CookieJar |
| 54 | var settingMutex sync.Mutex | 54 | var settingMutex sync.Mutex |
| 55 | 55 | ||
| 56 | // createDefaultCookieJar creates a global cookiejar to store cookies. | 56 | // createDefaultCookie creates a global cookiejar to store cookies. |
| 57 | func createDefaultCookie() { | 57 | func createDefaultCookie() { |
| 58 | settingMutex.Lock() | 58 | settingMutex.Lock() |
| 59 | defer settingMutex.Unlock() | 59 | defer settingMutex.Unlock() |
| ... | @@ -75,14 +75,14 @@ func SetDefaultSetting(setting BeegoHttpSettings) { | ... | @@ -75,14 +75,14 @@ func SetDefaultSetting(setting BeegoHttpSettings) { |
| 75 | 75 | ||
| 76 | // return *BeegoHttpRequest with specific method | 76 | // return *BeegoHttpRequest with specific method |
| 77 | func newBeegoRequest(url, method string) *BeegoHttpRequest { | 77 | func newBeegoRequest(url, method string) *BeegoHttpRequest { |
| 78 | var resp http.Response | ||
| 78 | req := http.Request{ | 79 | req := http.Request{ |
| 80 | Method: method, | ||
| 81 | Header: make(http.Header), | ||
| 79 | Proto: "HTTP/1.1", | 82 | Proto: "HTTP/1.1", |
| 80 | ProtoMajor: 1, | 83 | ProtoMajor: 1, |
| 81 | ProtoMinor: 1, | 84 | ProtoMinor: 1, |
| 82 | } | 85 | } |
| 83 | var resp http.Response | ||
| 84 | req.Method = method | ||
| 85 | req.Header = http.Header{} | ||
| 86 | return &BeegoHttpRequest{url, &req, map[string]string{}, map[string]string{}, defaultSetting, &resp, nil} | 86 | return &BeegoHttpRequest{url, &req, map[string]string{}, map[string]string{}, defaultSetting, &resp, nil} |
| 87 | } | 87 | } |
| 88 | 88 | ||
| ... | @@ -101,7 +101,7 @@ func Put(url string) *BeegoHttpRequest { | ... | @@ -101,7 +101,7 @@ func Put(url string) *BeegoHttpRequest { |
| 101 | return newBeegoRequest(url, "PUT") | 101 | return newBeegoRequest(url, "PUT") |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | // Delete returns *BeegoHttpRequest DELETE GET method. | 104 | // Delete returns *BeegoHttpRequest DELETE method. |
| 105 | func Delete(url string) *BeegoHttpRequest { | 105 | func Delete(url string) *BeegoHttpRequest { |
| 106 | return newBeegoRequest(url, "DELETE") | 106 | return newBeegoRequest(url, "DELETE") |
| 107 | } | 107 | } |
| ... | @@ -310,10 +310,6 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { | ... | @@ -310,10 +310,6 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { |
| 310 | } | 310 | } |
| 311 | 311 | ||
| 312 | url, err := url.Parse(b.url) | 312 | url, err := url.Parse(b.url) |
| 313 | if url.Scheme == "" { | ||
| 314 | b.url = "http://" + b.url | ||
| 315 | url, err = url.Parse(b.url) | ||
| 316 | } | ||
| 317 | if err != nil { | 313 | if err != nil { |
| 318 | return nil, err | 314 | return nil, err |
| 319 | } | 315 | } | ... | ... |
-
Please register or sign in to post a comment