Skip to content

Commit 4d94fac

Browse files
committed
headers api: remove EXPERIMENTAL tag
Closes #8900
1 parent 739275a commit 4d94fac

File tree

9 files changed

+19
-23
lines changed

9 files changed

+19
-23
lines changed

configure.ac

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ curl_verbose_msg="enabled (--disable-verbose)"
165165
curl_rtmp_msg="no (--with-librtmp)"
166166
curl_psl_msg="no (--with-libpsl)"
167167
curl_altsvc_msg="enabled (--disable-alt-svc)"
168-
curl_headers_msg="no (--enable-headers-api)"
168+
curl_headers_msg="enabled (--disable-headers-api)"
169169
curl_hsts_msg="enabled (--disable-hsts)"
170170
ssl_backends=
171171
curl_h1_msg="enabled (internal)"
@@ -4016,15 +4016,15 @@ AC_ARG_ENABLE(headers-api,
40164016
AS_HELP_STRING([--enable-headers-api],[Enable headers-api support])
40174017
AS_HELP_STRING([--disable-headers-api],[Disable headers-api support]),
40184018
[ case "$enableval" in
4019-
yes)
4019+
*)
40204020
AC_MSG_RESULT(yes)
4021-
AC_DEFINE(USE_HEADERS_API, 1, [enable headers-api])
4022-
curl_headers_msg="enabled";
40234021
;;
4024-
*) AC_MSG_RESULT(no)
4022+
no) AC_MSG_RESULT(no)
4023+
curl_headers_msg="no (--enable-headers-api)"
4024+
AC_DEFINE(CURL_DISABLE_HEADERS_API, 1, [disable headers-api])
40254025
;;
40264026
esac ],
4027-
AC_MSG_RESULT(no)
4027+
AC_MSG_RESULT(yes)
40284028
)
40294029

40304030
dnl only check for HSTS if there's SSL present

docs/CURL-DISABLE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ about existing options to `curl_easy_setopt`.
3737

3838
Disable the GOPHER protocol.
3939

40+
## CURL_DISABLE_HEADERS_API
41+
42+
Disable the HTTP header API.
43+
4044
## CURL_DISABLE_HSTS
4145

4246
Disable the HTTP Strict Transport Security support.

docs/EXPERIMENTAL.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@ Experimental support in curl means:
2121
- The Hyper HTTP backend
2222
- HTTP/3 support and options
2323
- `CURLSSLOPT_NATIVE_CA` (No configure option, feature built in when supported)
24-
- The headers API: `curl_easy_header` and `curl_easy_nextheader`.

docs/cmdline-opts/write-out.d

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ output a newline by using \\n, a carriage return with \\r and a tab space with
2222
The output will be written to standard output, but this can be switched to
2323
standard error by using %{stderr}.
2424

25-
EXPERIMENTAL feature: Output HTTP headers from the most recent request by
26-
using \fB%header{name}\fP where \fBname\fP is the case insensitive name of the
27-
header (without the trailing colon). The header contents are exactly as sent
28-
over the network, with leading and trailing whitespace trimmed. Added in curl
29-
7.83.0.
25+
Output HTTP headers from the most recent request by using \fB%header{name}\fP
26+
where \fBname\fP is the case insensitive name of the header (without the
27+
trailing colon). The header contents are exactly as sent over the network,
28+
with leading and trailing whitespace trimmed. Added in curl 7.84.0.
3029

3130
.B NOTE:
3231
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
5554
server. (Added in 7.15.4)
5655
.TP
5756
.B header_json
58-
EXPERIMENTAL feature.
59-
6057
A JSON object with all HTTP response headers from the recent transfer. Values
6158
are provided as arrays, since in the case of multiple headers there can be
6259
multiple values.

docs/libcurl/curl_easy_header.3

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ CURLHcode curl_easy_header(CURL *easy,
3333
int request,
3434
struct curl_header **hout);
3535
.SH DESCRIPTION
36-
EXPERIMENTAL feature!
37-
3836
\fIcurl_easy_header(3)\fP returns a pointer to a "curl_header" struct in
3937
\fBhout\fP with data for the HTTP response header \fIname\fP. The case
4038
insensitive nul-terminated header name should be specified without colon.
@@ -131,7 +129,7 @@ CURLHcode h =
131129
curl_easy_header(easy, "Content-Type", 0, CURLH_HEADER, -1, &type);
132130
.fi
133131
.SH AVAILABILITY
134-
Added in 7.83.0
132+
Added in 7.83.0. Officially supported since 7.84.0.
135133
.SH RETURN VALUE
136134
This function returns a CURLHcode indicating success or error.
137135
.IP "CURLHE_BADINDEX (1)"

docs/libcurl/curl_easy_nextheader.3

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ struct curl_header *curl_easy_nextheader(CURL *easy,
3232
struct curl_header *prev);
3333
.fi
3434
.SH DESCRIPTION
35-
EXPERIMENTAL feature!
36-
3735
This function lets an application iterate over all previously received HTTP
3836
headers.
3937

@@ -85,7 +83,7 @@ while((h = curl_easy_nextheader(easy, origin, -1, prev))) {
8583
}
8684
.fi
8785
.SH AVAILABILITY
88-
Added in 7.83.0
86+
Added in 7.83.0. Officially supported since 7.84.0.
8987
.SH RETURN VALUE
9088
This function returns the next header, or NULL when there are no more
9189
(matching) headers or an error occurred.

lib/headers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "curl_memory.h"
3333
#include "memdebug.h"
3434

35-
#if !defined(CURL_DISABLE_HTTP) && defined(USE_HEADERS_API)
35+
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HEADERS_API)
3636

3737
/* Generate the curl_header struct for the user. This function MUST assign all
3838
struct fields in the output struct. */

lib/headers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
***************************************************************************/
2424
#include "curl_setup.h"
2525

26-
#if !defined(CURL_DISABLE_HTTP) && defined(USE_HEADERS_API)
26+
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HEADERS_API)
2727

2828
struct Curl_header_store {
2929
struct Curl_llist_element node;

tests/server/disabled.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static const char *disabled[]={
7070
#ifndef ENABLE_WAKEUP
7171
"wakeup",
7272
#endif
73-
#ifndef USE_HEADERS_API
73+
#ifdef CURL_DISABLE_HEADERS_API
7474
"headers-api",
7575
#endif
7676
NULL

0 commit comments

Comments
 (0)