git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.11.0.
[libguestfs.git]
/
daemon
/
upload.c
diff --git
a/daemon/upload.c
b/daemon/upload.c
index
f8d312f
..
2c42969
100644
(file)
--- a/
daemon/upload.c
+++ b/
daemon/upload.c
@@
-94,8
+94,11
@@
upload (const char *filename, int flags, int64_t offset)
return -1;
}
if (r == -2) { /* cancellation from library */
return -1;
}
if (r == -2) { /* cancellation from library */
+ /* This error is ignored by the library since it initiated the
+ * cancel. Nevertheless we must send an error reply here.
+ */
+ reply_with_error ("file upload cancelled");
close (data.fd);
close (data.fd);
- /* Do NOT send any error. */
return -1;
}
return -1;
}