aboutsummaryrefslogtreecommitdiff
path: root/src/supplemental/http
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2025-01-04 11:45:29 -0800
committerGarrett D'Amore <garrett@damore.org>2025-01-04 12:34:16 -0800
commitf82df257d6fc23477d7260f82ec66971be2813a2 (patch)
treee535a5cdb8696fcc5e5487a75d1961d84212f340 /src/supplemental/http
parentd7fa10e49e693793d874100652b6ca5741b63365 (diff)
downloadnng-f82df257d6fc23477d7260f82ec66971be2813a2.tar.gz
nng-f82df257d6fc23477d7260f82ec66971be2813a2.tar.bz2
nng-f82df257d6fc23477d7260f82ec66971be2813a2.zip
api: fold TLS supplemental headers into nng.h
Diffstat (limited to 'src/supplemental/http')
-rw-r--r--src/supplemental/http/http_api.h3
-rw-r--r--src/supplemental/http/http_client.c4
-rw-r--r--src/supplemental/http/http_conn.c2
-rw-r--r--src/supplemental/http/http_public.c1
-rw-r--r--src/supplemental/http/http_server.c1
-rw-r--r--src/supplemental/http/http_server_test.c3
6 files changed, 3 insertions, 11 deletions
diff --git a/src/supplemental/http/http_api.h b/src/supplemental/http/http_api.h
index 5e2d52fa..29a8c5c1 100644
--- a/src/supplemental/http/http_api.h
+++ b/src/supplemental/http/http_api.h
@@ -1,5 +1,5 @@
//
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
// Copyright 2018 Capitar IT Group BV <info@capitar.com>
// Copyright 2019 Devolutions <info@devolutions.net>
//
@@ -14,7 +14,6 @@
#include "core/nng_impl.h"
#include <nng/supplemental/http/http.h>
-#include <nng/supplemental/tls/tls.h>
// This represents the "internal" HTTP API. It should not be used
// or exposed to applications directly.
diff --git a/src/supplemental/http/http_client.c b/src/supplemental/http/http_client.c
index 003e7fc9..52b6874d 100644
--- a/src/supplemental/http/http_client.c
+++ b/src/supplemental/http/http_client.c
@@ -1,5 +1,5 @@
//
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
// Copyright 2018 Capitar IT Group BV <info@capitar.com>
// Copyright 2019 Devolutions <info@devolutions.net>
//
@@ -15,8 +15,6 @@
#include "core/nng_impl.h"
-#include <nng/supplemental/tls/tls.h>
-
#include "http_api.h"
static nni_mtx http_txn_lk = NNI_MTX_INITIALIZER;
diff --git a/src/supplemental/http/http_conn.c b/src/supplemental/http/http_conn.c
index 44ad3a01..44860fe6 100644
--- a/src/supplemental/http/http_conn.c
+++ b/src/supplemental/http/http_conn.c
@@ -18,8 +18,6 @@
#include "http_api.h"
-#include <nng/supplemental/tls/tls.h>
-
// We insist that individual headers fit in 8K.
// If you need more than that, you need something we can't do.
#define HTTP_BUFSIZE 8192
diff --git a/src/supplemental/http/http_public.c b/src/supplemental/http/http_public.c
index 32f1e275..88ebaa68 100644
--- a/src/supplemental/http/http_public.c
+++ b/src/supplemental/http/http_public.c
@@ -11,7 +11,6 @@
#include "core/nng_impl.h"
#include "http_api.h"
#include "nng/supplemental/http/http.h"
-#include "nng/supplemental/tls/tls.h"
// Symbols in this file are "public" versions of the HTTP API.
// These are suitable for exposure to applications.
diff --git a/src/supplemental/http/http_server.c b/src/supplemental/http/http_server.c
index 74dd76a3..c6c453c9 100644
--- a/src/supplemental/http/http_server.c
+++ b/src/supplemental/http/http_server.c
@@ -18,7 +18,6 @@
#include <string.h>
#include "core/nng_impl.h"
-#include "nng/supplemental/tls/tls.h"
#include "http_api.h"
diff --git a/src/supplemental/http/http_server_test.c b/src/supplemental/http/http_server_test.c
index 3c9cb545..37c45f14 100644
--- a/src/supplemental/http/http_server_test.c
+++ b/src/supplemental/http/http_server_test.c
@@ -1,5 +1,5 @@
//
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
// Copyright 2018 Capitar IT Group BV <info@capitar.com>
// Copyright 2020 Dirac Research <robert.bielik@dirac.com>
//
@@ -12,7 +12,6 @@
// Basic HTTP server tests.
#include <nng/nng.h>
#include <nng/supplemental/http/http.h>
-#include <nng/supplemental/tls/tls.h>
#include <nuts.h>