cvs diff -r HEAD -u include\curl\curl.h docs\libcurl\curl_easy_setopt.3 docs\examples\debug.c tests\libtest\lib552.c src\main.c docs\examples\multi-debugcallback.c lib\sendf.c (in directory D:\cvs\curl\)
Index: include/curl/curl.h
===================================================================
RCS file: /cvsroot/curl/curl/include/curl/curl.h,v
retrieving revision 1.386
diff -u -r1.386 curl.h
--- include/curl/curl.h	1 Jun 2009 09:18:15 -0000	1.386
+++ include/curl/curl.h	3 Jun 2009 15:50:51 -0000
@@ -273,6 +273,7 @@
   CURLINFO_DATA_OUT,     /* 4 */
   CURLINFO_SSL_DATA_IN,  /* 5 */
   CURLINFO_SSL_DATA_OUT, /* 6 */
+  CURLINFO_ERROR,        /* 7 */
   CURLINFO_END
 } curl_infotype;
 
Index: docs/libcurl/curl_easy_setopt.3
===================================================================
RCS file: /cvsroot/curl/curl/docs/libcurl/curl_easy_setopt.3,v
retrieving revision 1.260
diff -u -r1.260 curl_easy_setopt.3
--- docs/libcurl/curl_easy_setopt.3	7 May 2009 09:31:24 -0000	1.260
+++ docs/libcurl/curl_easy_setopt.3	3 Jun 2009 16:24:20 -0000
@@ -308,6 +308,8 @@
 .RS
 .IP CURLINFO_TEXT
 The data is informational text.
+.IP CURLINFO_ERROR
+The data is error text.
 .IP CURLINFO_HEADER_IN
 The data is header (or header-like) data received from the peer.
 .IP CURLINFO_HEADER_OUT
Index: docs/examples/debug.c
===================================================================
RCS file: /cvsroot/curl/curl/docs/examples/debug.c,v
retrieving revision 1.4
diff -u -r1.4 debug.c
--- docs/examples/debug.c	22 May 2008 21:20:09 -0000	1.4
+++ docs/examples/debug.c	3 Jun 2009 16:28:43 -0000
@@ -75,6 +75,8 @@
   switch (type) {
   case CURLINFO_TEXT:
     fprintf(stderr, "== Info: %s", data);
+  case CURLINFO_ERROR:
+    fprintf(stderr, "== Error: %s", data);
   default: /* in case a new one is introduced to shock us */
     return 0;
 
Index: docs/examples/multi-debugcallback.c
===================================================================
RCS file: /cvsroot/curl/curl/docs/examples/multi-debugcallback.c,v
retrieving revision 1.4
diff -u -r1.4 multi-debugcallback.c
--- docs/examples/multi-debugcallback.c	22 May 2008 21:20:09 -0000	1.4
+++ docs/examples/multi-debugcallback.c	3 Jun 2009 16:31:14 -0000
@@ -84,6 +84,8 @@
   switch (type) {
   case CURLINFO_TEXT:
     fprintf(stderr, "== Info: %s", data);
+  case CURLINFO_ERROR:
+    fprintf(stderr, "== Error: %s", data);
   default: /* in case a new one is introduced to shock us */
     return 0;
 
Index: tests/libtest/lib552.c
===================================================================
RCS file: /cvsroot/curl/curl/tests/libtest/lib552.c,v
retrieving revision 1.8
diff -u -r1.8 lib552.c
--- tests/libtest/lib552.c	8 May 2009 02:14:50 -0000	1.8
+++ tests/libtest/lib552.c	3 Jun 2009 16:20:59 -0000
@@ -79,6 +79,8 @@
   switch (type) {
   case CURLINFO_TEXT:
     fprintf(stderr, "== Info: %s", (char *)data);
+  case CURLINFO_ERROR:
+    fprintf(stderr, "== Error: %s", (char *)data);
   default: /* in case a new one is introduced to shock us */
     return 0;
 
Index: src/main.c
===================================================================
RCS file: /cvsroot/curl/curl/src/main.c,v
retrieving revision 1.513
diff -u -r1.513 main.c
--- src/main.c	1 May 2009 12:39:40 -0000	1.513
+++ src/main.c	3 Jun 2009 16:14:35 -0000
@@ -3575,6 +3575,7 @@
       traced_data = FALSE;
       break;
     case CURLINFO_TEXT:
+    case CURLINFO_ERROR:
     case CURLINFO_HEADER_IN:
       if(!newl)
         fprintf(output, "%s%s ", timebuf, s_infotype[type]);
@@ -3635,6 +3636,8 @@
   switch (type) {
   case CURLINFO_TEXT:
     fprintf(output, "%s== Info: %s", timebuf, data);
+  case CURLINFO_ERROR:
+    fprintf(output, "%s== Error: %s", timebuf, data);
   default: /* in case a new one is introduced to shock us */
     return 0;
 
Index: lib/sendf.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/sendf.c,v
retrieving revision 1.158
diff -u -r1.158 sendf.c
--- lib/sendf.c	11 May 2009 07:53:38 -0000	1.158
+++ lib/sendf.c	3 Jun 2009 16:11:17 -0000
@@ -183,7 +183,7 @@
       data->state.buffer[len] = '\n';
       data->state.buffer[++len] = '\0';
     }
-    Curl_debug(data, CURLINFO_TEXT, data->state.buffer, len, NULL);
+    Curl_debug(data, CURLINFO_ERROR, data->state.buffer, len, NULL);
   }
 
   va_end(ap);
@@ -586,7 +586,7 @@
                   char *ptr, size_t size)
 {
   static const char s_infotype[CURLINFO_END][3] = {
-    "* ", "< ", "> ", "{ ", "} ", "{ ", "} " };
+    "* ", "< ", "> ", "{ ", "} ", "{ ", "} ", "* " };
 
 #ifdef CURL_DOES_CONVERSIONS
   char buf[BUFSIZE+1];
@@ -634,6 +634,7 @@
 
   switch(type) {
   case CURLINFO_TEXT:
+  case CURLINFO_ERROR:
   case CURLINFO_HEADER_OUT:
   case CURLINFO_HEADER_IN:
     fwrite(s_infotype[type], 2, 1, data->set.err);

***** CVS exited normally with code 1 *****