Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "httputil: allow full error serving when with devcam"

This commit is contained in:
Brad Fitzpatrick 2014-04-23 15:26:30 +00:00 committed by Gerrit Code Review
parent 21753c9350 a8f8fd57cf
commit 5ace3bea0f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/httputil/httputil.go
View File

@ -27,6 +27,7 @@ import (
"net" "net"
"net/http" "net/http"
"net/url" "net/url"
"os"
"path" "path"
"strconv" "strconv"
"strings" "strings"
@ -63,7 +64,7 @@ func RequestEntityTooLargeError(conn http.ResponseWriter) {
func ServeError(conn http.ResponseWriter, req *http.Request, err error) { func ServeError(conn http.ResponseWriter, req *http.Request, err error) {
conn.WriteHeader(http.StatusInternalServerError) conn.WriteHeader(http.StatusInternalServerError)
if IsLocalhost(req) { if IsLocalhost(req) || os.Getenv("CAMLI_DEV_CAMLI_ROOT") != "" {
fmt.Fprintf(conn, "Server error: %s\n", err) fmt.Fprintf(conn, "Server error: %s\n", err)
return return
} }