[master] 9c72a93 Revert "Make server.hostname and server.identity available in all VCL methods."

[Federico G. Schwindt]

commit 9c72a934cbc127419e3bb46f1bc25278f4eb9131
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Sep 19 16:27:58 2014 +0100

    Revert "Make server.hostname and server.identity available in all VCL methods."
    
    This reverts commit 890a45ae8af9d6e70a2365f209707370af1bc574 since it broke
    master.

diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 29fc2f3..77524b3 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -471,13 +471,14 @@ pool_herder(void *priv)
 	AZ(pthread_attr_init(&tp_attr));
 
 	while (1) {
-		AZ(pthread_attr_destroy(&tp_attr));
-		AZ(pthread_attr_init(&tp_attr));
-
 		/* Set the stacksize for worker threads we create */
 		if (cache_param->wthread_stacksize != UINT_MAX)
 			AZ(pthread_attr_setstacksize(&tp_attr,
 			    cache_param->wthread_stacksize));
+		else {
+			AZ(pthread_attr_destroy(&tp_attr));
+			AZ(pthread_attr_init(&tp_attr));
+		}
 
 		/* Make more threads if needed and allowed */
 		if (pp->nthr < cache_param->wthread_min ||
diff --git a/bin/varnishtest/tests/v00001.vtc b/bin/varnishtest/tests/v00001.vtc
index 822c847..1798ec9 100644
--- a/bin/varnishtest/tests/v00001.vtc
+++ b/bin/varnishtest/tests/v00001.vtc
@@ -32,8 +32,6 @@ varnish v1 -vcl+backend {
 		set beresp.proto = "HTTP/1.2";
 		set beresp.reason = "For circular files";
 		set beresp.status = 903;
-		set beresp.http.y-served-by-hostname = server.hostname;
-		set beresp.http.y-served-by-identity = server.identity;
 	}
 	sub vcl_deliver {
 		set resp.proto = "HTTP/1.2";