Skip to content

Commit

Permalink
Merge pull request #21 from tschelabaumann/tschelabaumann-remove-ca-info
Browse files Browse the repository at this point in the history
Remove certificate binding
  • Loading branch information
mschindler83 authored May 23, 2017
2 parents e8bf15d + fcf26b5 commit e969eea
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 30 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 2.1.1 - 2017-05-23
* Remove CURLOPT_CAINFO - path to Certificate Authority (CA) bundle
* Remove paymill.crt
* Change user agent info to "Paymill-Prestashop/2.1.1"

## 2.1.0 - 2014-10-01
* added compatibility for EU-Legal(https://github.com/EU-Legal/modules)
* added refund within shop-administration
Expand Down Expand Up @@ -69,4 +74,4 @@
* Added Feature: Backend-log

## 1.0.0 - 2013-03-14
* initial Version
* initial Version
7 changes: 3 additions & 4 deletions paymill/v2/lib/Services/Paymill/Apiclient/Curl.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Services_Paymill_Apiclient_Curl implements Services_Paymill_Apiclient_Inte
*/
private $_apiUrl = '/';

const USER_AGENT = 'Paymill-php/0.0.2';
const USER_AGENT = 'Paymill-Prestashop/2.1.1';

public static $lastRawResponse;
public static $lastRawCurlOptions;
Expand Down Expand Up @@ -123,8 +123,7 @@ protected function _requestApi($action = '', $params = array(), $method = 'POST'
CURLOPT_RETURNTRANSFER => true,
CURLOPT_CUSTOMREQUEST => $method,
CURLOPT_USERAGENT => self::USER_AGENT,
CURLOPT_SSL_VERIFYPEER => true,
CURLOPT_CAINFO => realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'paymill.crt',
CURLOPT_SSL_VERIFYPEER => true
);

if (Services_Paymill_Apiclient_Interface::HTTP_GET === $method) {
Expand Down Expand Up @@ -174,4 +173,4 @@ public function getResponse()
return $this->_responseArray;
}

}
}
25 changes: 0 additions & 25 deletions paymill/v2/lib/Services/Paymill/Apiclient/paymill.crt

This file was deleted.

0 comments on commit e969eea

Please sign in to comment.