summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjan <jan@152afb58-edef-0310-8abb-c4023f1b3aa9>2006-09-23 07:04:02 +0000
committerjan <jan@152afb58-edef-0310-8abb-c4023f1b3aa9>2006-09-23 07:04:02 +0000
commit35ceb6dabe4f784e39fccc827e8db38cdfd3fd30 (patch)
tree91900b29fa19a31639037b2e917a993d964f74e3
parentc236e02e7e7ce7f8202c2c3231ef2a868b02ef37 (diff)
downloadlighttpd-35ceb6dabe4f784e39fccc827e8db38cdfd3fd30.tar.gz
fixed connections falling back to non-ssl when keep-alive + ssl was used
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.11-ssl-fixes@1334 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--src/connections.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/connections.c b/src/connections.c
index 9612129f..4e5a4fb6 100644
--- a/src/connections.c
+++ b/src/connections.c
@@ -1342,6 +1342,12 @@ int connection_state_machine(server *srv, connection *con) {
con->loops_per_request = 0;
connection_set_state(srv, con, CON_STATE_READ);
+
+ /* patch con->conf.is_ssl if the connection is a ssl-socket already */
+
+#ifdef USE_OPENSSL
+ con->conf.is_ssl = srv_sock->is_ssl;
+#endif
break;
case CON_STATE_REQUEST_END: /* transient */