Remove MK_IOV_HEADER_VALUE

diff --git a/src/header.c b/src/header.c
index 90de4e5..e82d8e7 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -163,7 +163,7 @@ int mk_header_send(int fd, struct client_request *cr,
     mk_iov_add_entry(iov,
                      mk_header_short_date.data,
                      mk_header_short_date.len,
-                     mk_iov_header_value, MK_IOV_NOT_FREE_BUF);
+                     mk_iov_none, MK_IOV_NOT_FREE_BUF);
     mk_iov_add_entry(iov,
                      header_current_time.data,
                      header_current_time.len,
@@ -200,7 +200,7 @@ int mk_header_send(int fd, struct client_request *cr,
         mk_iov_add_entry(iov,
                          mk_header_short_location.data,
                          mk_header_short_location.len,
-                         mk_iov_header_value, MK_IOV_NOT_FREE_BUF);
+                         mk_iov_none, MK_IOV_NOT_FREE_BUF);
 
         mk_iov_add_entry(iov,
                          sh->location,
@@ -211,7 +211,7 @@ int mk_header_send(int fd, struct client_request *cr,
     if (sh->last_modified.len > 0) {
         mk_iov_add_entry(iov, mk_header_last_modified.data,
                          mk_header_last_modified.len,
-                         mk_iov_header_value, MK_IOV_NOT_FREE_BUF);
+                         mk_iov_none, MK_IOV_NOT_FREE_BUF);
         mk_iov_add_entry(iov, sh->last_modified.data,
                          sh->last_modified.len,
                          mk_iov_crlf, MK_IOV_NOT_FREE_BUF);
@@ -222,7 +222,7 @@ int mk_header_send(int fd, struct client_request *cr,
         mk_iov_add_entry(iov,
                          mk_header_short_ct.data,
                          mk_header_short_ct.len,
-                         mk_iov_header_value, MK_IOV_NOT_FREE_BUF);
+                         mk_iov_none, MK_IOV_NOT_FREE_BUF);
 
         mk_iov_add_entry(iov,
                          sh->content_type.data,
@@ -236,7 +236,7 @@ int mk_header_send(int fd, struct client_request *cr,
         mk_iov_add_entry(iov,
                          mk_header_te_chunked.data,
                          mk_header_te_chunked.len,
-                         mk_iov_crlf, MK_IOV_NOT_FREE_BUF);
+                         mk_iov_none, MK_IOV_NOT_FREE_BUF);
         break;
     }
 

diff --git a/src/include/header.h b/src/include/header.h
index 2fa7735..be2dad0 100644 (file)
--- a/src/include/header.h
+++ b/src/include/header.h
@@ -62,10 +62,9 @@ mk_pointer mk_hr_server_not_implemented;
 mk_pointer mk_hr_server_http_version_unsup;
 
 /* Short header values */
-#define MK_HEADER_SHORT_DATE "Date"
-#define MK_HEADER_SHORT_LOCATION "Location"
-#define MK_HEADER_SHORT_CT "Content-Type"
-#define MK_HEADER_SHORT_LOCATION "Location"
+#define MK_HEADER_SHORT_DATE "Date: "
+#define MK_HEADER_SHORT_LOCATION "Location: "
+#define MK_HEADER_SHORT_CT "Content-Type: "
 
 mk_pointer mk_header_short_date;
 mk_pointer mk_header_short_location;
@@ -79,9 +78,9 @@ mk_pointer mk_header_short_ct;
 
 /* Transfer Encoding */
 #define MK_HEADER_TE_TYPE_CHUNKED 0
-#define MK_HEADER_TE_CHUNKED "Transfer-Encoding: Chunked"
+#define MK_HEADER_TE_CHUNKED "Transfer-Encoding: Chunked" MK_CRLF
 
-#define MK_HEADER_LAST_MODIFIED "Last-Modified"
+#define MK_HEADER_LAST_MODIFIED "Last-Modified: "
 
 /* mk pointers with response server headers */
 mk_pointer mk_header_conn_ka;

diff --git a/src/include/iov.h b/src/include/iov.h
index fbcadb5..e2d8162 100644 (file)
--- a/src/include/iov.h
+++ b/src/include/iov.h
@@ -32,7 +32,6 @@
 #define MK_IOV_CRLFCRLF "\r\n\r\n"
 #define MK_IOV_LF "\n"
 #define MK_IOV_SPACE " "
-#define MK_IOV_HEADER_VALUE ": "
 #define MK_IOV_SLASH "/"
 #define MK_IOV_NONE ""
 #define MK_IOV_EQUAL "="
@@ -46,7 +45,6 @@ mk_pointer mk_iov_crlf;
 mk_pointer mk_iov_crlfcrlf;
 mk_pointer mk_iov_lf;
 mk_pointer mk_iov_space;
-mk_pointer mk_iov_header_value;
 mk_pointer mk_iov_slash;
 mk_pointer mk_iov_none;
 mk_pointer mk_iov_equal;

diff --git a/src/iov.c b/src/iov.c
index a25f839..c8ba415 100644 (file)
--- a/src/iov.c
+++ b/src/iov.c
@@ -218,7 +218,6 @@ void mk_iov_separators_init()
     mk_pointer_set(&mk_iov_crlf, MK_IOV_CRLF);
     mk_pointer_set(&mk_iov_lf, MK_IOV_LF);
     mk_pointer_set(&mk_iov_space, MK_IOV_SPACE);
-    mk_pointer_set(&mk_iov_header_value, MK_IOV_HEADER_VALUE);
     mk_pointer_set(&mk_iov_slash, MK_IOV_SLASH);
     mk_pointer_set(&mk_iov_none, MK_IOV_NONE);
     mk_pointer_set(&mk_iov_equal, MK_IOV_EQUAL);