Strip carriage returns fakehttprequest logging.

diff --git a/test/fakehttp.c b/test/fakehttp.c
index f773a73d53454f735dff42beb71571f0924e560b..38671f7cc00d32ef3d4b5804c2e161702d185ab7 100644 (file)
--- a/test/fakehttp.c
+++ b/test/fakehttp.c
@@ -21,6 +21,19 @@
 int serve(const char *, const char *);
 void putcrlf(int, char *);
 
+static void
+strip_cr(char *buf, ssize_t *len)
+{
+    ssize_t src, dst;
+    for (src = dst = 0; src < *len; src++) {
+        buf[dst] = buf[src];
+        if (buf[src] != '\r') {
+            dst++;
+        }
+    }
+    *len -= src - dst;
+}
+
 static void
 save_req(int conn, FILE *req)
 {
@@ -66,7 +79,7 @@ save_req(int conn, FILE *req)
              * all done. */
             return;
         }
-        /* make tests simpler by eliding carriage-returns? */
+        strip_cr(buf, &r);
         fwrite(buf, 1, r, req);
     }
 }

diff --git a/test/oauth/common.sh b/test/oauth/common.sh
index 5deebfd567b0118a950c8ce41410d6749a7fb4e9..8b21fd12f51cd51f5093ffd74c5c4e8b3ff91dee 100644 (file)
--- a/test/oauth/common.sh
+++ b/test/oauth/common.sh
@@ -94,13 +94,13 @@ fake_json_response() {
 # this failing, you'll need to make this a smarter comparison.
 expect_http_post() {
     cat > "${testname}.expected-http-req" <<EOF
-POST /oauth/token HTTP/1.1\r
-User-Agent: nmh/${MH_VERSION} ${CURL_USER_AGENT}\r
-Host: 127.0.0.1:${http_port}\r
-Accept: */*\r
-Content-Length: $1\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+POST /oauth/token HTTP/1.1
+User-Agent: nmh/${MH_VERSION} ${CURL_USER_AGENT}
+Host: 127.0.0.1:${http_port}
+Accept: */*
+Content-Length: $1
+Content-Type: application/x-www-form-urlencoded
+
 $2
 EOF
 }