Skip to content

Fix undeclared variables #33

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

Merged
merged 2 commits into from
Jun 12, 2012
Merged

Fix undeclared variables #33

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
922c43c
Fix undeclared variables (found by https://github.com/facebook/hiphop…
vrana Jun 11, 2012
403a109
Don't pass unused argument
vrana Jun 11, 2012
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
6 changes: 3 additions & 3 deletions S3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ public static function getBucket($bucket, $prefix = null, $marker = null, $maxKe
$rest->setParameter('marker', $nextMarker);
if ($delimiter !== null && $delimiter !== '') $rest->setParameter('delimiter', $delimiter);

if (($response = $rest->getResponse(true)) == false || $response->code !== 200) break;
if (($response = $rest->getResponse()) == false || $response->code !== 200) break;

if (isset($response->body, $response->body->Contents))
foreach ($response->body->Contents as $c)
Expand Down Expand Up @@ -728,7 +728,7 @@ public static function setBucketLogging($bucket, $targetBucket, $targetPrefix =
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
if ($rest->error !== false)
{
self::__triggerError(sprintf("S3::setBucketLogging({$bucket}, {$uri}): [%s] %s",
self::__triggerError(sprintf("S3::setBucketLogging({$bucket}, {$targetBucket}): [%s] %s",
$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
}
Expand Down Expand Up @@ -1773,7 +1773,7 @@ public function getResponse()
{
curl_setopt($curl, CURLOPT_PROXY, S3::$proxy['host']);
curl_setopt($curl, CURLOPT_PROXYTYPE, S3::$proxy['type']);
if (isset(S3::$proxy['user'], S3::$proxy['pass']) && $proxy['user'] != null && $proxy['pass'] != null)
if (isset(S3::$proxy['user'], S3::$proxy['pass']) && S3::$proxy['user'] != null && S3::$proxy['pass'] != null)
curl_setopt($curl, CURLOPT_PROXYUSERPWD, sprintf('%s:%s', S3::$proxy['user'], S3::$proxy['pass']));
}

Expand Down