diff --git a/src/buffer.c b/src/buffer.c
index 37f11f1f..5e03e273 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -168,14 +168,6 @@ void buffer_copy_string_len(buffer *b, const char *s, size_t s_len) {
 	b->used = s_len + 1;
 }
 
-void buffer_copy_buffer(buffer *b, const buffer *src) {
-	if (NULL == src || 0 == src->used) {
-		buffer_string_prepare_copy(b, 0);
-	} else {
-		buffer_copy_string_len(b, src->ptr, buffer_string_length(src));
-	}
-}
-
 void buffer_append_string(buffer *b, const char *s) {
 	buffer_append_string_len(b, s, NULL != s ? strlen(s) : 0);
 }
diff --git a/src/buffer.h b/src/buffer.h
index da364a68..189d526c 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -74,7 +74,7 @@ static inline void buffer_clear(buffer *b);
 
 void buffer_copy_string(buffer *b, const char *s);
 void buffer_copy_string_len(buffer *b, const char *s, size_t s_len);
-void buffer_copy_buffer(buffer *b, const buffer *src);
+static inline void buffer_copy_buffer(buffer *b, const buffer *src);
 
 void buffer_append_string(buffer *b, const char *s);
 void buffer_append_string_len(buffer *b, const char *s, size_t s_len);
@@ -204,6 +204,10 @@ static inline size_t buffer_string_space(const buffer *b) {
 	return NULL != b && b->size ? b->size - (b->used | (0 == b->used)) : 0;
 }
 
+static inline void buffer_copy_buffer(buffer *b, const buffer *src) {
+	buffer_copy_string_len(b, CONST_BUF_LEN(src));
+}
+
 static inline void buffer_append_string_buffer(buffer *b, const buffer *src) {
 	buffer_append_string_len(b, CONST_BUF_LEN(src));
 }
diff --git a/src/http-header-glue.c b/src/http-header-glue.c
index cb07f56a..f7c39b1d 100644
--- a/src/http-header-glue.c
+++ b/src/http-header-glue.c
@@ -30,7 +30,7 @@ int http_response_redirect_to_directory(server *srv, connection *con) {
 
 	buffer_copy_buffer(o, con->uri.scheme);
 	buffer_append_string_len(o, CONST_STR_LEN("://"));
-	if (!buffer_is_empty(con->uri.authority)) {
+	if (!buffer_string_is_empty(con->uri.authority)) {
 		buffer_append_string_buffer(o, con->uri.authority);
 	} else {
 		/* get the name of the currently connected socket */