Merge remote-tracking branch 'JaTochNietDan/master' into develop

pushrax · pushrax · commit bcce705fe25b · 2015-02-18T17:16:26.000-05:00
Conflicts:
	server.go
diff --git a/server.go b/server.go
@@ -22,6 +22,7 @@ var (
 // This method handles all requests.  It dispatches to handleInternal after
 // handling / adapting websocket connections.
 func handle(w http.ResponseWriter, r *http.Request) {
+	r.Body = http.MaxBytesReader(w, r.Body, int64(Config.IntDefault("http.maxRequestSize", 10000000)))
 	upgrade := r.Header.Get("Upgrade")
 	if upgrade == "websocket" || upgrade == "Websocket" {
 		websocket.Handler(func(ws *websocket.Conn) {
@@ -87,7 +88,6 @@ func Run(port int) {
 
 	runStartupHooks()
 
-
 	// Load templates
 	MainTemplateLoader = NewTemplateLoader(TemplatePaths)
 	MainTemplateLoader.Refresh()
