Compare commits

...

6 Commits

5 changed files with 28 additions and 6 deletions

View File

@ -50,8 +50,12 @@ function uupApiPrivateGetLatestBuild() {
return $build;
}
function uupApiPrivateGetAcceptableBranches() {
return [
function uupApiPrivateIsAcceptableBranch($branch) {
if(!uupApiConfigIsTrue('production_mode')) {
return true;
}
$branches = [
'auto',
'rs2_release',
'rs3_release',
@ -66,8 +70,11 @@ function uupApiPrivateGetAcceptableBranches() {
'ni_release',
'zn_release',
'ge_release',
'ge_prerelease',
'rs_prerelease',
];
return in_array($branch, $branches);
}
function uupApiPrivateNormalizeFetchParams($params) {
@ -173,7 +180,7 @@ function uupFetchUpd2($params, $cacheRequests = 0) {
return array('error' => 'ILLEGAL_MINOR');
}
if(!in_array($branch, uupApiPrivateGetAcceptableBranches()))
if(!uupApiPrivateIsAcceptableBranch($branch))
$branch = 'auto';
if($ring == 'DEV') $ring = 'WIF';

View File

@ -35,6 +35,10 @@ class UupDumpCache {
}
public function get() {
if(!uupApiConfigIsTrue('production_mode')) {
return false;
}
$cacheFile = $this->cacheFile;
if(!file_exists($cacheFile)) {
@ -58,6 +62,10 @@ class UupDumpCache {
}
public function put($content, $validity) {
if(!uupApiConfigIsTrue('production_mode')) {
return false;
}
$cacheFile = $this->cacheFile;
$expires = $validity ? time() + $validity : false;

View File

@ -16,7 +16,7 @@ limitations under the License.
*/
function uupApiVersion() {
return '1.47.4';
return '1.49.0';
}
require_once dirname(__FILE__).'/auths.php';

View File

@ -298,6 +298,7 @@ function branchFromBuild($build) {
case 22621:
case 22631:
case 22635:
$branch = 'ni_release';
break;
@ -306,6 +307,8 @@ function branchFromBuild($build) {
break;
case 26100:
case 26120:
case 26200:
$branch = 'ge_release';
break;

View File

@ -64,8 +64,12 @@ function sendWuPostRequestInternal($url, $postData, $saveCookie = true) {
curl_setopt($req, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($req, CURLOPT_ENCODING, '');
curl_setopt($req, CURLOPT_POSTFIELDS, $postData);
curl_setopt($req, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($req, CURLOPT_TIMEOUT, 15);
if(uupApiConfigIsTrue('production_mode')) {
curl_setopt($req, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($req, CURLOPT_TIMEOUT, 15);
}
curl_setopt($req, CURLOPT_SSL_VERIFYPEER, 0);
curl_setopt($req, CURLOPT_HTTPHEADER, array(
'User-Agent: Windows-Update-Agent/10.0.10011.16384 Client-Protocol/2.50',