There was no need to send the err_ttl as parameter as SYN_ErrorPage had access to...

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2950 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 637f47d7350db183d1a6c897005f479d899a381d..77d89d153c71e49aa2232b083b093ff756ccabb5 100644 (file)
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -567,7 +567,7 @@ void RES_BuildHttp(struct sess *sp);
 void RES_WriteObj(struct sess *sp);
 
 /* cache_synthetic.c */
-void SYN_ErrorPage(struct sess *sp, int status, const char *reason, int ttl);
+void SYN_ErrorPage(struct sess *sp, int status, const char *reason);
 
 /* cache_vary.c */
 void VRY_Create(const struct sess *sp);

diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index da05126c8dfdbc06e07864465abaf5008acbb981..61d76333d6d641302a00a908ac7e6020d8e41b4f 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -309,7 +309,7 @@ cnt_error(struct sess *sp)
 {
 
        AZ(sp->obj);
-       SYN_ErrorPage(sp, sp->err_code, sp->err_reason, params->err_ttl);
+       SYN_ErrorPage(sp, sp->err_code, sp->err_reason);
        sp->err_code = 0;
        sp->err_reason = NULL;
        sp->step = STP_DONE;
@@ -878,7 +878,7 @@ cnt_start(struct sess *sp)
        *sp->http0 = *sp->http;
 
        if (done != 0) {
-               SYN_ErrorPage(sp, done, NULL, params->err_ttl);         /* XXX: STP_ERROR ? */
+               SYN_ErrorPage(sp, done, NULL);          /* XXX: STP_ERROR ? */
                sp->step = STP_DONE;
                return (0);
        }

diff --git a/varnish-cache/bin/varnishd/cache_synthetic.c b/varnish-cache/bin/varnishd/cache_synthetic.c
index 8c0b41716794307fd836fa7e84aa9d499461cebc..91c13feeb1fb03b1b6ffba0e783ee9069b2a6745 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_synthetic.c
+++ b/varnish-cache/bin/varnishd/cache_synthetic.c
@@ -47,7 +47,7 @@
  */
 
 void
-SYN_ErrorPage(struct sess *sp, int status, const char *reason, int ttl)
+SYN_ErrorPage(struct sess *sp, int status, const char *reason)
 {
        struct http *h;
        struct worker *w;
@@ -86,7 +86,7 @@ SYN_ErrorPage(struct sess *sp, int status, const char *reason, int ttl)
        TIM_format(now, date);
        http_PrintfHeader(w, fd, h, "Date: %s", date);
        http_PrintfHeader(w, fd, h, "Server: Varnish");
-       http_PrintfHeader(w, fd, h, "Retry-After: %d", ttl);
+       http_PrintfHeader(w, fd, h, "Retry-After: %d", params->err_ttl);
        http_PrintfHeader(w, fd, h, "Content-Type: text/html; charset=utf-8");
        http_PrintfHeader(w, sp->fd, sp->http, "X-Varnish: %u", sp->xid);
        http_PrintfHeader(w, fd, h, "Connection: close");