[118718] trunk/base/src/pextlib1.0/curl.c

[cal at macports.org]

Revision: 118718
          https://trac.macports.org/changeset/118718
Author:   cal at macports.org
Date:     2014-04-08 17:52:53 -0700 (Tue, 08 Apr 2014)
Log Message:
-----------
base: attempt to fix a test failure on SL

Modified Paths:
--------------
    trunk/base/src/pextlib1.0/curl.c

Modified: trunk/base/src/pextlib1.0/curl.c
===================================================================
--- trunk/base/src/pextlib1.0/curl.c	2014-04-09 00:44:31 UTC (rev 118717)
+++ trunk/base/src/pextlib1.0/curl.c	2014-04-09 00:52:53 UTC (rev 118718)
@@ -580,13 +580,7 @@
 			break;
 		}
 		
-		if (info->msg != CURLMSG_DONE) {
-			Tcl_SetResult(interp, "curl_multi_info_read() returned an unexpected value", TCL_STATIC);
-			theResult = TCL_ERROR;
-			break;
-		}
-
-		if (info->data.result != CURLE_OK) {
+		if (info->msg != CURLMSG_DONE || info->data.result != CURLE_OK) {
 			/* execution failed, use the error string */
 			Tcl_SetResult(interp, theErrorString, TCL_VOLATILE);
 			theResult = TCL_ERROR;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140408/4effd23c/attachment.html>