[master] 8f3140f Rename http_GetReq() to http_GetMethod()

Poul-Henning Kamp phk at FreeBSD.org
Tue Sep 9 10:33:37 CEST 2014

commit 8f3140f77f3dced646eb0e06fdec213664fc3bc3
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Sep 9 08:20:30 2014 +0000

    Rename http_GetReq() to http_GetMethod()

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 34e51e7..519809d 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -956,7 +956,7 @@ ssize_t http_GetContentLength(const struct http *hp);
 uint16_t http_GetStatus(const struct http *hp);
 int http_IsStatus(const struct http *hp, int);
 void http_SetStatus(struct http *to, uint16_t status);
-const char *http_GetReq(const struct http *hp);
+const char *http_GetMethod(const struct http *hp);
 int http_HdrIs(const struct http *hp, const char *hdr, const char *val);
 void http_CopyHome(const struct http *hp);
 void http_Unset(struct http *hp, const char *hdr);
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 2b2d61f..27ab49f 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -671,7 +671,7 @@ http_SetStatus(struct http *to, uint16_t status)
 const char *
-http_GetReq(const struct http *hp)
+http_GetMethod(const struct http *hp)
diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c
index 131df15..dcd5102 100644
--- a/bin/varnishd/cache/cache_rfc2616.c
+++ b/bin/varnishd/cache/cache_rfc2616.c
@@ -193,7 +193,7 @@ RFC2616_Body(struct busyobj *bo, struct dstat *stats)
 	hp = bo->beresp;
-	if (!strcasecmp(http_GetReq(bo->bereq), "head")) {
+	if (!strcasecmp(http_GetMethod(bo->bereq), "head")) {
 		 * A HEAD request can never have a body in the reply,
 		 * no matter what the headers might say.

More information about the varnish-commit mailing list