diff --git a/fetchupd.php b/fetchupd.php index b6ac7a0..fa88293 100644 --- a/fetchupd.php +++ b/fetchupd.php @@ -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', @@ -68,6 +72,8 @@ function uupApiPrivateGetAcceptableBranches() { 'ge_release', 'rs_prerelease', ]; + + return in_array($branch, $branches); } function uupApiPrivateNormalizeFetchParams($params) { @@ -173,7 +179,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'; diff --git a/shared/cache.php b/shared/cache.php index dcb9797..f875b63 100644 --- a/shared/cache.php +++ b/shared/cache.php @@ -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; diff --git a/shared/main.php b/shared/main.php index 474fae6..09c3a48 100644 --- a/shared/main.php +++ b/shared/main.php @@ -16,7 +16,7 @@ limitations under the License. */ function uupApiVersion() { - return '1.48.0'; + return '1.49.0-dev'; } require_once dirname(__FILE__).'/auths.php'; diff --git a/shared/utils.php b/shared/utils.php index 605e3d3..3e43e2c 100644 --- a/shared/utils.php +++ b/shared/utils.php @@ -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',