aboutsummaryrefslogtreecommitdiff
path: root/lib/url.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/url.c')
-rw-r--r--lib/url.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/url.c b/lib/url.c
index e42ce9aed..cd1854328 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -752,7 +752,11 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...)
* Progress callback function
*/
data->set.fprogress = va_arg(param, curl_progress_callback);
- data->progress.callback = TRUE; /* no longer internal */
+ if(data->set.fprogress)
+ data->progress.callback = TRUE; /* no longer internal */
+ else
+ data->progress.callback = FALSE; /* NULL enforces internal */
+
break;
case CURLOPT_PROGRESSDATA:
/*