|
@@ -388,10 +388,10 @@ discard block |
|
|
block discarded – undo |
|
388
|
388
|
foreach ($options as $i => $option) { |
|
389
|
389
|
if (strpos($option, '--http1.1') === 0) { |
|
390
|
390
|
$requestOpts['protocol_version'] = 1.1; |
|
391
|
|
- } elseif (strpos($option, '--connect-timeout') === 0 && isset($options[$i+1]) && is_numeric($options[$i+1])) { |
|
392
|
|
- $requestOpts['connect_timeout'] = (int) $options[$i+1]; |
|
393
|
|
- } elseif (strpos($option, '--max-time') === 0 && isset($options[$i+1]) && is_numeric($options[$i+1])) { |
|
394
|
|
- $requestOpts['timeout'] = (int) $options[$i+1]; |
|
|
391
|
+ } elseif (strpos($option, '--connect-timeout') === 0 && isset($options[$i + 1]) && is_numeric($options[$i + 1])) { |
|
|
392
|
+ $requestOpts['connect_timeout'] = (int) $options[$i + 1]; |
|
|
393
|
+ } elseif (strpos($option, '--max-time') === 0 && isset($options[$i + 1]) && is_numeric($options[$i + 1])) { |
|
|
394
|
+ $requestOpts['timeout'] = (int) $options[$i + 1]; |
|
395
|
395
|
} |
|
396
|
396
|
} |
|
397
|
397
|
} |
|
@@ -408,7 +408,7 @@ discard block |
|
|
block discarded – undo |
|
408
|
408
|
$hooks = new Hooks(); |
|
409
|
409
|
|
|
410
|
410
|
// Register a progress callback |
|
411
|
|
- $hooks->register('request.progress', function($data, $bytes_so_far, $bytes_limit) use ($progress) { |
|
|
411
|
+ $hooks->register('request.progress', function ($data, $bytes_so_far, $bytes_limit) use ($progress) { |
|
412
|
412
|
if ($progress->getMaxSteps() > 0) { |
|
413
|
413
|
$progress->setProgress($bytes_so_far); |
|
414
|
414
|
} |
Please login to merge, or discard this patch.