summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9>2013-03-25 17:22:34 +0000
committerstbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9>2013-03-25 17:22:34 +0000
commit6efa929c7031bdeeec88f38029656ee92604266e (patch)
treee351c4de379ed5382d51cd37338f4248c540f9e6
parent6185699b25e280e672c890f94c33b7dd0867eeb3 (diff)
downloadlighttpd-6efa929c7031bdeeec88f38029656ee92604266e.tar.gz
call ERR_clear_error only for ssl connections in CON_STATE_ERROR
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2867 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--NEWS1
-rw-r--r--src/connections.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ab7c732b..a83d88a9 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ NEWS
* fix handling of If-Modified-Since if If-None-Match is present (don't return 412 for date parsing errors);
follow current draft for HTTP/1.1, which tells us to ignore If-Modified-Since if we have matching etags.
* [mod_fastcgi,log] support multi line logging (fixes #2252)
+ * call ERR_clear_error only for ssl connections in CON_STATE_ERROR
- 1.4.32 - 2012-11-21
* Code cleanup with clang/sparse (fixes #2437, thx kibi)
diff --git a/src/connections.c b/src/connections.c
index 48ca60fe..77714c9f 100644
--- a/src/connections.c
+++ b/src/connections.c
@@ -1736,8 +1736,8 @@ int connection_state_machine(server *srv, connection *con) {
break;
}
}
+ ERR_clear_error();
}
- ERR_clear_error();
#endif
switch(con->mode) {