Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
二次元的罪恶王冠
beego
提交
2f18b910
B
beego
项目概览
二次元的罪恶王冠
/
beego
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
B
beego
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2f18b910
编写于
3月 08, 2016
作者:
A
astaxie
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1679 from ysqi/emptybodyfix
fix #1669 and return IO error
上级
f6f34306
90344a7b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
38 addition
and
12 deletion
+38
-12
context/context.go
context/context.go
+10
-0
context/output.go
context/output.go
+6
-9
controller.go
controller.go
+1
-2
router_test.go
router_test.go
+20
-0
staticfile_test.go
staticfile_test.go
+1
-1
未找到文件。
context/context.go
浏览文件 @
2f18b910
...
...
@@ -24,11 +24,13 @@ package context
import
(
"bufio"
"bytes"
"crypto/hmac"
"crypto/sha1"
"encoding/base64"
"errors"
"fmt"
"io"
"net"
"net/http"
"strconv"
...
...
@@ -184,6 +186,14 @@ func (w *Response) Write(p []byte) (int, error) {
return
w
.
ResponseWriter
.
Write
(
p
)
}
// Write writes the data to the connection as part of an HTTP reply,
// and sets `started` to true.
// started means the response has sent out.
func
(
w
*
Response
)
Copy
(
buf
*
bytes
.
Buffer
)
(
int64
,
error
)
{
w
.
Started
=
true
return
io
.
Copy
(
w
.
ResponseWriter
,
buf
)
}
// WriteHeader sends an HTTP response header with status code,
// and sets `started` to true.
func
(
w
*
Response
)
WriteHeader
(
code
int
)
{
...
...
context/output.go
浏览文件 @
2f18b910
...
...
@@ -21,7 +21,6 @@ import (
"errors"
"fmt"
"html/template"
"io"
"mime"
"net/http"
"path/filepath"
...
...
@@ -57,7 +56,7 @@ func (output *BeegoOutput) Header(key, val string) {
// Body sets response body content.
// if EnableGzip, compress content string.
// it sends out response body directly.
func
(
output
*
BeegoOutput
)
Body
(
content
[]
byte
)
{
func
(
output
*
BeegoOutput
)
Body
(
content
[]
byte
)
error
{
var
encoding
string
var
buf
=
&
bytes
.
Buffer
{}
if
output
.
EnableGzip
{
...
...
@@ -75,7 +74,8 @@ func (output *BeegoOutput) Body(content []byte) {
output
.
Status
=
0
}
io
.
Copy
(
output
.
Context
.
ResponseWriter
,
buf
)
_
,
err
:=
output
.
Context
.
ResponseWriter
.
Copy
(
buf
)
return
err
}
// Cookie sets cookie value via given key.
...
...
@@ -186,8 +186,7 @@ func (output *BeegoOutput) JSON(data interface{}, hasIndent bool, coding bool) e
if
coding
{
content
=
[]
byte
(
stringsToJSON
(
string
(
content
)))
}
output
.
Body
(
content
)
return
nil
return
output
.
Body
(
content
)
}
// JSONP writes jsonp to response body.
...
...
@@ -212,8 +211,7 @@ func (output *BeegoOutput) JSONP(data interface{}, hasIndent bool) error {
callbackContent
.
WriteString
(
"("
)
callbackContent
.
Write
(
content
)
callbackContent
.
WriteString
(
");
\r\n
"
)
output
.
Body
(
callbackContent
.
Bytes
())
return
nil
return
output
.
Body
(
callbackContent
.
Bytes
())
}
// XML writes xml string to response body.
...
...
@@ -230,8 +228,7 @@ func (output *BeegoOutput) XML(data interface{}, hasIndent bool) error {
http
.
Error
(
output
.
Context
.
ResponseWriter
,
err
.
Error
(),
http
.
StatusInternalServerError
)
return
err
}
output
.
Body
(
content
)
return
nil
return
output
.
Body
(
content
)
}
// Download forces response for download file.
...
...
controller.go
浏览文件 @
2f18b910
...
...
@@ -185,8 +185,7 @@ func (c *Controller) Render() error {
return
err
}
c
.
Ctx
.
Output
.
Header
(
"Content-Type"
,
"text/html; charset=utf-8"
)
c
.
Ctx
.
Output
.
Body
(
rb
)
return
nil
return
c
.
Ctx
.
Output
.
Body
(
rb
)
}
// RenderString returns the rendered template string. Do not send out response.
...
...
router_test.go
浏览文件 @
2f18b910
...
...
@@ -65,6 +65,11 @@ func (tc *TestController) GetManyRouter() {
tc
.
Ctx
.
WriteString
(
tc
.
Ctx
.
Input
.
Query
(
":id"
)
+
tc
.
Ctx
.
Input
.
Query
(
":page"
))
}
func
(
tc
*
TestController
)
GetEmptyBody
()
{
var
res
[]
byte
tc
.
Ctx
.
Output
.
Body
(
res
)
}
type
ResStatus
struct
{
Code
int
Msg
string
...
...
@@ -239,6 +244,21 @@ func TestManyRoute(t *testing.T) {
}
}
// Test for issue #1669
func
TestEmptyResponse
(
t
*
testing
.
T
)
{
r
,
_
:=
http
.
NewRequest
(
"GET"
,
"/beego-empty.html"
,
nil
)
w
:=
httptest
.
NewRecorder
()
handler
:=
NewControllerRegister
()
handler
.
Add
(
"/beego-empty.html"
,
&
TestController
{},
"get:GetEmptyBody"
)
handler
.
ServeHTTP
(
w
,
r
)
if
body
:=
w
.
Body
.
String
();
body
!=
""
{
t
.
Error
(
"want empty body"
)
}
}
func
TestNotFound
(
t
*
testing
.
T
)
{
r
,
_
:=
http
.
NewRequest
(
"GET"
,
"/"
,
nil
)
w
:=
httptest
.
NewRecorder
()
...
...
staticfile_test.go
浏览文件 @
2f18b910
...
...
@@ -7,8 +7,8 @@ import (
"io"
"io/ioutil"
"os"
"testing"
"path/filepath"
"testing"
)
var
currentWorkDir
,
_
=
os
.
Getwd
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录