65 === modified file 'src/network-socket.c' 66 --- src/network-socket.c 2010-05-03 14:26:32 +0000 67 +++ src/network-socket.c 2010-05-10 11:52:26 +0000 ...
In static network_socket_retval_t network_socket_write_send(network_socket *con, int send_chunks) is
76 @@ -660,6 +661,7 @@ 77 } 78 } 79 80 + con->dst->can_unlink_socket = TRUE; 81 return NETWORK_SOCKET_SUCCESS; 82 }
which would mean:
"unlink socket after successful write" which isn't what we want. Seems to a broken merge. The rest looks good.
« Back to merge proposal
65 === modified file 'src/network- socket. c' socket. c 2010-05-03 14:26:32 +0000 socket. c 2010-05-10 11:52:26 +0000
66 --- src/network-
67 +++ src/network-
...
In static network_ socket_ retval_ t network_ socket_ write_send( network_ socket *con, int send_chunks) is
76 @@ -660,6 +661,7 @@ >can_unlink_ socket = TRUE; SOCKET_ SUCCESS;
77 }
78 }
79
80 + con->dst-
81 return NETWORK_
82 }
which would mean:
"unlink socket after successful write" which isn't what we want. Seems to a broken merge. The rest looks good.