rooty/yubikey-val
1
0
Fork 0
mirror of https://github.com/Yubico/yubikey-val.git synced 2025-04-09 20:53:50 +02:00
Code Issues Projects Releases Wiki Activity

Cosmetic changes.

Browse Source
This commit is contained in:
Jean Paul Galea 2015-07-17 21:57:16 +02:00
parent 890a446063
commit 0bbb2e2a5e
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ykval-common.php
View File

@ -177,43 +177,47 @@ function retrieveURLasync($ident, $urls, $logger, $ans_req=1, $match="^OK", $ret
{ {
$str = curl_multi_getcontent($info['handle']); $str = curl_multi_getcontent($info['handle']);
$logger->log(LOG_DEBUG, $ident . " curl multi content : " . $str); $logger->log(LOG_DEBUG, $ident . " curl multi content : " . $str);
if (preg_match("/".$match."/", $str)) {
if (preg_match("/".$match."/", $str))
{
$logger->log(LOG_DEBUG, $ident . " response matches " . $match); $logger->log(LOG_DEBUG, $ident . " response matches " . $match);
$error = curl_error ($info['handle']); $error = curl_error($info['handle']);
$errno = curl_errno ($info['handle']); $errno = curl_errno($info['handle']);
$cinfo = curl_getinfo ($info['handle']); $cinfo = curl_getinfo($info['handle']);
$logger->log(LOG_INFO, $ident . " errno/error: " . $errno . "/" . $error, $cinfo); $logger->log(LOG_INFO, $ident . " errno/error: " . $errno . "/" . $error, $cinfo);
$ans_count++; $ans_count++;
if ($returl) $ans_arr[]="url=" . $cinfo['url'] . "\n" . $str; if ($returl) $ans_arr[]="url=" . $cinfo['url'] . "\n" . $str;
else $ans_arr[]=$str; else $ans_arr[]=$str;
} }
if ($ans_count >= $ans_req) { if ($ans_count >= $ans_req)
foreach ($ch as $h) { {
curl_multi_remove_handle ($mh, $h); foreach ($ch as $h)
curl_close ($h); {
curl_multi_remove_handle($mh, $h);
curl_close($h);
} }
curl_multi_close ($mh); curl_multi_close($mh);
return $ans_arr; return $ans_arr;
} }
curl_multi_remove_handle ($mh, $info['handle']); curl_multi_remove_handle($mh, $info['handle']);
curl_close ($info['handle']); curl_close($info['handle']);
unset ($ch[$info['handle']]); unset($ch[$info['handle']]);
} }
curl_multi_select ($mh); curl_multi_select($mh);
} }
} }
while($active); while($active);
foreach ($ch as $h) foreach ($ch as $h)
{ {
curl_multi_remove_handle ($mh, $h); curl_multi_remove_handle($mh, $h);
curl_close ($h); curl_close($h);
} }
curl_multi_close ($mh); curl_multi_close($mh);
if ($ans_count>0) return $ans_arr; if ($ans_count>0) return $ans_arr;
return $str; return $str;