From 2a83fc75590fa16f6f7abdab5ee9a4b1e99ca738 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 28 Nov 2013 21:35:48 +0900
Subject: [PATCH] Add nghttp2_submit_response2

---
 lib/includes/nghttp2/nghttp2.h | 22 ++++++++++++++++++++++
 lib/nghttp2_submit.c           | 23 ++++++++++++++++++++---
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/lib/includes/nghttp2/nghttp2.h b/lib/includes/nghttp2/nghttp2.h
index 0f250dc0..1d5ce4c6 100644
--- a/lib/includes/nghttp2/nghttp2.h
+++ b/lib/includes/nghttp2/nghttp2.h
@@ -1876,6 +1876,28 @@ int nghttp2_submit_response(nghttp2_session *session,
                             int32_t stream_id, const char **nv,
                             const nghttp2_data_provider *data_prd);
 
+/**
+ * @function
+ *
+ * Just like `nghttp2_submit_response()`, but this function takes the
+ * |nva|, which is an array of ``nghttp2_nv`` with |nvlen| elements,
+ * as name/value pairs. This function is useful if name/value pairs
+ * are not NULL-terminated strings.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
+ *     The |pri| is invalid; or the |nva| includes empty name or
+ *     name which contains invalid characters.
+ * :enum:`NGHTTP2_ERR_NOMEM`
+ *     Out of memory.
+ */
+int nghttp2_submit_response2(nghttp2_session *session,
+                             int32_t stream_id,
+                             const nghttp2_nv *nva, size_t nvlen,
+                             const nghttp2_data_provider *data_prd);
+
 /**
  * @function
  *
diff --git a/lib/nghttp2_submit.c b/lib/nghttp2_submit.c
index 2a4dff7a..ac41970f 100644
--- a/lib/nghttp2_submit.c
+++ b/lib/nghttp2_submit.c
@@ -326,19 +326,36 @@ int nghttp2_submit_request2(nghttp2_session *session, int32_t pri,
                                            data_prd, stream_user_data);
 }
 
-int nghttp2_submit_response(nghttp2_session *session,
-                            int32_t stream_id, const char **nv,
-                            const nghttp2_data_provider *data_prd)
+static uint8_t set_response_flags(const nghttp2_data_provider *data_prd)
 {
   uint8_t flags = NGHTTP2_FLAG_NONE;
   if(data_prd == NULL || data_prd->read_callback == NULL) {
     flags |= NGHTTP2_FLAG_END_STREAM;
   }
+  return flags;
+}
+
+int nghttp2_submit_response(nghttp2_session *session,
+                            int32_t stream_id, const char **nv,
+                            const nghttp2_data_provider *data_prd)
+{
+  uint8_t flags = set_response_flags(data_prd);
   return nghttp2_submit_headers_shared_nv(session, flags, stream_id,
                                           NGHTTP2_PRI_DEFAULT, nv, data_prd,
                                           NULL);
 }
 
+int nghttp2_submit_response2(nghttp2_session *session,
+                             int32_t stream_id,
+                             const nghttp2_nv *nva, size_t nvlen,
+                             const nghttp2_data_provider *data_prd)
+{
+  uint8_t flags = set_response_flags(data_prd);
+  return nghttp2_submit_headers_shared_nva(session, flags, stream_id,
+                                           NGHTTP2_PRI_DEFAULT, nva, nvlen,
+                                           data_prd, NULL);
+}
+
 int nghttp2_submit_data(nghttp2_session *session, uint8_t flags,
                         int32_t stream_id,
                         const nghttp2_data_provider *data_prd)