gvfs r2295 - in trunk: . client

[alexl svn gnome org]

Author: alexl
Date: Fri Mar  6 15:20:19 2009
New Revision: 2295
URL: http://svn.gnome.org/viewvc/gvfs?rev=2295&view=rev

Log:
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.




Modified:
   trunk/ChangeLog
   trunk/client/gdaemonfileinputstream.c

Modified: trunk/client/gdaemonfileinputstream.c
==============================================================================
--- trunk/client/gdaemonfileinputstream.c	(original)
+++ trunk/client/gdaemonfileinputstream.c	Fri Mar  6 15:20:19 2009
@@ -735,7 +735,7 @@
 				 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 @@
 				 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 @@
 				 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 @@
 				 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;
 	    }