From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 30 May 2022 12:13:48 +0000 (+0200)
Subject: headers api: remove EXPERIMENTAL tag
X-Git-Tag: curl-7_84_0~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d94fac9f0d1dd02b8308291e4c47651142dc28b;p=thirdparty%2Fcurl.git

headers api: remove EXPERIMENTAL tag

Closes #8900
---

diff --git a/configure.ac b/configure.ac
index f89c266c9b..1300a7189d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,7 +165,7 @@ curl_verbose_msg="enabled (--disable-verbose)"
    curl_rtmp_msg="no      (--with-librtmp)"
     curl_psl_msg="no      (--with-libpsl)"
  curl_altsvc_msg="enabled (--disable-alt-svc)"
- curl_headers_msg="no      (--enable-headers-api)"
+curl_headers_msg="enabled (--disable-headers-api)"
    curl_hsts_msg="enabled (--disable-hsts)"
     ssl_backends=
      curl_h1_msg="enabled (internal)"
@@ -4016,15 +4016,15 @@ AC_ARG_ENABLE(headers-api,
 AS_HELP_STRING([--enable-headers-api],[Enable headers-api support])
 AS_HELP_STRING([--disable-headers-api],[Disable headers-api support]),
 [ case "$enableval" in
-  yes)
+  *)
        AC_MSG_RESULT(yes)
-       AC_DEFINE(USE_HEADERS_API, 1, [enable headers-api])
-       curl_headers_msg="enabled";
        ;;
-  *) AC_MSG_RESULT(no)
+  no) AC_MSG_RESULT(no)
+       curl_headers_msg="no      (--enable-headers-api)"
+       AC_DEFINE(CURL_DISABLE_HEADERS_API, 1, [disable headers-api])
        ;;
   esac ],
-       AC_MSG_RESULT(no)
+       AC_MSG_RESULT(yes)
 )
 
 dnl only check for HSTS if there's SSL present
diff --git a/docs/CURL-DISABLE.md b/docs/CURL-DISABLE.md
index a2e75f198d..7ece3dc51f 100644
--- a/docs/CURL-DISABLE.md
+++ b/docs/CURL-DISABLE.md
@@ -37,6 +37,10 @@ about existing options to `curl_easy_setopt`.
 
 Disable the GOPHER protocol.
 
+## CURL_DISABLE_HEADERS_API
+
+Disable the HTTP header API.
+
 ## CURL_DISABLE_HSTS
 
 Disable the HTTP Strict Transport Security support.
diff --git a/docs/EXPERIMENTAL.md b/docs/EXPERIMENTAL.md
index 06deb5fc93..38bc620374 100644
--- a/docs/EXPERIMENTAL.md
+++ b/docs/EXPERIMENTAL.md
@@ -21,4 +21,3 @@ Experimental support in curl means:
  - The Hyper HTTP backend
  - HTTP/3 support and options
  - `CURLSSLOPT_NATIVE_CA` (No configure option, feature built in when supported)
- - The headers API: `curl_easy_header` and `curl_easy_nextheader`.
diff --git a/docs/cmdline-opts/write-out.d b/docs/cmdline-opts/write-out.d
index bc47dc4ce5..11b83f44ec 100644
--- a/docs/cmdline-opts/write-out.d
+++ b/docs/cmdline-opts/write-out.d
@@ -22,11 +22,10 @@ output a newline by using \\n, a carriage return with \\r and a tab space with
 The output will be written to standard output, but this can be switched to
 standard error by using %{stderr}.
 
-EXPERIMENTAL feature: Output HTTP headers from the most recent request by
-using \fB%header{name}\fP where \fBname\fP is the case insensitive name of the
-header (without the trailing colon). The header contents are exactly as sent
-over the network, with leading and trailing whitespace trimmed. Added in curl
-7.83.0.
+Output HTTP headers from the most recent request by using \fB%header{name}\fP
+where \fBname\fP is the case insensitive name of the header (without the
+trailing colon). The header contents are exactly as sent over the network,
+with leading and trailing whitespace trimmed. Added in curl 7.84.0.
 
 .B NOTE:
 The %-symbol is a special symbol in the win32-environment, where all
@@ -55,8 +54,6 @@ The initial path curl ended up in when logging on to the remote FTP
 server. (Added in 7.15.4)
 .TP
 .B header_json
-EXPERIMENTAL feature.
-
 A JSON object with all HTTP response headers from the recent transfer. Values
 are provided as arrays, since in the case of multiple headers there can be
 multiple values.
diff --git a/docs/libcurl/curl_easy_header.3 b/docs/libcurl/curl_easy_header.3
index 9aaa9d767c..f5e2aab59b 100644
--- a/docs/libcurl/curl_easy_header.3
+++ b/docs/libcurl/curl_easy_header.3
@@ -33,8 +33,6 @@ CURLHcode curl_easy_header(CURL *easy,
                            int request,
                            struct curl_header **hout);
 .SH DESCRIPTION
-EXPERIMENTAL feature!
-
 \fIcurl_easy_header(3)\fP returns a pointer to a "curl_header" struct in
 \fBhout\fP with data for the HTTP response header \fIname\fP. The case
 insensitive nul-terminated header name should be specified without colon.
@@ -131,7 +129,7 @@ CURLHcode h =
   curl_easy_header(easy, "Content-Type", 0, CURLH_HEADER, -1, &type);
 .fi
 .SH AVAILABILITY
-Added in 7.83.0
+Added in 7.83.0. Officially supported since 7.84.0.
 .SH RETURN VALUE
 This function returns a CURLHcode indicating success or error.
 .IP "CURLHE_BADINDEX (1)"
diff --git a/docs/libcurl/curl_easy_nextheader.3 b/docs/libcurl/curl_easy_nextheader.3
index 51ffbdc81d..8758bbb58f 100644
--- a/docs/libcurl/curl_easy_nextheader.3
+++ b/docs/libcurl/curl_easy_nextheader.3
@@ -32,8 +32,6 @@ struct curl_header *curl_easy_nextheader(CURL *easy,
                                          struct curl_header *prev);
 .fi
 .SH DESCRIPTION
-EXPERIMENTAL feature!
-
 This function lets an application iterate over all previously received HTTP
 headers.
 
@@ -85,7 +83,7 @@ while((h = curl_easy_nextheader(easy, origin, -1, prev))) {
 }
 .fi
 .SH AVAILABILITY
-Added in 7.83.0
+Added in 7.83.0. Officially supported since 7.84.0.
 .SH RETURN VALUE
 This function returns the next header, or NULL when there are no more
 (matching) headers or an error occurred.
diff --git a/lib/headers.c b/lib/headers.c
index 6abb635f23..1cedf3d202 100644
--- a/lib/headers.c
+++ b/lib/headers.c
@@ -32,7 +32,7 @@
 #include "curl_memory.h"
 #include "memdebug.h"
 
-#if !defined(CURL_DISABLE_HTTP) && defined(USE_HEADERS_API)
+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HEADERS_API)
 
 /* Generate the curl_header struct for the user. This function MUST assign all
    struct fields in the output struct. */
diff --git a/lib/headers.h b/lib/headers.h
index 48c013b04d..469df72794 100644
--- a/lib/headers.h
+++ b/lib/headers.h
@@ -23,7 +23,7 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#if !defined(CURL_DISABLE_HTTP) && defined(USE_HEADERS_API)
+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HEADERS_API)
 
 struct Curl_header_store {
   struct Curl_llist_element node;
diff --git a/tests/server/disabled.c b/tests/server/disabled.c
index 5ca5787e40..c0410761e8 100644
--- a/tests/server/disabled.c
+++ b/tests/server/disabled.c
@@ -70,7 +70,7 @@ static const char *disabled[]={
 #ifndef ENABLE_WAKEUP
   "wakeup",
 #endif
-#ifndef USE_HEADERS_API
+#ifdef CURL_DISABLE_HEADERS_API
   "headers-api",
 #endif
   NULL