diff --git a/configure b/configure index 7cdfde6e..9ca63190 100755 --- a/configure +++ b/configure @@ -5182,7 +5182,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking http1 is enabled: $ac_enable_http1" >&5 $as_echo "checking http1 is enabled: $ac_enable_http1" >&6; } if test "$ac_enable_http1" = "yes"; then - $as_echo "#define HAVE_HTTP1 true" >>confdefs.h + +$as_echo "#define HAVE_HTTP1 true" >>confdefs.h # Must be tree/false (not 0/1) used in shells HAVE_HTTP1=true fi diff --git a/configure.ac b/configure.ac index 1a08ba82..5b20156f 100644 --- a/configure.ac +++ b/configure.ac @@ -237,7 +237,7 @@ elif test "x${with_restconf}" == xnative; then AC_MSG_RESULT(checking http1 is enabled: $ac_enable_http1) if test "$ac_enable_http1" = "yes"; then - AC_DEFINE(HAVE_HTTP1,true) # Must be tree/false (not 0/1) used in shells + AC_DEFINE(HAVE_HTTP1, true, [Set to true to enable Native HTTP/1]) # Must be tree/false (not 0/1) used in shells HAVE_HTTP1=true fi diff --git a/include/clixon_config.h.in b/include/clixon_config.h.in index c75e6639..b75c1184 100644 --- a/include/clixon_config.h.in +++ b/include/clixon_config.h.in @@ -33,6 +33,9 @@ /* Define to 1 if you have the `getresuid' function. */ #undef HAVE_GETRESUID +/* Enable HTTP/1 (default true) */ +#undef HAVE_HTTP1 + /* Define to 1 if you have the `inet_aton' function. */ #undef HAVE_INET_ATON @@ -60,9 +63,6 @@ /* Define to 1 if you have the `nghttp2' library (-lnghttp2). */ #undef HAVE_LIBNGHTTP2 -/* Set to true if HTTP/1 parser */ -#undef HAVE_HTTP1 - /* Define to 1 if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c index 7957ad33..526e7167 100644 --- a/lib/src/clixon_netconf_lib.c +++ b/lib/src/clixon_netconf_lib.c @@ -1701,8 +1701,7 @@ netconf_hello_server(clicon_handle h, /* Each peer MUST send at least the base NETCONF capability, "urn:ietf:params:netconf:base:1.1" * RFC 6241 Sec 8.1 */ - if (clicon_option_int(h, "CLICON_NETCONF_BASE_CAPABILITY") > 0) /* RFC 6241 */ - cprintf(cb, "%s", NETCONF_BASE_CAPABILITY_1_1); + cprintf(cb, "%s", NETCONF_BASE_CAPABILITY_1_1); } /* A peer MAY include capabilities for previous NETCONF versions, to indicate that it supports multiple protocol versions. */