lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 17:40:55 +00:00
Code Issues Releases Activity

zero timeout means wait until resp

Browse Source
This commit is contained in:
JessonChan 2015-04-26 02:17:46 +08:00 committed by astaxie
parent 69fc22f0df
commit 738e22e389
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
httplib/httplib.go
View File

@ -65,14 +65,8 @@ func createDefaultCookie() {
// Overwrite default settings // Overwrite default settings
func SetDefaultSetting(setting BeegoHttpSettings) { func SetDefaultSetting(setting BeegoHttpSettings) {
settingMutex.Lock() settingMutex.Lock()
defer settingMutex.Unlock()
defaultSetting = setting defaultSetting = setting
if defaultSetting.ConnectTimeout == 0 { settingMutex.Unlock()
defaultSetting.ConnectTimeout = 60 * time.Second
}
if defaultSetting.ReadWriteTimeout == 0 {
defaultSetting.ReadWriteTimeout = 60 * time.Second
}
} }
// return *BeegoHttpRequest with specific method // return *BeegoHttpRequest with specific method
@ -262,11 +256,11 @@ func (b *BeegoHttpRequest) PostFile(formname, filename string) *BeegoHttpRequest
// it supports string and []byte. // it supports string and []byte.
func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest {
switch t := data.(type) { switch t := data.(type) {
case string: case string:
bf := bytes.NewBufferString(t) bf := bytes.NewBufferString(t)
b.req.Body = ioutil.NopCloser(bf) b.req.Body = ioutil.NopCloser(bf)
b.req.ContentLength = int64(len(t)) b.req.ContentLength = int64(len(t))
case []byte: case []byte:
bf := bytes.NewBuffer(t) bf := bytes.NewBuffer(t)
b.req.Body = ioutil.NopCloser(bf) b.req.Body = ioutil.NopCloser(bf)
b.req.ContentLength = int64(len(t)) b.req.ContentLength = int64(len(t))