incorrect memory stats on macs (wtf apple), cookie value unescape

2 files changed, 5 insertions, 2 deletions

diff --git a/cmd/rr/http/workers.go b/cmd/rr/http/workers.go
index 728c415e..a70762af 100644
--- a/cmd/rr/http/workers.go
+++ b/cmd/rr/http/workers.go
@@ -163,5 +163,5 @@ func renderMemory(pid int) string {
 		return err.Error()
 	}
 
-	return humanize.Bytes(i.VMS)
+	return humanize.Bytes(i.RSS)
 }
diff --git a/service/http/request.go b/service/http/request.go
index e02d3cdb..d88c260e 100644
--- a/service/http/request.go
+++ b/service/http/request.go
@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"strings"
+	"net/url"
 )
 
 const (
@@ -59,7 +60,9 @@ func NewRequest(r *http.Request, cfg *UploadsConfig) (req *Request, err error) {
 	}
 
 	for _, c := range r.Cookies() {
-		req.Cookies[c.Name] = c.Value
+		if v, err := url.QueryUnescape(c.Value); err == nil {
+			req.Cookies[c.Name] = v
+		}
 	}
 
 	switch req.contentType() {