cmd/stepd: Resetting makes a bit more sense now
This commit is contained in:
parent
60f1b62965
commit
243659e9ee
@ -84,9 +84,10 @@ func (this *handler) serveFile (res http.ResponseWriter, req *http.Request, file
|
|||||||
}
|
}
|
||||||
|
|
||||||
// set up HTTP response recorder
|
// set up HTTP response recorder
|
||||||
recorder := step.HTTPResponseRecorder {
|
recorder := step.HTTPResponseRecorder { }
|
||||||
Status: http.StatusOK,
|
resetRecorder := func () {
|
||||||
Head: res.Header(),
|
recorder.Reset()
|
||||||
|
recorder.Header = res.Header().Clone()
|
||||||
}
|
}
|
||||||
if contentType, ok := document.FrontMatter["content-type"]; ok {
|
if contentType, ok := document.FrontMatter["content-type"]; ok {
|
||||||
recorder.Header().Set("Content-Type", contentType)
|
recorder.Header().Set("Content-Type", contentType)
|
||||||
@ -99,9 +100,9 @@ func (this *handler) serveFile (res http.ResponseWriter, req *http.Request, file
|
|||||||
|
|
||||||
// execute document
|
// execute document
|
||||||
data := step.HTTPData { }
|
data := step.HTTPData { }
|
||||||
data.Res.Header = make(http.Header)
|
data.Res.Header = recorder.Header
|
||||||
data.Res.WriteHeader = recorder.WriteHeader
|
data.Res.WriteHeader = recorder.WriteHeader
|
||||||
data.Res.Reset = recorder.Reset
|
data.Res.Reset = resetRecorder
|
||||||
data.Req = req
|
data.Req = req
|
||||||
err = document.Execute(&recorder, step.ExecutionData {
|
err = document.Execute(&recorder, step.ExecutionData {
|
||||||
Data: data,
|
Data: data,
|
||||||
|
Loading…
Reference in New Issue
Block a user