summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Saavedra <csaavedra@igalia.com>2018-09-19 16:45:40 +0300
committerClaudio Saavedra <csaavedra@igalia.com>2019-05-22 14:59:14 +0000
commit986a7ab1e37e74b4b4241bec81f08ea137f92c84 (patch)
tree2574c7ea8ca9a2ddf86fc27651269d3a0f5b678c
parent60fd02bd2d27e0b74626efc9da2486184cab3852 (diff)
downloadlibsoup-986a7ab1e37e74b4b4241bec81f08ea137f92c84.tar.gz
Make soup_hsts_enforcer_set_policy() public
I can't see a reason for it to be private, and it's needed for unit testing.
-rw-r--r--docs/reference/libsoup-2.4-sections.txt1
-rw-r--r--docs/reference/meson.build1
-rw-r--r--libsoup/soup-hsts-enforcer-db.c1
-rw-r--r--libsoup/soup-hsts-enforcer-private.h15
-rw-r--r--libsoup/soup-hsts-enforcer.c1
-rw-r--r--libsoup/soup-hsts-enforcer.h4
6 files changed, 5 insertions, 18 deletions
diff --git a/docs/reference/libsoup-2.4-sections.txt b/docs/reference/libsoup-2.4-sections.txt
index 64e9796d..8836f2de 100644
--- a/docs/reference/libsoup-2.4-sections.txt
+++ b/docs/reference/libsoup-2.4-sections.txt
@@ -1355,6 +1355,7 @@ SoupHSTSEnforcerClass
soup_hsts_enforcer_new
soup_hsts_enforcer_is_persistent
soup_hsts_enforcer_has_valid_policy
+soup_hsts_enforcer_set_policy
soup_hsts_enforcer_set_session_policy
<SUBSECTION>
SoupHSTSPolicy
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index cf36fb2b..99b991a9 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -40,7 +40,6 @@ ignore_headers = [
'soup-socket-private.h',
'soup-value-utils.h',
'soup-xmlrpc-old.h'
- 'soup-hsts-enforcer-private.h'
]
mkdb_args = [
diff --git a/libsoup/soup-hsts-enforcer-db.c b/libsoup/soup-hsts-enforcer-db.c
index 861e7c8a..6a14bbd8 100644
--- a/libsoup/soup-hsts-enforcer-db.c
+++ b/libsoup/soup-hsts-enforcer-db.c
@@ -16,7 +16,6 @@
#include <sqlite3.h>
#include "soup-hsts-enforcer-db.h"
-#include "soup-hsts-enforcer-private.h"
#include "soup.h"
/**
diff --git a/libsoup/soup-hsts-enforcer-private.h b/libsoup/soup-hsts-enforcer-private.h
deleted file mode 100644
index 9d9b247f..00000000
--- a/libsoup/soup-hsts-enforcer-private.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2016, 2017, 2018 Igalia S.L.
- * Copyright (C) 2017, 2018 Metrological Group B.V.
- */
-
-#ifndef SOUP_HSTS_ENFORCER_PRIVATE_H
-#define SOUP_HSTS_ENFORCER_PRIVATE_H 1
-
-#include <libsoup/soup-types.h>
-
-void soup_hsts_enforcer_set_policy (SoupHSTSEnforcer *hsts_enforcer,
- SoupHSTSPolicy *policy);
-
-#endif /* SOUP_HSTS_ENFORCER_PRIVATE_H */
diff --git a/libsoup/soup-hsts-enforcer.c b/libsoup/soup-hsts-enforcer.c
index 6990451d..f2fd4525 100644
--- a/libsoup/soup-hsts-enforcer.c
+++ b/libsoup/soup-hsts-enforcer.c
@@ -13,7 +13,6 @@
#endif
#include "soup-hsts-enforcer.h"
-#include "soup-hsts-enforcer-private.h"
#include "soup.h"
/**
diff --git a/libsoup/soup-hsts-enforcer.h b/libsoup/soup-hsts-enforcer.h
index e6b3c2d6..d03ab220 100644
--- a/libsoup/soup-hsts-enforcer.h
+++ b/libsoup/soup-hsts-enforcer.h
@@ -69,6 +69,10 @@ SOUP_AVAILABLE_IN_2_68
void soup_hsts_enforcer_set_session_policy (SoupHSTSEnforcer *hsts_enforcer,
const char *domain,
gboolean include_subdomains);
+SOUP_AVAILABLE_IN_2_68
+void soup_hsts_enforcer_set_policy (SoupHSTSEnforcer *hsts_enforcer,
+ SoupHSTSPolicy *policy);
+
G_END_DECLS
#endif /* __SOUP_HSTS_ENFORCER_H__ */