Skip to content

Commit

Permalink
Merge branch 'MDL-49669_28' of https://github.com/totara/openbadges i…
Browse files Browse the repository at this point in the history
…nto MOODLE_28_STABLE
  • Loading branch information
andrewnicols committed Mar 31, 2015
2 parents ec148b2 + b9aa500 commit a3d579f
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions badges/lib/backpacklib.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,14 @@ public function curl_request($action, $collection = null) {
break;
}

$curl->setHeader(array('Accept: application/json', 'Expect:'));
$options = array(
'FRESH_CONNECT' => true,
'RETURNTRANSFER' => true,
'FORBID_REUSE' => true,
'HEADER' => 0,
'HTTPHEADER' => array('Expect:'),
'CONNECTTIMEOUT' => 3,
'FRESH_CONNECT' => true,
'RETURNTRANSFER' => true,
'FORBID_REUSE' => true,
'HEADER' => 0,
'CONNECTTIMEOUT' => 3,
'CURLOPT_POSTREDIR' => 3
);

if ($action == 'user') {
Expand Down

0 comments on commit a3d579f

Please sign in to comment.