Changeset 4467

Timestamp:

18/01/10 14:30:47 (8 weeks ago)

Author:

phk

Message:

Produce the X-Forwarded-For: header in vcl_recv, so people can tweak
as they want.

Append to already existing header if possible.

NB: If you return early from your own vcl_recv, without pasting these
lines in top of your vcl_recv, your backend gets no X-F-F header.

Fixes #601
Fixes #540

Location:

trunk/varnish-cache/bin

Files:

• varnishd/cache_http.c (modified) (1 diff)
• varnishd/default.vcl (modified) (1 diff)
• varnishtest/tests/b00031.vtc (added)

trunk/varnish-cache/bin/varnishd/cache_http.c

@@ -735 +735 @@
         http_FilterFields(sp->wrk, sp->fd, hp, sp->http, how);
         http_PrintfHeader(sp->wrk, sp->fd, hp, "X-Varnish: %u", sp->xid);
-        http_PrintfHeader(sp->wrk, sp->fd, hp,
-            "X-Forwarded-For: %s", sp->addr);
 }
 

trunk/varnish-cache/bin/varnishd/default.vcl

@@ -41 +41 @@
 
 sub vcl_recv {
+    if (req.http.x-forwarded-for) {
+        set req.http.X-Forwarded-For =
+            req.http.X-Forwarded-For ", " client.ip;
+    } else {
+        set req.http.X-Forwarded-For = client.ip;
+    }
     if (req.request != "GET" &&
       req.request != "HEAD" &&