summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Strauss <gstrauss@gluelogic.com>2019-02-10 13:33:43 -0500
committerGlenn Strauss <gstrauss@gluelogic.com>2019-02-10 20:26:58 -0500
commit859c9ae58695f1844262a2017ce78a0d27bd5a61 (patch)
tree8e49a6caf119558f7f79d7a98ac903d227c64081
parentdaa5f7c576538b1fe711e81f08bb7da618370c17 (diff)
downloadlighttpd1.4-859c9ae58695f1844262a2017ce78a0d27bd5a61.tar.gz
lighttpd1.4-859c9ae58695f1844262a2017ce78a0d27bd5a61.zip
[multiple] minor: remove duplicated conditions
x-ref: "PVS-Studio Analysis Results" https://redmine.lighttpd.net/boards/3/topics/8459 http://www.fly-server.ru/pvs-studio/lighttpd/
-rw-r--r--src/mod_cgi.c5
-rw-r--r--src/mod_wstunnel.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/src/mod_cgi.c b/src/mod_cgi.c
index aeec06f9..d39277d2 100644
--- a/src/mod_cgi.c
+++ b/src/mod_cgi.c
@@ -620,10 +620,7 @@ static ssize_t cgi_write_file_chunk_mmap(server *srv, connection *con, int fd, c
}
}
- if (r >= 0) {
- chunkqueue_mark_written(cq, r);
- }
-
+ chunkqueue_mark_written(cq, r);
return r;
}
diff --git a/src/mod_wstunnel.c b/src/mod_wstunnel.c
index 6843ace5..238791a9 100644
--- a/src/mod_wstunnel.c
+++ b/src/mod_wstunnel.c
@@ -884,7 +884,7 @@ handler_t mod_wstunnel_handshake_create_response(handler_ctx *hctx) {
/* 8 bytes should have been sent with request
* for draft-ietf-hybi-thewebsocketprotocol-00 */
chunkqueue *cq = con->request_content_queue;
- if (0 == hctx->hybivers && chunkqueue_length(cq) < 8)
+ if (chunkqueue_length(cq) < 8)
return HANDLER_WAIT_FOR_EVENT;
#endif /* _MOD_WEBSOCKET_SPEC_IETF_00_ */