Index: docs/examples/hiperfifo.c
===================================================================
RCS file: /cvsroot/curl/curl/docs/examples/hiperfifo.c,v
retrieving revision 1.7
diff -u -r1.7 hiperfifo.c
--- docs/examples/hiperfifo.c	22 May 2008 21:20:09 -0000	1.7
+++ docs/examples/hiperfifo.c	1 Jun 2008 20:13:33 -0000
@@ -118,12 +118,14 @@
       case     CURLM_INTERNAL_ERROR:     s="CURLM_INTERNAL_ERROR";     break;
       case     CURLM_UNKNOWN_OPTION:     s="CURLM_UNKNOWN_OPTION";     break;
       case     CURLM_LAST:               s="CURLM_LAST";               break;
+      case     CURLM_BAD_SOCKET:         s="CULRM_BAD_SOCKET";         break;
       default: s="CURLM_unknown";
         break;
-    case     CURLM_BAD_SOCKET:         s="CURLM_BAD_SOCKET";
+	/* case     CURLM_BAD_SOCKET:         s="CURLM_BAD_SOCKET";
       fprintf(MSG_OUT, "ERROR: %s returns %s\n", where, s);
-      /* ignore this error */
-      return;
+       ignore this error 
+      return;*/
+      
     }
     fprintf(MSG_OUT, "ERROR: %s returns %s\n", where, s);
     exit(code);
@@ -181,8 +183,10 @@
   GlobalInfo *g = (GlobalInfo*) userp;
   CURLMcode rc;
   (void)kind; /* unused */
+  fprintf(MSG_OUT, "entering event_cb\n");
 
   do {
+    fprintf(MSG_OUT, "calling curl_multi_socket with fd=%d\n", fd);
     rc = curl_multi_socket(g->multi, fd, &g->still_running);
   } while (rc == CURLM_CALL_MULTI_PERFORM);
   mcode_or_die("event_cb: curl_multi_socket", rc);
@@ -330,8 +334,8 @@
   curl_easy_setopt(conn->easy, CURLOPT_VERBOSE, 1L);
   curl_easy_setopt(conn->easy, CURLOPT_ERRORBUFFER, conn->error);
   curl_easy_setopt(conn->easy, CURLOPT_PRIVATE, conn);
-  curl_easy_setopt(conn->easy, CURLOPT_NOPROGRESS, 0L);
-  curl_easy_setopt(conn->easy, CURLOPT_PROGRESSFUNCTION, prog_cb);
+  curl_easy_setopt(conn->easy, CURLOPT_NOPROGRESS, 1L);
+  /*  curl_easy_setopt(conn->easy, CURLOPT_PROGRESSFUNCTION, prog_cb);*/
   curl_easy_setopt(conn->easy, CURLOPT_PROGRESSDATA, conn);
   fprintf(MSG_OUT,
           "Adding easy %p to multi %p (%s)\n", conn->easy, g->multi, url);
Index: lib/multi.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/multi.c,v
retrieving revision 1.172
diff -u -r1.172 multi.c
--- lib/multi.c	28 May 2008 20:56:19 -0000	1.172
+++ lib/multi.c	1 Jun 2008 20:13:33 -0000
@@ -194,7 +194,6 @@
 static bool isHandleAtHead(struct SessionHandle *handle,
                            struct curl_llist *pipeline);
 
-#ifdef CURLDEBUG
 static const char * const statename[]={
   "INIT",
   "CONNECT",
@@ -215,14 +214,12 @@
 };
 
 void curl_multi_dump(CURLM *multi_handle);
-#endif
+
 
 /* always use this function to change state, to make debugging easier */
 static void multistate(struct Curl_one_easy *easy, CURLMstate state)
 {
-#ifdef CURLDEBUG
   long connectindex = -5000;
-#endif
   CURLMstate oldstate = easy->state;
 
   if(oldstate == state)
@@ -231,16 +228,14 @@
 
   easy->state = state;
 
-#ifdef CURLDEBUG
   if(easy->state > CURLM_STATE_CONNECT &&
      easy->state < CURLM_STATE_COMPLETED)
     connectindex = easy->easy_conn->connectindex;
 
-  infof(easy->easy_handle,
-        "STATE: %s => %s handle %p; (connection #%ld) \n",
+  printf("STATE: %s => %s handle %p; (connection #%ld) \n",
         statename[oldstate], statename[easy->state],
         (char *)easy, connectindex);
-#endif
+
   if(state == CURLM_STATE_COMPLETED)
     /* changing to COMPLETED means there's one less easy handle 'alive' */
     easy->easy_handle->multi->num_alive--;
@@ -1739,7 +1734,7 @@
          the application actions even though the socket was just previously
          asked to get removed, so thus we better survive stray socket actions
          and just move on. */
-      ;
+      return CURLM_BAD_SOCKET; /* better return code? */
     else {
       data = entry->easy;