New upstream version 2.3.1

This commit is contained in:
Jan Wagner 2021-04-11 11:58:04 +02:00
parent 5c6ba24b61
commit 09f4277f49
42 changed files with 685 additions and 3601 deletions

View file

@ -72,7 +72,7 @@ int maximum_age = -1;
enum {
REGS = 2,
MAX_RE_SIZE = 256
MAX_RE_SIZE = 1024
};
#include "regex.h"
regex_t preg;
@ -1567,6 +1567,10 @@ print_help (void)
print_usage ();
#ifdef HAVE_SSL
printf (_("In the first form, make an HTTP request."));
printf (_("In the second form, connect to the server and check the TLS certificate."));
#endif
printf (_("NOTE: One or both of -H and -I must be specified"));
printf ("\n");
@ -1726,6 +1730,8 @@ print_usage (void)
printf (" [-b proxy_auth] [-f <ok|warning|critcal|follow|sticky|stickyport>]\n");
printf (" [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n");
printf (" [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
printf (" [-A string] [-k string] [-S <version>] [--sni] [-C <warn_age>[,<crit_age>]]\n");
printf (" [-A string] [-k string] [-S <version>] [--sni]\n");
printf (" [-T <content-type>] [-j method]\n");
printf (" %s -H <vhost> | -I <IP-address> -C <warn_age>[,<crit_age>]\n",progname);
printf (" [-p <port>] [-t <timeout>] [-4|-6] [--sni]\n");
}