clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-09-04 20:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

attempt to fix error propagation in https

Browse Source
This commit is contained in:
Roberto De Ioris
2014-11-20 07:25:19 +01:00
parent 3d553d2ae0
commit f7cdd22f9a
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/http/https.c
+13 -1
View File
@@ -10,6 +10,12 @@
extern struct uwsgi_http uhttp;
// taken from nginx
static void hr_ssl_clear_errors() {
while (ERR_peek_error()) {}
ERR_clear_error();
}
void uwsgi_opt_https(char *opt, char *value, void *cr) {
struct uwsgi_corerouter *ucr = (struct uwsgi_corerouter *) cr;
char *client_ca = NULL;
@@ -234,7 +240,7 @@ void hr_session_ssl_close(struct corerouter_session *cs) {
#endif
// clear the errors (otherwise they could be propagated)
ERR_clear_error();
hr_ssl_clear_errors();
SSL_free(hr->ssl);
}
@@ -270,6 +276,8 @@ ssize_t hr_ssl_write(struct corerouter_peer *main_peer) {
struct corerouter_session *cs = main_peer->session;
struct http_session *hr = (struct http_session *) cs;
hr_ssl_clear_errors();
int ret = SSL_write(hr->ssl, main_peer->out->buf + main_peer->out_pos, main_peer->out->pos - main_peer->out_pos);
if (ret > 0) {
main_peer->out_pos += ret;
@@ -324,6 +332,8 @@ ssize_t hr_ssl_read(struct corerouter_peer *main_peer) {
struct corerouter_session *cs = main_peer->session;
struct http_session *hr = (struct http_session *) cs;
hr_ssl_clear_errors();
// try to always leave 4k available
if (uwsgi_buffer_ensure(main_peer->in, uwsgi.page_size)) return -1;
int ret = SSL_read(hr->ssl, main_peer->in->buf + main_peer->in->pos, main_peer->in->len - main_peer->in->pos);
@@ -385,6 +395,8 @@ ssize_t hr_ssl_shutdown(struct corerouter_peer *peer) {
struct corerouter_session *cs = peer->session;
struct http_session *hr = (struct http_session *) cs;
hr_ssl_clear_errors();
int ret = SSL_shutdown(hr->ssl);
int err = 0;