summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2010-05-05 08:13:00 +0000
committerjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2010-05-05 08:13:00 +0000
commit8c0423d842704f4471e4a6db3d35d329bca0285b (patch)
tree8612e49361744268af8dd823c29e35bae94718ab
parent8db8a9c8588ec2acea12fbc3740c35922d5f0bfd (diff)
downloadneon-8c0423d842704f4471e4a6db3d35d329bca0285b.tar.gz
Merge r1794 from trunk:
* src/ne_session.c (ne_session_create): Fix to enable SNI by default again. (Tobias Gruetzmacher) git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.29.x@1800 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
-rw-r--r--NEWS1
-rw-r--r--src/ne_session.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index a194348..42dec7f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
Changes in release 0.29.4:
* Fix possible Solaris linker errors if building static library.
+* Fix SNI support (Tobias Gruetzmacher).
Changes in release 0.29.3:
* Change ne_sock_close() to no longer wait for SSL closure alert:
diff --git a/src/ne_session.c b/src/ne_session.c
index 117c25a..41f50fd 100644
--- a/src/ne_session.c
+++ b/src/ne_session.c
@@ -183,8 +183,10 @@ ne_session *ne_session_create(const char *scheme,
ia = ne_iaddr_parse(hostname, ne_iaddr_ipv6);
if (ia) {
- sess->flags[NE_SESSFLAG_TLS_SNI] = 1;
ne_iaddr_free(ia);
+ }
+ else {
+ sess->flags[NE_SESSFLAG_TLS_SNI] = 1;
}
NE_DEBUG(NE_DBG_SSL, "ssl: SNI %s by default.\n",
sess->flags[NE_SESSFLAG_TLS_SNI] ?