Skip to content

Commit 664e9bf

Browse files
committed
CA-226177: Don't close the stunnel channel when finished using it
This seems to cause stunnel to complain: sendto(5, "<83>Nov 2 14:14:55 stunnel: LOG3[28389:139831015200832]: INTERNAL ERROR: s_poll_wait returned 0, but no descriptor is ready", 124, MSG_NOSIGNAL, NULL, 0) = 124 write(2, "2016.11.02 14:14:55 LOG3[28389:139831015200832]: INTERNAL ERROR: s_poll_wait returned 0, but no descriptor is ready\n", 116) = 116 sendto(5, "<85>Nov 2 14:14:55 stunnel: LOG5[28389:139831015200832]: Connection reset: 393438 byte(s) sent to SSL, 169 byte(s) sent to socket", 130, MSG_NOSIGNAL, NULL, 0) = 130 write(2, "2016.11.02 14:14:55 LOG5[28389:139831015200832]: Connection reset: 393438 byte(s) sent to SSL, 169 byte(s) sent to socket\n", 122) = 122 If we don't close it at this point, it'll get closed at the end anyway, so in any case it's redundant. Signed-off-by: Jon Ludlam <[email protected]>
1 parent 14fd0c9 commit 664e9bf

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

ocaml/xe-cli/newcli.ml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,6 @@ let main_loop ifd ofd =
515515
copy_with_heartbeat file_ch oc heartbeat_fun;
516516
marshal ofd (Response OK))
517517
(fun () ->
518-
(try close_in ic with _ -> ());
519518
(try close_in file_ch with _ -> ()))
520519
| 302 ->
521520
let newloc = List.assoc "location" headers in

0 commit comments

Comments
 (0)