diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-09-05 10:04:21 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-09-05 10:04:21 +0000 |
| commit | ff19a716a21b4cc58cda483ca2b6001952b9e5b1 (patch) | |
| tree | dce34e56609205ce34ca7960196a03d94a6a18eb /usr.sbin/httpd/httpd.h | |
| parent | 3d65c5b139f797e9bcc3f7f850b48f67dcda4216 (diff) | |
Remove a limitation that only allowed to specify a server name once.
The key has been changed to server name + address + port and now it is
possible to use the same server name for multiple servers with
different addresses, eg. http://www.example.com and
https://www.example.com/.
OK doug@ florian@
Diffstat (limited to 'usr.sbin/httpd/httpd.h')
| -rw-r--r-- | usr.sbin/httpd/httpd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/httpd/httpd.h b/usr.sbin/httpd/httpd.h index 82f90be10b9..5c197cf6936 100644 --- a/usr.sbin/httpd/httpd.h +++ b/usr.sbin/httpd/httpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: httpd.h,v 1.57 2014/09/02 16:20:41 reyk Exp $ */ +/* $OpenBSD: httpd.h,v 1.58 2014/09/05 10:04:20 reyk Exp $ */ /* * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -466,6 +466,8 @@ pid_t server(struct privsep *, struct privsep_proc *); int server_ssl_load_keypair(struct server *); int server_privinit(struct server *); void server_purge(struct server *); +void serverconfig_free(struct server_config *); +void serverconfig_reset(struct server_config *); int server_socket_af(struct sockaddr_storage *, in_port_t); in_port_t server_socket_getport(struct sockaddr_storage *); |