diff --git a/masterserver/web/server/index.php b/masterserver/web/server/index.php index a3cd250f8..405988c9d 100644 --- a/masterserver/web/server/index.php +++ b/masterserver/web/server/index.php @@ -140,6 +140,17 @@ if ($link && $db) { $version = $row['new_version']; if ($version) { $message .= 'Version=' . $version . PHP_EOL; + // strip build version from client request + $n = 0; + for($i=0;$i=3){ + break; + } + } + } + $client_version = substr($client_version,0,$i); if (version_compare($client_version, $version) < 0) { //We need to update $result = mysql_query('SELECT `file` FROM `' . $prefix . 'update` WHERE `old_version` = \'' . $client_version . '\' AND `platform` = \'' . $platform . '\''); $row = mysql_fetch_assoc($result); diff --git a/src/gui/C4UpdateDlg.cpp b/src/gui/C4UpdateDlg.cpp index 5e78de234..d4b3f1f23 100644 --- a/src/gui/C4UpdateDlg.cpp +++ b/src/gui/C4UpdateDlg.cpp @@ -317,7 +317,7 @@ bool C4UpdateDlg::CheckForUpdates(C4GUI::Screen *pScreen, bool fAutomatic) C4Network2UpdateClient UpdateClient; bool fSuccess = false, fAborted = false; - StdStrBuf strVersion; strVersion.Format("%d.%d.%d.%d", C4XVER1, C4XVER2, C4XVER3, C4XVER4); + StdStrBuf strVersion; strVersion.Format("%d.%d.%d", C4XVER1, C4XVER2, C4XVER3); StdStrBuf strQuery; strQuery.Format("%s?version=%s&platform=%s&action=version", Config.Network.UpdateServerAddress, strVersion.getData(), C4_OS); if (UpdateClient.Init() && UpdateClient.SetServer(strQuery.getData()) && UpdateClient.QueryUpdateURL()) {