Commit 8208d9e2 authored by Sergey Lyubka's avatar Sergey Lyubka

Fixed -DUSE_SSL build

parent fdd086b1
...@@ -1067,7 +1067,11 @@ static void prepare_cgi_environment(struct connection *conn, ...@@ -1067,7 +1067,11 @@ static void prepare_cgi_environment(struct connection *conn,
addenv(blk, "SCRIPT_FILENAME=%s", prog); addenv(blk, "SCRIPT_FILENAME=%s", prog);
addenv(blk, "PATH_TRANSLATED=%s", prog); addenv(blk, "PATH_TRANSLATED=%s", prog);
#ifdef USE_SSL
addenv(blk, "HTTPS=%s", conn->ssl != NULL ? "on" : "off"); addenv(blk, "HTTPS=%s", conn->ssl != NULL ? "on" : "off");
#else
addenv(blk, "HTTPS=%s", "off");
#endif
if ((s = mg_get_header(ri, "Content-Type")) != NULL) if ((s = mg_get_header(ri, "Content-Type")) != NULL)
addenv(blk, "CONTENT_TYPE=%s", s); addenv(blk, "CONTENT_TYPE=%s", s);
...@@ -1915,11 +1919,11 @@ static void call_uri_handler(struct connection *conn) { ...@@ -1915,11 +1919,11 @@ static void call_uri_handler(struct connection *conn) {
static void write_to_socket(struct connection *conn) { static void write_to_socket(struct connection *conn) {
struct iobuf *io = &conn->remote_iobuf; struct iobuf *io = &conn->remote_iobuf;
int n = conn->ssl == NULL ? send(conn->client_sock, io->buf, io->len, 0) :
#ifdef USE_SSL #ifdef USE_SSL
int n = conn->ssl == NULL ? send(conn->client_sock, io->buf, io->len, 0) :
SSL_write(conn->ssl, io->buf, io->len); SSL_write(conn->ssl, io->buf, io->len);
#else #else
0; int n = send(conn->client_sock, io->buf, io->len, 0);
#endif #endif
DBG(("%p Written %d of %d(%d): [%.*s ...]", DBG(("%p Written %d of %d(%d): [%.*s ...]",
...@@ -3535,8 +3539,8 @@ static void read_from_socket(struct connection *conn) { ...@@ -3535,8 +3539,8 @@ static void read_from_socket(struct connection *conn) {
return; return;
} }
if (conn->ssl != NULL) {
#ifdef USE_SSL #ifdef USE_SSL
if (conn->ssl != NULL) {
if (conn->flags & CONN_SSL_HANDS_SHAKEN) { if (conn->flags & CONN_SSL_HANDS_SHAKEN) {
n = SSL_read(conn->ssl, buf, sizeof(buf)); n = SSL_read(conn->ssl, buf, sizeof(buf));
} else { } else {
...@@ -3545,8 +3549,9 @@ static void read_from_socket(struct connection *conn) { ...@@ -3545,8 +3549,9 @@ static void read_from_socket(struct connection *conn) {
} }
return; return;
} }
} else
#endif #endif
} else { {
n = recv(conn->client_sock, buf, sizeof(buf), 0); n = recv(conn->client_sock, buf, sizeof(buf), 0);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment