r4172 - in branches/sky/response/varnish-cache: bin/varnishd include lib/libvcl
sky at projects.linpro.no
sky at projects.linpro.no
Mon Aug 3 12:46:32 CEST 2009
Author: sky
Date: 2009-08-03 12:46:32 +0200 (Mon, 03 Aug 2009)
New Revision: 4172
Modified:
branches/sky/response/varnish-cache/bin/varnishd/cache_center.c
branches/sky/response/varnish-cache/bin/varnishd/steps.h
branches/sky/response/varnish-cache/include/vcl.h
branches/sky/response/varnish-cache/include/vcl_returns.h
branches/sky/response/varnish-cache/lib/libvcl/vcc_fixed_token.c
branches/sky/response/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
branches/sky/response/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
branches/sky/response/varnish-cache/lib/libvcl/vcc_obj.c
Log:
rename resp to response since otherwise it uhm, conflicts with the resp object
Modified: branches/sky/response/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- branches/sky/response/varnish-cache/bin/varnishd/cache_center.c 2009-08-03 10:25:42 UTC (rev 4171)
+++ branches/sky/response/varnish-cache/bin/varnishd/cache_center.c 2009-08-03 10:46:32 UTC (rev 4172)
@@ -341,7 +341,7 @@
TIM_format(TIM_real(), date);
http_PrintfHeader(w, sp->fd, h, "Date: %s", date);
http_PrintfHeader(w, sp->fd, h, "Server: Varnish");
- if (sp->step != STP_RESP)
+ if (sp->step != STP_RESPONSE)
http_PrintfHeader(w, sp->fd, h, "Retry-After: %d", params->err_ttl);
if (sp->err_reason != NULL)
@@ -350,8 +350,8 @@
http_PutResponse(w, sp->fd, h,
http_StatusMessage(sp->err_code));
- if (sp->step == STP_RESP) {
- VCL_resp_method(sp);
+ if (sp->step == STP_RESPONSE) {
+ VCL_response_method(sp);
} else {
VCL_error_method(sp);
}
@@ -365,7 +365,7 @@
}
/* We always close when we take this path */
- if (sp->step != STP_RESP)
+ if (sp->step != STP_RESPONSE)
sp->doclose = "error";
sp->wantbody = 1;
@@ -392,7 +392,7 @@
*/
static int
-cnt_resp(struct sess *sp)
+cnt_response(struct sess *sp)
{
sp->err_code = 200;
return cnt_error(sp);
@@ -1041,8 +1041,8 @@
/* XXX: discard req body, if any */
sp->step = STP_ERROR;
return (0);
- case VCL_RET_RESP:
- sp->step = STP_RESP;
+ case VCL_RET_RESPONSE:
+ sp->step = STP_RESPONSE;
return (0);
default:
WRONG("Illegal action in vcl_recv{}");
Modified: branches/sky/response/varnish-cache/bin/varnishd/steps.h
===================================================================
--- branches/sky/response/varnish-cache/bin/varnishd/steps.h 2009-08-03 10:25:42 UTC (rev 4171)
+++ branches/sky/response/varnish-cache/bin/varnishd/steps.h 2009-08-03 10:46:32 UTC (rev 4172)
@@ -42,4 +42,4 @@
STEP(deliver, DELIVER)
STEP(error, ERROR)
STEP(done, DONE)
-STEP(resp, RESP)
+STEP(response, RESPONSE)
Modified: branches/sky/response/varnish-cache/include/vcl.h
===================================================================
--- branches/sky/response/varnish-cache/include/vcl.h 2009-08-03 10:25:42 UTC (rev 4171)
+++ branches/sky/response/varnish-cache/include/vcl.h 2009-08-03 10:46:32 UTC (rev 4172)
@@ -23,7 +23,7 @@
#define VCL_MET_FETCH (1 << 6)
#define VCL_MET_DELIVER (1 << 7)
#define VCL_MET_ERROR (1 << 8)
-#define VCL_MET_RESP (1 << 9)
+#define VCL_MET_RESPONSE (1 << 9)
#define VCL_MET_MAX 10
@@ -38,7 +38,7 @@
#define VCL_RET_DISCARD 7
#define VCL_RET_KEEP 8
#define VCL_RET_RESTART 9
-#define VCL_RET_RESP 10
+#define VCL_RET_RESPONSE 10
#define VCL_RET_MAX 11
@@ -71,5 +71,5 @@
vcl_func_f *fetch_func;
vcl_func_f *deliver_func;
vcl_func_f *error_func;
- vcl_func_f *resp_func;
+ vcl_func_f *response_func;
};
Modified: branches/sky/response/varnish-cache/include/vcl_returns.h
===================================================================
--- branches/sky/response/varnish-cache/include/vcl_returns.h 2009-08-03 10:25:42 UTC (rev 4171)
+++ branches/sky/response/varnish-cache/include/vcl_returns.h 2009-08-03 10:46:32 UTC (rev 4172)
@@ -17,13 +17,13 @@
VCL_RET_MAC(discard, DISCARD)
VCL_RET_MAC(keep, KEEP)
VCL_RET_MAC(restart, RESTART)
-VCL_RET_MAC(resp, RESP)
+VCL_RET_MAC(response, RESPONSE)
#endif
#ifdef VCL_MET_MAC
VCL_MET_MAC(recv,RECV,
((1 << VCL_RET_ERROR)
- | (1 << VCL_RET_RESP)
+ | (1 << VCL_RET_RESPONSE)
| (1 << VCL_RET_PASS)
| (1 << VCL_RET_PIPE)
| (1 << VCL_RET_LOOKUP)
@@ -42,12 +42,14 @@
))
VCL_MET_MAC(miss,MISS,
((1 << VCL_RET_ERROR)
+ | (1 << VCL_RET_RESPONSE)
| (1 << VCL_RET_RESTART)
| (1 << VCL_RET_PASS)
| (1 << VCL_RET_FETCH)
))
VCL_MET_MAC(hit,HIT,
((1 << VCL_RET_ERROR)
+ | (1 << VCL_RET_RESPONSE)
| (1 << VCL_RET_RESTART)
| (1 << VCL_RET_PASS)
| (1 << VCL_RET_DELIVER)
@@ -66,7 +68,7 @@
((1 << VCL_RET_RESTART)
| (1 << VCL_RET_DELIVER)
))
-VCL_MET_MAC(resp,RESP,
+VCL_MET_MAC(response,RESPONSE,
((1 << VCL_RET_RESTART)
| (1 << VCL_RET_DELIVER)
))
Modified: branches/sky/response/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- branches/sky/response/varnish-cache/lib/libvcl/vcc_fixed_token.c 2009-08-03 10:25:42 UTC (rev 4171)
+++ branches/sky/response/varnish-cache/lib/libvcl/vcc_fixed_token.c 2009-08-03 10:46:32 UTC (rev 4172)
@@ -1,5 +1,5 @@
/*
- * $Id: vcc_gen_fixed_token.tcl 4100 2009-06-09 10:41:38Z phk $
+ * $Id: vcc_gen_fixed_token.tcl 4149 2009-07-28 13:30:49Z sky $
*
* NB: This file is machine generated, DO NOT EDIT!
*
@@ -159,8 +159,8 @@
/* ../../include/vcl.h */
- vsb_cat(sb, "/*\n * $Id: vcc_gen_fixed_token.tcl 4100 2009-06-09 10");
- vsb_cat(sb, ":41:38Z phk $\n *\n * NB: This file is machine genera");
+ vsb_cat(sb, "/*\n * $Id: vcc_gen_fixed_token.tcl 4149 2009-07-28 13");
+ vsb_cat(sb, ":30:49Z sky $\n *\n * NB: This file is machine genera");
vsb_cat(sb, "ted, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixed_t");
vsb_cat(sb, "oken.tcl instead\n */\n\nstruct sess;\n");
vsb_cat(sb, "struct cli;\n\ntypedef void vcl_init_f(struct cli *);\n");
@@ -175,7 +175,7 @@
vsb_cat(sb, "#define VCL_MET_FETCH\t\t(1 << 6)\n");
vsb_cat(sb, "#define VCL_MET_DELIVER\t\t(1 << 7)\n");
vsb_cat(sb, "#define VCL_MET_ERROR\t\t(1 << 8)\n");
- vsb_cat(sb, "#define VCL_MET_RESP\t\t(1 << 9)\n");
+ vsb_cat(sb, "#define VCL_MET_RESPONSE\t(1 << 9)\n");
vsb_cat(sb, "\n#define VCL_MET_MAX\t\t10\n\n");
vsb_cat(sb, "/* VCL Returns */\n#define VCL_RET_ERROR\t\t0\n");
vsb_cat(sb, "#define VCL_RET_LOOKUP\t\t1\n#define VCL_RET_HASH\t\t2");
@@ -183,7 +183,7 @@
vsb_cat(sb, "\n#define VCL_RET_FETCH\t\t5\n#define VCL_RET_DELIVER\t");
vsb_cat(sb, "\t6\n#define VCL_RET_DISCARD\t\t7\n");
vsb_cat(sb, "#define VCL_RET_KEEP\t\t8\n#define VCL_RET_RESTART\t\t");
- vsb_cat(sb, "9\n#define VCL_RET_RESP\t\t10\n");
+ vsb_cat(sb, "9\n#define VCL_RET_RESPONSE\t\t10\n");
vsb_cat(sb, "\n#define VCL_RET_MAX\t\t11\n\n");
vsb_cat(sb, "struct VCL_conf {\n\tunsigned\tmagic;\n");
vsb_cat(sb, "#define VCL_CONF_MAGIC\t0x7406c509\t/* from /dev/rando");
@@ -199,7 +199,8 @@
vsb_cat(sb, "\tvcl_func_f\t*miss_func;\n\tvcl_func_f\t*hit_func;\n");
vsb_cat(sb, "\tvcl_func_f\t*fetch_func;\n\tvcl_func_f\t*deliver_fun");
vsb_cat(sb, "c;\n\tvcl_func_f\t*error_func;\n");
- vsb_cat(sb, "\tvcl_func_f\t*resp_func;\n};\n");
+ vsb_cat(sb, "\tvcl_func_f\t*response_func;\n");
+ vsb_cat(sb, "};\n");
/* ../../include/vrt.h */
@@ -321,8 +322,8 @@
/* ../../include/vrt_obj.h */
- vsb_cat(sb, "/*\n * $Id: vcc_gen_obj.tcl 4100 2009-06-09 10:41:38Z ");
- vsb_cat(sb, "phk $\n *\n * NB: This file is machine generated, DO ");
+ vsb_cat(sb, "/*\n * $Id: vcc_gen_obj.tcl 4149 2009-07-28 13:30:49Z ");
+ vsb_cat(sb, "sky $\n *\n * NB: This file is machine generated, DO ");
vsb_cat(sb, "NOT EDIT!\n *\n * Edit vcc_gen_obj.tcl instead\n");
vsb_cat(sb, " */\n\nstruct sockaddr * VRT_r_client_ip(const struct ");
vsb_cat(sb, "sess *);\nstruct sockaddr * VRT_r_server_ip(struct ses");
Modified: branches/sky/response/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
===================================================================
--- branches/sky/response/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl 2009-08-03 10:25:42 UTC (rev 4171)
+++ branches/sky/response/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl 2009-08-03 10:46:32 UTC (rev 4172)
@@ -34,16 +34,16 @@
# Second element is list of valid return actions.
#
set methods {
- {recv {error resp pass pipe lookup}}
+ {recv {error response pass pipe lookup}}
{pipe {error pipe}}
{pass {error restart pass}}
{hash {hash}}
- {miss {error restart pass fetch}}
- {hit {error restart pass deliver}}
+ {miss {error response restart pass fetch}}
+ {hit {error response restart pass deliver}}
{fetch {error restart pass deliver}}
{deliver {restart deliver}}
{error {restart deliver}}
- {resp {restart deliver}}
+ {response {restart deliver}}
}
# These are the return actions
@@ -59,7 +59,7 @@
discard
keep
restart
- resp
+ response
}
# Language keywords
Modified: branches/sky/response/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
===================================================================
--- branches/sky/response/varnish-cache/lib/libvcl/vcc_gen_obj.tcl 2009-08-03 10:25:42 UTC (rev 4171)
+++ branches/sky/response/varnish-cache/lib/libvcl/vcc_gen_obj.tcl 2009-08-03 10:46:32 UTC (rev 4172)
@@ -38,7 +38,7 @@
# Connection related parameters
{ client.ip
RO IP
- {recv pipe pass hash miss hit fetch deliver resp error }
+ {recv pipe pass hash miss hit fetch deliver response error }
"const struct sess *"
}
{ client.bandwidth # Not implemented yet
@@ -48,47 +48,47 @@
}
{ server.ip
RO IP
- {recv pipe pass hash miss hit fetch deliver resp error }
+ {recv pipe pass hash miss hit fetch deliver response error }
"struct sess *"
}
{ server.hostname
RO STRING
- {recv pipe pass hash miss hit fetch deliver resp error }
+ {recv pipe pass hash miss hit fetch deliver response error }
"struct sess *"
}
{ server.identity
RO STRING
- {recv pipe pass hash miss hit fetch deliver resp error }
+ {recv pipe pass hash miss hit fetch deliver response error }
"struct sess *"
}
{ server.port
RO INT
- {recv pipe pass hash miss hit fetch deliver resp error }
+ {recv pipe pass hash miss hit fetch deliver response error }
"struct sess *"
}
# Request paramters
{ req.request
RW STRING
- {recv pipe pass hash miss hit fetch deliver resp error }
+ {recv pipe pass hash miss hit fetch deliver response error }
"const struct sess *"
}
{ req.url
RW STRING
- {recv pipe pass hash miss hit fetch deliver resp error }
+ {recv pipe pass hash miss hit fetch deliver response error }
"const struct sess *"
}
{ req.proto
RW STRING
- {recv pipe pass hash miss hit fetch deliver resp error }
+ {recv pipe pass hash miss hit fetch deliver response error }
"const struct sess *"
}
{ req.http.
RW HDR_REQ
- {recv pipe pass hash miss hit fetch deliver resp error }
+ {recv pipe pass hash miss hit fetch deliver response error }
"const struct sess *"
}
- # Possibly misnamed, not really part of the request resp
+ # Possibly misnamed, not really part of the request response
{ req.hash
WO HASH
{ hash error }
@@ -96,12 +96,12 @@
}
{ req.backend
RW BACKEND
- {recv pipe pass hash miss hit fetch deliver resp error }
+ {recv pipe pass hash miss hit fetch deliver response error }
"struct sess *"
}
{ req.restarts
RO INT
- {recv pipe pass hash miss hit fetch deliver resp error }
+ {recv pipe pass hash miss hit fetch deliver response error }
"const struct sess *"
}
{ req.grace
@@ -112,7 +112,7 @@
{ req.xid
RO STRING
- {recv pipe pass hash miss hit fetch deliver resp error}
+ {recv pipe pass hash miss hit fetch deliver response error}
"struct sess *"
}
@@ -202,27 +202,27 @@
# The (possibly) cached object
{ obj.proto
RW STRING
- { hit resp error}
+ { hit response error}
"const struct sess *"
}
{ obj.status
RW INT
- { resp error}
+ { response error}
"const struct sess *"
}
{ obj.response
RW STRING
- { resp error}
+ { response error}
"const struct sess *"
}
{ obj.hits
RO INT
- { hit deliver resp }
+ { hit deliver response }
"const struct sess *"
}
{ obj.http.
RW HDR_OBJ
- { hit resp error}
+ { hit response error}
"const struct sess *"
}
Modified: branches/sky/response/varnish-cache/lib/libvcl/vcc_obj.c
===================================================================
--- branches/sky/response/varnish-cache/lib/libvcl/vcc_obj.c 2009-08-03 10:25:42 UTC (rev 4171)
+++ branches/sky/response/varnish-cache/lib/libvcl/vcc_obj.c 2009-08-03 10:46:32 UTC (rev 4172)
@@ -1,5 +1,5 @@
/*
- * $Id: vcc_gen_obj.tcl 4100 2009-06-09 10:41:38Z phk $
+ * $Id: vcc_gen_obj.tcl 4149 2009-07-28 13:30:49Z sky $
*
* NB: This file is machine generated, DO NOT EDIT!
*
@@ -16,63 +16,63 @@
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
- | VCL_MET_RESP | VCL_MET_ERROR
+ | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "server.ip", IP, 9,
"VRT_r_server_ip(sp)", NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
- | VCL_MET_RESP | VCL_MET_ERROR
+ | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "server.hostname", STRING, 15,
"VRT_r_server_hostname(sp)", NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
- | VCL_MET_RESP | VCL_MET_ERROR
+ | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "server.identity", STRING, 15,
"VRT_r_server_identity(sp)", NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
- | VCL_MET_RESP | VCL_MET_ERROR
+ | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "server.port", INT, 11,
"VRT_r_server_port(sp)", NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
- | VCL_MET_RESP | VCL_MET_ERROR
+ | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "req.request", STRING, 11,
"VRT_r_req_request(sp)", "VRT_l_req_request(sp, ",
V_RW, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
- | VCL_MET_RESP | VCL_MET_ERROR
+ | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "req.url", STRING, 7,
"VRT_r_req_url(sp)", "VRT_l_req_url(sp, ",
V_RW, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
- | VCL_MET_RESP | VCL_MET_ERROR
+ | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "req.proto", STRING, 9,
"VRT_r_req_proto(sp)", "VRT_l_req_proto(sp, ",
V_RW, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
- | VCL_MET_RESP | VCL_MET_ERROR
+ | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "req.http.", HEADER, 9,
"VRT_r_req_http_(sp)", "VRT_l_req_http_(sp, ",
V_RW, "HDR_REQ",
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
- | VCL_MET_RESP | VCL_MET_ERROR
+ | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "req.hash", HASH, 8,
NULL, "VRT_l_req_hash(sp, ",
@@ -84,14 +84,14 @@
V_RW, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
- | VCL_MET_RESP | VCL_MET_ERROR
+ | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "req.restarts", INT, 12,
"VRT_r_req_restarts(sp)", NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
- | VCL_MET_RESP | VCL_MET_ERROR
+ | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "req.grace", TIME, 9,
"VRT_r_req_grace(sp)", "VRT_l_req_grace(sp, ",
@@ -105,7 +105,7 @@
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
- | VCL_MET_RESP | VCL_MET_ERROR
+ | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "req.esi", BOOL, 7,
"VRT_r_req_esi(sp)", "VRT_l_req_esi(sp, ",
@@ -185,27 +185,27 @@
{ "obj.proto", STRING, 9,
"VRT_r_obj_proto(sp)", "VRT_l_obj_proto(sp, ",
V_RW, 0,
- VCL_MET_HIT | VCL_MET_RESP | VCL_MET_ERROR
+ VCL_MET_HIT | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "obj.status", INT, 10,
"VRT_r_obj_status(sp)", "VRT_l_obj_status(sp, ",
V_RW, 0,
- VCL_MET_RESP | VCL_MET_ERROR
+ VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "obj.response", STRING, 12,
"VRT_r_obj_response(sp)", "VRT_l_obj_response(sp, ",
V_RW, 0,
- VCL_MET_RESP | VCL_MET_ERROR
+ VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "obj.hits", INT, 8,
"VRT_r_obj_hits(sp)", NULL,
V_RO, 0,
- VCL_MET_HIT | VCL_MET_DELIVER | VCL_MET_RESP
+ VCL_MET_HIT | VCL_MET_DELIVER | VCL_MET_RESPONSE
},
{ "obj.http.", HEADER, 9,
"VRT_r_obj_http_(sp)", "VRT_l_obj_http_(sp, ",
V_RW, "HDR_OBJ",
- VCL_MET_HIT | VCL_MET_RESP | VCL_MET_ERROR
+ VCL_MET_HIT | VCL_MET_RESPONSE | VCL_MET_ERROR
},
{ "obj.cacheable", BOOL, 13,
"VRT_r_obj_cacheable(sp)", "VRT_l_obj_cacheable(sp, ",
More information about the varnish-commit
mailing list