summaryrefslogtreecommitdiff
path: root/cups/http.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2014-08-28 15:37:22 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2014-08-28 15:37:22 +0000
commit7d5824d6a8f0aeb47c446f61e655c3a0f5c51e93 (patch)
tree62f89468c9607219f8c1fbc49c56fe546fc8bde0 /cups/http.c
parent3bc376ee94dd13ff43b9af675eb7381e443ea6ea (diff)
downloadcups-7d5824d6a8f0aeb47c446f61e655c3a0f5c51e93.tar.gz
Fix Linux builds without normal prerequisite libraries installed.
Also correct GCC 4.8 compiler warnings. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12124 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/http.c')
-rw-r--r--cups/http.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/cups/http.c b/cups/http.c
index 1d6e4f75c..9520fa4bd 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -2557,9 +2557,11 @@ httpSetCredentials(http_t *http, /* I - HTTP connection */
if (!http || cupsArrayCount(credentials) < 1)
return (-1);
+#ifdef HAVE_SSL
_httpFreeCredentials(http->tls_credentials);
http->tls_credentials = _httpCreateCredentials(credentials);
+#endif /* HAVE_SSL */
return (http->tls_credentials ? 0 : -1);
}
@@ -2856,8 +2858,10 @@ httpShutdown(http_t *http) /* I - HTTP connection */
if (!http || http->fd < 0)
return;
+#ifdef HAVE_SSL
if (http->tls)
_httpTLSStop(http);
+#endif /* HAVE_SSL */
#ifdef WIN32
shutdown(http->fd, SD_RECEIVE); /* Microsoft-ism... */