[sword-svn] r2506 - in trunk: examples/classes src/mgr

[scribe at crosswire.org]

Author: scribe
Date: 2010-03-20 04:49:54 -0700 (Sat, 20 Mar 2010)
New Revision: 2506

Modified:
   trunk/examples/classes/Makefile
   trunk/src/mgr/curlftpt.cpp
Log:
applied Karl's patch to fix libcurl problem with status reporter data.


Modified: trunk/examples/classes/Makefile
===================================================================
--- trunk/examples/classes/Makefile	2010-01-26 17:05:08 UTC (rev 2505)
+++ trunk/examples/classes/Makefile	2010-03-20 11:49:54 UTC (rev 2506)
@@ -5,6 +5,6 @@
 	rm $(TARGETS)
 
 .cpp:
-	g++ -O3 `pkg-config --cflags sword` $< -o $@ `pkg-config --libs sword`
+	g++ -O0 -g `pkg-config --cflags sword` $< -o $@ `pkg-config --libs sword`
 
 

Modified: trunk/src/mgr/curlftpt.cpp
===================================================================
--- trunk/src/mgr/curlftpt.cpp	2010-01-26 17:05:08 UTC (rev 2505)
+++ trunk/src/mgr/curlftpt.cpp	2010-03-20 11:49:54 UTC (rev 2506)
@@ -177,6 +177,9 @@
 		res = curl_easy_perform(session);
 		SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n");
 
+		// it seems CURL tries to use this option data later for some reason, so we unset here
+		curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL);
+
 		if(CURLE_OK != res) {
 			retVal = -1;
 		}