Don't send cancel when partial header read, as that would throw away the

2009-03-06  Alexander Larsson  <alexl@redhat.com>

        * client/gdaemonfileinputstream.c:
        (iterate_read_state_machine):
        (iterate_close_state_machine):
        (iterate_seek_state_machine):
        (iterate_query_state_machine):
	Don't send cancel when partial header read, as that
	would throw away the part of the headers read so far.



svn path=/trunk/; revision=2295

2 files changed, 14 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index c98e5061..5ff40fb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-06  Alexander Larsson  <alexl@redhat.com>
+
+        * client/gdaemonfileinputstream.c:
+        (iterate_read_state_machine):
+        (iterate_close_state_machine):
+        (iterate_seek_state_machine):
+        (iterate_query_state_machine):
+	Don't send cancel when partial header read, as that
+	would throw away the part of the headers read so far.
+
 2009-03-05  Alexander Larsson  <alexl@redhat.com>
 
         * common/gvfsmountinfo.c:
diff --git a/client/gdaemonfileinputstream.c b/client/gdaemonfileinputstream.c
index db7c3abf..69f70c62 100644
--- a/client/gdaemonfileinputstream.c
+++ b/client/gdaemonfileinputstream.c
@@ -735,7 +735,7 @@ iterate_read_state_machine (GDaemonFileInputStream *file, IOOperationData *io_op
 				 current_len + len);
 	      io_op->io_buffer = file->input_buffer->str + current_len;
 	      io_op->io_size = len;
-	      io_op->io_allow_cancel = !op->sent_cancel;
+	      io_op->io_allow_cancel = file->input_buffer->len == 0 && !op->sent_cancel;
 	      return STATE_OP_READ;
 	    }
 
@@ -993,7 +993,7 @@ iterate_close_state_machine (GDaemonFileInputStream *file, IOOperationData *io_o
 				 current_len + len);
 	      io_op->io_buffer = file->input_buffer->str + current_len;
 	      io_op->io_size = len;
-	      io_op->io_allow_cancel = !op->sent_cancel;
+	      io_op->io_allow_cancel = file->input_buffer->len == 0 && !op->sent_cancel;
 	      return STATE_OP_READ;
 	    }
 
@@ -1257,7 +1257,7 @@ iterate_seek_state_machine (GDaemonFileInputStream *file, IOOperationData *io_op
 				 current_len + len);
 	      io_op->io_buffer = file->input_buffer->str + current_len;
 	      io_op->io_size = len;
-	      io_op->io_allow_cancel = !op->sent_cancel;
+	      io_op->io_allow_cancel = file->input_buffer->len == 0 && !op->sent_cancel;
 	      return STATE_OP_READ;
 	    }
 
@@ -1534,7 +1534,7 @@ iterate_query_state_machine (GDaemonFileInputStream *file,
 				 current_len + len);
 	      io_op->io_buffer = file->input_buffer->str + current_len;
 	      io_op->io_size = len;
-	      io_op->io_allow_cancel = !op->sent_cancel;
+	      io_op->io_allow_cancel = file->input_buffer->len == 0 && !op->sent_cancel;
 	      return STATE_OP_READ;
 	    }