Skip to content

Commit

Permalink
MDL-39207 badges: don't use curl version depedent constant
Browse files Browse the repository at this point in the history
It seems that CURLOPT_CONNECTTIMEOUT_MS is depdendent on the version
of curl compiled against. We don't need milliseconds here anyway, so
switch to the seconds value.
  • Loading branch information
danpoltawski committed May 1, 2013
1 parent 25927c4 commit dd4a197
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion badges/lib/backpacklib.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function curl_request($action, $collection = null) {
'RETURNTRANSFER' => true,
'FORBID_REUSE' => true,
'HEADER' => 0,
'CONNECTTIMEOUT_MS' => 3000,
'CONNECTTIMEOUT' => 3,
);

if ($action == 'user') {
Expand Down
2 changes: 1 addition & 1 deletion lib/badgeslib.php
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,7 @@ function badges_check_backpack_accessibility() {
'FRESH_CONNECT' => true,
'RETURNTRANSFER' => true,
'HEADER' => 0,
'CONNECTTIMEOUT_MS' => 2000,
'CONNECTTIMEOUT' => 2,
);
$location = 'http://backpack.openbadges.org/baker';
$out = $curl->get($location, array('assertion' => $fakeassertion->out(false)), $options);
Expand Down

0 comments on commit dd4a197

Please sign in to comment.