Skip to content

Fix the assumption that libcurl returns response headers in title case. #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
d-ph wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix the assumption that libcurl returns response headers in title case. #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/Postmen/Postmen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function buildCurlParams($method, $path, $config = array()) {
CURLOPT_URL => $url,
CURLOPT_CUSTOMREQUEST => $method,
CURLOPT_HTTPHEADER => $headers,
CURLOPT_HEADER => true
CURLOPT_HEADER => true
);
$proxy = $parameters['proxy'];
if (count($proxy) > 0) {
Expand Down Expand Up @@ -128,16 +128,16 @@ public function call($method, $path, $config = array()) {
$response_headers_array = array();
foreach (explode("\r\n", $response_headers) as $line) {
list($key, $value) = array_pad(explode(': ', $line, 2), 2, null);
$response_headers_array[$key] = $value;
$response_headers_array[strtolower($key)] = $value;
}
$headers_date = $response_headers_array['Date'];
$headers_date = $response_headers_array['date'];
$calls_left = 0;
if (isset($response_headers_array['X-RateLimit-Remaining'])) {
$calls_left = (int)$response_headers_array['X-RateLimit-Remaining'];
if (isset($response_headers_array['x-ratelimit-remaining'])) {
$calls_left = (int)$response_headers_array['x-ratelimit-remaining'];
}
$reset = 0;
if (isset($response_headers_array['X-RateLimit-Reset'])) {
$reset = (int)(((int)$response_headers_array['X-RateLimit-Reset']) / 1000);
if (isset($response_headers_array['x-ratelimit-reset'])) {
$reset = (int)(((int)$response_headers_array['x-ratelimit-reset']) / 1000);
}
// convert headers date to timestamp, please refer to
// https://tools.ietf.org/html/rfc7231#section-7.1.1.1
Expand Down Expand Up @@ -186,7 +186,7 @@ public function handleError($err_message, $err_code, $err_retryable, $err_detail

public function handle($parsed, $parameters) {
if ($parsed->meta->code != 200) {
$err_code = 0;
$err_code = 0;
$err_message = 'Postmen server side error occured';
$err_details = array();
$err_retryable = false;
Expand Down Expand Up @@ -257,7 +257,7 @@ public function generateURL($url, $path, $method, $query) {
if (strlen($qr) > 0) {
return $url . $path . '?' . $qr;
}
}
}
}
return $url . $path;
}
Expand Down