Merge pull request revel#1166 from notzippy/server-engine

notzippy · web-flow · commit a8facfe629ff · 2017-04-26T17:56:28.000-07:00
Changed SetHeader to SetHttpHeader, HeaderHttpValue to GetHttpHeader
diff --git a/compress.go b/compress.go
@@ -169,7 +169,7 @@ func (c *CompressResponseWriter) Write(b []byte) (int, error) {
 // from header "Accept-Encoding"
 func detectCompressionType(req *Request, resp *Response) (found bool, compressionType string, compressionKind WriteFlusher) {
 	if Config.BoolDefault("results.compressed", false) {
-		acceptedEncodings := strings.Split(req.HttpHeaderValue("Accept-Encoding"), ",")
+		acceptedEncodings := strings.Split(req.GetHttpHeader("Accept-Encoding"), ",")
 
 		largestQ := 0.0
 		chosenEncoding := len(compressionTypes)
diff --git a/http.go b/http.go
@@ -127,13 +127,13 @@ func (resp *Response) Destroy() {
 }
 // UserAgent returns the client's User-Agent, if sent in the request.
 func (r *Request) UserAgent() string {
-    return r.HttpHeaderValue("User-Agent")
+    return r.GetHttpHeader("User-Agent")
 }
 
 func (r *Request) Referer() (string) {
-    return r.HttpHeaderValue("Referer")
+    return r.GetHttpHeader("Referer")
 }
-func (r *Request) HttpHeaderValue(key string) (value string) {
+func (r *Request) GetHttpHeader(key string) (value string) {
     if r.ServerHeader!=nil {
         value = r.ServerHeader.Get(key)
     }
@@ -143,9 +143,6 @@ func (r *Request) GetValue(key int) (value interface{}) {
     value, _ = r.In.Get(key)
     return
 }
-func (r *Request) Header() (ServerHeader) {
-    return r.ServerHeader
-}
 
 // WriteHeader writes the header (for now, just the status code).
 // The status may be set directly by the application (c.Response.Status = 501).
@@ -154,20 +151,22 @@ func (resp *Response) WriteHeader(defaultStatusCode int, defaultContentType stri
     if resp.ContentType == "" {
         resp.ContentType = defaultContentType
     }
-    resp.SetHeader("Content-Type", resp.ContentType)
+    resp.SetHttpHeader("Content-Type", resp.ContentType)
     if resp.Status == 0 {
         resp.Status = defaultStatusCode
     }
     resp.SetStatus(resp.Status)
 }
-func (resp *Response) SetHeader(key, value string) {
-    
-    print("Set header **** ", key,value)
-
+func (resp *Response) SetHttpHeader(key, value string) {
     if resp.ServerHeader != nil {
         resp.ServerHeader.Set(key,value)
     }
 }
+func (resp *Response) AddHttpHeader(key, value string) {
+    if resp.ServerHeader != nil {
+        resp.ServerHeader.Add(key,value)
+    }
+}
 func (resp *Response) SetCookie(cookie string) {
     if resp.ServerHeader != nil {
         resp.ServerHeader.SetCookie(cookie)
@@ -206,7 +205,7 @@ func (resp *Response) GetStreamWriter() (writer StreamWriter) {
 // If none is specified, returns "text/html" by default.
 func ResolveContentType(req *Request) string {
 
-	contentType := req.HttpHeaderValue("Content-Type")
+	contentType := req.GetHttpHeader("Content-Type")
 	if contentType == "" {
 		return "text/html"
 	}
@@ -218,7 +217,7 @@ func ResolveContentType(req *Request) string {
 // returning a default of "html" when Accept header cannot be mapped to a
 // value above.
 func ResolveFormat(req *Request) string {
-	accept := req.HttpHeaderValue("accept")
+	accept := req.GetHttpHeader("accept")
 
 	switch {
 	case accept == "",
@@ -277,7 +276,7 @@ func (al AcceptLanguages) String() string {
 // See the HTTP header fields specification
 // (http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4) for more details.
 func ResolveAcceptLanguage(req *Request) AcceptLanguages {
-	header := req.HttpHeaderValue("Accept-Language")
+	header := req.GetHttpHeader("Accept-Language")
 	if header == "" {
 		return nil
 	}
diff --git a/results.go b/results.go
@@ -214,7 +214,7 @@ func (r *RenderTemplateResult) Apply(req *Request, resp *Response) {
 	}
 
 	if !chunked {
-        resp.SetHeader("ContentBeater-Length", strconv.Itoa(b.Len()))
+        resp.SetHttpHeader("ContentBeater-Length", strconv.Itoa(b.Len()))
 	}
 	resp.WriteHeader(http.StatusOK, "text/html; charset=utf-8")
 	if _, err := b.WriteTo(out); err != nil {
@@ -359,12 +359,12 @@ func (r *BinaryResult) Apply(req *Request, resp *Response) {
 		disposition += fmt.Sprintf(`; filename="%s"`, r.Name)
 	}
 
-	resp.SetHeader("Content-Disposition", disposition)
+	resp.SetHttpHeader("Content-Disposition", disposition)
     if resp.ContentType != "" {
-        resp.SetHeader("Content-Type", resp.ContentType)
+        resp.SetHttpHeader("Content-Type", resp.ContentType)
     } else {
         contentType := ContentTypeByFilename(r.Name)
-        resp.SetHeader("Content-Type", contentType)
+        resp.SetHttpHeader("Content-Type", contentType)
     }
     if content,ok:=r.Reader.(io.ReadSeeker);ok && r.Length<0 {
         // get the size from the stream
@@ -393,7 +393,7 @@ type RedirectToURLResult struct {
 }
 
 func (r *RedirectToURLResult) Apply(req *Request, resp *Response) {
-	resp.SetHeader("Location", r.url)
+	resp.SetHttpHeader("Location", r.url)
 	resp.WriteHeader(http.StatusFound, "")
 }
 
@@ -408,7 +408,7 @@ func (r *RedirectToActionResult) Apply(req *Request, resp *Response) {
 		ErrorResult{Error: err}.Apply(req, resp)
 		return
 	}
-	resp.SetHeader("Location", url)
+	resp.SetHttpHeader("Location", url)
 	resp.WriteHeader(http.StatusFound, "")
 }
 
diff --git a/router.go b/router.go
@@ -95,7 +95,7 @@ var notFound = &RouteMatch{Action: "404"}
 
 func (router *Router) Route(req *Request) *RouteMatch {
 	// Override method if set in header
-	if method := req.HttpHeaderValue("X-HTTP-Method-Override"); method != "" && req.Method == "POST" {
+	if method := req.GetHttpHeader("X-HTTP-Method-Override"); method != "" && req.Method == "POST" {
 		req.Method = method
 	}
 
diff --git a/util.go b/util.go
@@ -195,7 +195,7 @@ func Equal(a, b interface{}) bool {
 func ClientIP(r *Request) string {
 	if Config.BoolDefault("app.behind.proxy", false) {
 		// Header X-Forwarded-For
-		if fwdFor := strings.TrimSpace(r.HttpHeaderValue(hdrForwardedFor)); fwdFor != "" {
+		if fwdFor := strings.TrimSpace(r.GetHttpHeader(hdrForwardedFor)); fwdFor != "" {
 			index := strings.Index(fwdFor, ",")
 			if index == -1 {
 				return fwdFor
@@ -204,7 +204,7 @@ func ClientIP(r *Request) string {
 		}
 
 		// Header X-Real-Ip
-		if realIP := strings.TrimSpace(r.HttpHeaderValue(hdrRealIP)); realIP != "" {
+		if realIP := strings.TrimSpace(r.GetHttpHeader(hdrRealIP)); realIP != "" {
 			return realIP
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func (r RenderTemplateResult) Apply(req Request, resp *Response) {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`if !chunked {`
`217`		`- resp.SetHeader("ContentBeater-Length", strconv.Itoa(b.Len()))`
	`217`	`+ resp.SetHttpHeader("ContentBeater-Length", strconv.Itoa(b.Len()))`
`218`	`218`	`}`
`219`	`219`	`resp.WriteHeader(http.StatusOK, "text/html; charset=utf-8")`
`220`	`220`	`if _, err := b.WriteTo(out); err != nil {`
`@@ -359,12 +359,12 @@ func (r BinaryResult) Apply(req Request, resp *Response) {`
`359`	`359`	disposition += fmt.Sprintf(`; filename="%s"`, r.Name)
`360`	`360`	`}`
`361`	`361`
`362`		`- resp.SetHeader("Content-Disposition", disposition)`
	`362`	`+ resp.SetHttpHeader("Content-Disposition", disposition)`
`363`	`363`	`if resp.ContentType != "" {`
`364`		`- resp.SetHeader("Content-Type", resp.ContentType)`
	`364`	`+ resp.SetHttpHeader("Content-Type", resp.ContentType)`
`365`	`365`	`} else {`
`366`	`366`	`contentType := ContentTypeByFilename(r.Name)`
`367`		`- resp.SetHeader("Content-Type", contentType)`
	`367`	`+ resp.SetHttpHeader("Content-Type", contentType)`
`368`	`368`	`}`
`369`	`369`	`if content,ok:=r.Reader.(io.ReadSeeker);ok && r.Length<0 {`
`370`	`370`	`// get the size from the stream`
`@@ -393,7 +393,7 @@ type RedirectToURLResult struct {`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`func (r RedirectToURLResult) Apply(req Request, resp *Response) {`
`396`		`- resp.SetHeader("Location", r.url)`
	`396`	`+ resp.SetHttpHeader("Location", r.url)`
`397`	`397`	`resp.WriteHeader(http.StatusFound, "")`
`398`	`398`	`}`
`399`	`399`
`@@ -408,7 +408,7 @@ func (r RedirectToActionResult) Apply(req Request, resp *Response) {`
`408`	`408`	`ErrorResult{Error: err}.Apply(req, resp)`
`409`	`409`	`return`
`410`	`410`	`}`
`411`		`- resp.SetHeader("Location", url)`
	`411`	`+ resp.SetHttpHeader("Location", url)`
`412`	`412`	`resp.WriteHeader(http.StatusFound, "")`
`413`	`413`	`}`
`414`	`414`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ var notFound = &RouteMatch{Action: "404"}`
`95`	`95`
`96`	`96`	`func (router Router) Route(req Request) *RouteMatch {`
`97`	`97`	`// Override method if set in header`
`98`		`- if method := req.HttpHeaderValue("X-HTTP-Method-Override"); method != "" && req.Method == "POST" {`
	`98`	`+ if method := req.GetHttpHeader("X-HTTP-Method-Override"); method != "" && req.Method == "POST" {`
`99`	`99`	`req.Method = method`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ func Equal(a, b interface{}) bool {`
`195`	`195`	`func ClientIP(r *Request) string {`
`196`	`196`	`if Config.BoolDefault("app.behind.proxy", false) {`
`197`	`197`	`// Header X-Forwarded-For`
`198`		`- if fwdFor := strings.TrimSpace(r.HttpHeaderValue(hdrForwardedFor)); fwdFor != "" {`
	`198`	`+ if fwdFor := strings.TrimSpace(r.GetHttpHeader(hdrForwardedFor)); fwdFor != "" {`
`199`	`199`	`index := strings.Index(fwdFor, ",")`
`200`	`200`	`if index == -1 {`
`201`	`201`	`return fwdFor`
`@@ -204,7 +204,7 @@ func ClientIP(r *Request) string {`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`// Header X-Real-Ip`
`207`		`- if realIP := strings.TrimSpace(r.HttpHeaderValue(hdrRealIP)); realIP != "" {`
	`207`	`+ if realIP := strings.TrimSpace(r.GetHttpHeader(hdrRealIP)); realIP != "" {`
`208`	`208`	`return realIP`
`209`	`209`	`}`
`210`	`210`	`}`