summaryrefslogtreecommitdiff
path: root/src/network.c
diff options
context:
space:
mode:
authorGlenn Strauss <gstrauss@gluelogic.com>2016-12-20 21:57:08 -0500
committerGlenn Strauss <gstrauss@gluelogic.com>2017-01-14 01:06:16 -0500
commit2bc94dee8223df6eea2d20223614194f17c3d2f0 (patch)
treebd565b7cd60727430594346424ae8f708d8fe916 /src/network.c
parent93fc82c4acf3560cfa1a353ed4b13046ff33251e (diff)
downloadlighttpd1.4-2bc94dee8223df6eea2d20223614194f17c3d2f0.tar.gz
lighttpd1.4-2bc94dee8223df6eea2d20223614194f17c3d2f0.zip
[core] con interface for read/write; isolate SSL
Diffstat (limited to 'src/network.c')
-rw-r--r--src/network.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/network.c b/src/network.c
index 4295fe96..83141690 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1023,10 +1023,6 @@ int network_init(server *srv) {
}
buffer_free(b);
-#ifdef USE_OPENSSL
- srv->network_ssl_backend_write = network_write_chunkqueue_openssl;
-#endif
-
/* get a usefull default */
backend = network_backends[0].nb;
@@ -1119,7 +1115,6 @@ int network_write_chunkqueue(server *srv, connection *con, chunkqueue *cq, off_t
#ifdef TCP_CORK
int corked = 0;
#endif
- server_socket *srv_socket = con->srv_socket;
if (con->conf.global_kbytes_per_second) {
off_t limit = con->conf.global_kbytes_per_second * 1024 - *(con->conf.global_bytes_per_second_cnt_ptr);
@@ -1157,14 +1152,7 @@ int network_write_chunkqueue(server *srv, connection *con, chunkqueue *cq, off_t
}
#endif
- if (srv_socket->is_ssl) {
-#ifdef USE_OPENSSL
- ret = srv->network_ssl_backend_write(srv, con, con->ssl, cq, max_bytes);
-#endif
- } else {
- ret = srv->network_backend_write(srv, con, con->fd, cq, max_bytes);
- }
-
+ ret = con->network_write(srv, con, cq, max_bytes);
if (ret >= 0) {
chunkqueue_remove_finished_chunks(cq);
ret = chunkqueue_is_empty(cq) ? 0 : 1;