Permalink
Browse files

MDL-39207 badges: don't use curl version depedent constant

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 dd4a197e0f0da283ef40cc08b0808e586fcf7294
Showing with 2 additions and 2 deletions.
  1. +1 −1 badges/lib/backpacklib.php
  2. +1 −1 lib/badgeslib.php
@@ -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') {
View
@@ -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);

0 comments on commit dd4a197

Please sign in to comment.