summaryrefslogtreecommitdiff
path: root/source4/web_server/config.mk
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-05-27 11:57:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:06 -0500
commitebb0b35242f5c2967afdba9e746679bc87c5b745 (patch)
tree9ebe0df98f2ab83dc595c84015879400b56184c2 /source4/web_server/config.mk
parent631f9782a6f499b14aad035f1eee5b2aab18878c (diff)
downloadsamba-ebb0b35242f5c2967afdba9e746679bc87c5b745.tar.gz
samba-ebb0b35242f5c2967afdba9e746679bc87c5b745.tar.bz2
samba-ebb0b35242f5c2967afdba9e746679bc87c5b745.zip
r7013: added tls support to the builtin web server. It auto-detects if the client
is using tls by looking at the first byte on the connection. This allows both https and http services to be on the same port (This used to be commit 6369dfb6585ce4d4e3028c557395f2d73c290c92)
Diffstat (limited to 'source4/web_server/config.mk')
-rw-r--r--source4/web_server/config.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/web_server/config.mk b/source4/web_server/config.mk
index b287b4f153..00ae2ea8a0 100644
--- a/source4/web_server/config.mk
+++ b/source4/web_server/config.mk
@@ -34,7 +34,8 @@ INIT_OBJ_FILES = \
web_server/web_server.o
ADD_OBJ_FILES = \
web_server/http.o \
- web_server/calls.o
+ web_server/calls.o \
+ web_server/tls.o
REQUIRED_SUBSYSTEMS = ESP
# End SUBSYSTEM WEB
#######################