summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Watson <davejwatson@fb.com>2016-01-12 22:47:00 (GMT)
committerDave Watson <davejwatson@fb.com>2016-01-12 23:13:14 (GMT)
commitfdbb950495b1f3e000a816f921ed1d97ca4953cb (patch)
treec2522229f56598539cb3bbbfac4964a0b0fe5e39
parent9cb481a73f6d2b518f695a669c1f850e477fdd2c (diff)
downloadjemalloc-fdbb950495b1f3e000a816f921ed1d97ca4953cb.zip
jemalloc-fdbb950495b1f3e000a816f921ed1d97ca4953cb.tar.gz
jemalloc-fdbb950495b1f3e000a816f921ed1d97ca4953cb.tar.bz2
Don't discard curl options if timeout is not defined.
Merge of https://github.com/gperftools/gperftools/commit/5078abdb331e63d7a216994f186eb736861f8df7
-rw-r--r--bin/jeprof.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/jeprof.in b/bin/jeprof.in
index 444041e..a2402f4 100644
--- a/bin/jeprof.in
+++ b/bin/jeprof.in
@@ -3339,7 +3339,7 @@ sub ResolveRedirectionForCurl {
# Add a timeout flat to URL_FETCHER. Returns a new list.
sub AddFetchTimeout {
my $timeout = shift;
- my @fetcher = shift;
+ my @fetcher = @_;
if (defined($timeout)) {
if (join(" ", @fetcher) =~ m/\bcurl -s/) {
push(@fetcher, "--max-time", sprintf("%d", $timeout));