diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2015-02-24 08:57:19 +0100 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2015-02-24 08:57:19 +0100 |
| commit | be1b7213b8e8d0de98b5a6445504a583e8c9a064 (patch) | |
| tree | b7360e53b785340929ce2e4722703fd97c121f26 /httpd.h | |
| parent | 8a2934048ba934e50ecc1736d554036fc39f6752 (diff) | |
| download | httpd-be1b7213b8e8d0de98b5a6445504a583e8c9a064.tar.gz httpd-be1b7213b8e8d0de98b5a6445504a583e8c9a064.zip | |
Allow to specify CGI variables as macros in redirection strings, eg.OPENBSD_5_7_BASE
block return 301 "http://www.example.com/$REQUEST_URI"
OK tedu@ florian@
Add return_uri to serverconfig_reset() to avoid using garbage from the
imsg buffer.
Debugging & OK halex@
Change TLS_PROTOCOLS_DEFAULT to be TLSv1.2 only. Add a TLS_PROTOCOLS_ALL
that includes all currently supported protocols (TLSv1.0, TLSv1.1 and
TLSv1.2). Change all users of libtls to use TLS_PROTOCOLS_ALL so that they
maintain existing behaviour.
Discussed with tedu@ and reyk@.
Diffstat (limited to 'httpd.h')
| -rw-r--r-- | httpd.h | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: httpd.h,v 1.77 2015/02/07 23:56:02 reyk Exp $ */ +/* $OpenBSD: httpd.h,v 1.81 2015/02/23 18:43:18 reyk Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -410,6 +410,7 @@ struct server_config { u_int8_t *tls_key; size_t tls_key_len; char *tls_key_file; + u_int32_t tls_protocols; u_int32_t flags; int strip; @@ -583,10 +584,13 @@ int fcgi_add_stdin(struct client *, struct evbuffer *); void event_again(struct event *, int, short, void (*)(int, short, void *), struct timeval *, struct timeval *, void *); +int expand_string(char *, size_t, const char *, const char *); const char *url_decode(char *); +char *url_encode(const char *); const char *canonicalize_host(const char *, char *, size_t); const char *canonicalize_path(const char *, char *, size_t); size_t path_info(char *); +char *escape_html(const char *); void imsg_event_add(struct imsgev *); int imsg_compose_event(struct imsgev *, u_int16_t, u_int32_t, pid_t, int, void *, u_int16_t); |