Merge Trond.

[m6w6/libmemcached] / libmemcached / memcached_do.c

diff --git a/libmemcached/memcached_do.c b/libmemcached/memcached_do.c
index c364efe8c6a12bb5126e73296a47de7cb3e1a04e..46ca79b95a6e706d56af06c2e211d86799f54742 100644 (file)
--- a/libmemcached/memcached_do.c
+++ b/libmemcached/memcached_do.c
@@ -15,7 +15,15 @@ memcached_return memcached_do(memcached_server_st *ptr, const void *command,
     return rc;
   }
 
-  sent_length= memcached_io_write(ptr, command, command_length, with_flush);
+  /*
+  ** Since non buffering ops in UDP mode dont check to make sure they will fit
+  ** before they start writing, if there is any data in buffer, clear it out,
+  ** otherwise we might get a partial write.
+  **/
+  if (ptr->type == MEMCACHED_CONNECTION_UDP && with_flush && ptr->write_buffer_offset > UDP_DATAGRAM_HEADER_LENGTH)
+    memcached_io_write(ptr, NULL, 0, 1);
+
+  sent_length= memcached_io_write(ptr, command, command_length, (char) with_flush);
 
   if (sent_length == -1 || (size_t)sent_length != command_length)
     rc= MEMCACHED_WRITE_FAILURE;