From 49acec6fe140782a2049778e91c24b12051acdd6 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 3 Mar 2010 14:20:55 +0000
Subject: [PATCH] Monotone-Parent: 65d228dc16888e0f4d54d90ddab6934c650b6635
 Monotone-Revision: b982425d025e1868ff5d27a3fcb0069acc24e6c8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-03-03T14:20:55
Monotone-Branch: ca.inverse.sogo
---
 SOPE/sope-patchset-r1664.diff | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/SOPE/sope-patchset-r1664.diff b/SOPE/sope-patchset-r1664.diff
index ef687e751..9b257f838 100644
--- a/SOPE/sope-patchset-r1664.diff
+++ b/SOPE/sope-patchset-r1664.diff
@@ -1168,7 +1168,18 @@ Index: sope-mime/NGImap4/NGSieveClient.m
    
    buf[logLen] = '\0';
    buf[logLen * 2 + 1] = '\0';
-@@ -656,7 +657,7 @@
+@@ -422,7 +423,9 @@
+   s = @"PUTSCRIPT \"";
+   s = [s stringByAppendingString:_name];
+   s = [s stringByAppendingString:@"\" "];
+-  s = [s stringByAppendingFormat:@"{%d+}\r\n%@", [_script length], _script];
++  s = [s stringByAppendingFormat:@"{%d+}\r\n%@",
++         [_script lengthOfBytesUsingEncoding: NSUTF8StringEncoding],
++         _script];
+   s = [s stringByAppendingString:@"\r\n"];
+   map = [self processCommand:s];
+   return [self normalizeResponse:map];
+@@ -656,7 +659,7 @@
        fputc('\n', stderr);
      }
      else
@@ -2566,7 +2577,13 @@ Index: sope-mime/NGImap4/ChangeLog
 ===================================================================
 --- sope-mime/NGImap4/ChangeLog	(revision 1664)
 +++ sope-mime/NGImap4/ChangeLog	(working copy)
-@@ -1,3 +1,133 @@
+@@ -1,3 +1,139 @@
++2010-03-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
++
++	* NGSieveClient.m (-putScript:script:): the byte count passed as
++	parameter to the server must correspond to an UTF-8 encoded
++	string.
++
 +2010-02-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 +
 +	* NGImap4ResponseParser.m (_parseACLResponseIntoHashMap:): user