Skip to content

Commit

Permalink
headers api: remove EXPERIMENTAL tag
Browse files Browse the repository at this point in the history
Closes #8900
  • Loading branch information
bagder committed May 25, 2022
1 parent 498ecdf commit 9f7925b
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 16 deletions.
12 changes: 6 additions & 6 deletions configure.ac
Expand Up @@ -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)"
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions docs/CURL-DISABLE.md
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion docs/EXPERIMENTAL.md
Expand Up @@ -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`.
4 changes: 1 addition & 3 deletions docs/libcurl/curl_easy_header.3
Expand Up @@ -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.
Expand Down Expand Up @@ -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)"
Expand Down
4 changes: 1 addition & 3 deletions docs/libcurl/curl_easy_nextheader.3
Expand Up @@ -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.

Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/headers.c
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion lib/headers.h
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/server/disabled.c
Expand Up @@ -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
Expand Down

0 comments on commit 9f7925b

Please sign in to comment.