Merge branch 'dl/packet-read-response-end-fix'
Error message update. * dl/packet-read-response-end-fix: pkt-line: replace "stateless separator" with "response end"
This commit is contained in:
@ -103,7 +103,7 @@ void packet_response_end(int fd)
|
|||||||
{
|
{
|
||||||
packet_trace("0002", 4, 1);
|
packet_trace("0002", 4, 1);
|
||||||
if (write_in_full(fd, "0002", 4) < 0)
|
if (write_in_full(fd, "0002", 4) < 0)
|
||||||
die_errno(_("unable to write stateless separator packet"));
|
die_errno(_("unable to write response end packet"));
|
||||||
}
|
}
|
||||||
|
|
||||||
int packet_flush_gently(int fd)
|
int packet_flush_gently(int fd)
|
||||||
|
@ -653,7 +653,7 @@ static int rpc_read_from_out(struct rpc_state *rpc, int options,
|
|||||||
memcpy(buf - 4, "0000", 4);
|
memcpy(buf - 4, "0000", 4);
|
||||||
break;
|
break;
|
||||||
case PACKET_READ_RESPONSE_END:
|
case PACKET_READ_RESPONSE_END:
|
||||||
die(_("remote server sent stateless separator"));
|
die(_("remote server sent unexpected response end packet"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
serve.c
2
serve.c
@ -258,7 +258,7 @@ static int process_request(void)
|
|||||||
state = PROCESS_REQUEST_DONE;
|
state = PROCESS_REQUEST_DONE;
|
||||||
break;
|
break;
|
||||||
case PACKET_READ_RESPONSE_END:
|
case PACKET_READ_RESPONSE_END:
|
||||||
BUG("unexpected stateless separator packet");
|
BUG("unexpected response end packet");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user