nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[net] drop the requirement for text/plain MIME on the .ver files

Browse source 
* This should fix the update check when picking off the .ver off github
* Also update non working links
* Closes #1229
This commit is contained in:
Pete Batard 2018-10-16 21:51:40 +01:00
parent e587997f4e
commit bc6e23ec11
6 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -19,7 +19,7 @@ Features
* Compute MD5, SHA-1 and SHA-256 checksums of the selected image
* Twice as fast as Microsoft's USB/DVD tool or UNetbootin, on ISO -> USB creation <sup>(1)</sup>
* Perform bad blocks checks, including detection of "fake" flash drives
* Modern and familiar UI, with [39 languages natively supported](https://rufus.akeo.ie/translations)
* Modern and familiar UI, with [39 languages natively supported](https://github.com/pbatard/rufus/wiki/FAQ#What_languages_are_natively_supported_by_Rufus)
* Small footprint. No installation required.
* Portable
* 100% [Free Software](http://www.gnu.org/philosophy/free-sw.en.html) ([GPL v3](http://www.gnu.org/licenses/gpl-3.0.en.html))
@ -42,8 +42,8 @@ Additional information
Rufus provides extensive information about what it is doing, either through
its easily accessible log, or through the Windows debug facility.
* [Official Website](https://rufus.akeo.ie)
* [FAQ](https://rufus.akeo.ie/FAQ)
* [Official Website](https://rufus.ie)
* [FAQ](https://github.com/pbatard/rufus/wiki/FAQ)
Enhancements/Bugs
-----------------

3
src/icon.c
View file

@ -171,8 +171,7 @@ BOOL SetAutorun(const char* path)
fd = fopen(filename, "w, ccs=UTF-16LE");
if (fd == NULL) {
uprintf("Unable to create %s", filename);
uprintf("NOTE: This may be caused by a poorly designed security solution. "
"See https://rufus.akeo.ie/compatibility.");
uprintf("NOTE: This may be caused by a poorly designed security solution. See https://goo.gl/QTobxX.");
return FALSE;
}

2
src/iso.c
View file

@ -92,7 +92,7 @@ static const char* kolibri_name = "kolibri.img";
static const char* autorun_name = "autorun.inf";
static const char* casper_name = "CASPER";
static const char* stupid_antivirus = " NOTE: This is usually caused by a poorly designed security solution. "
"See https://rufus.akeo.ie/compatibility.\r\n This file will be skipped for now, but you should really "
"See https://goo.gl/QTobxX.\r\n This file will be skipped for now, but you should really "
"look into using a *SMARTER* antivirus solution.";
const char* old_c32_name[NB_OLD_C32] = OLD_C32_NAMES;
static const int64_t old_c32_threshold[NB_OLD_C32] = OLD_C32_THRESHOLD;

1
src/license.h
View file

@ -38,7 +38,6 @@ const char* additional_copyrights =
"Used with kind authorization\\line\n"
"\\line\n"
"Rufus icon by PC Unleashed:\\line\n"
"http://pcunleashed.com\\line\n"
"Freeware\\line\n"
"\\line\n"
"Additional icons courtesy of Axialis Software:\\line\n"

12
src/net.c
View file

@ -537,7 +537,7 @@ static DWORD WINAPI CheckForUpdatesThread(LPVOID param)
DWORD dwFlags, dwSize, dwDownloaded, dwTotalSize, dwStatus;
BYTE *sig = NULL;
char* buf = NULL;
char agent[64], hostname[64], urlpath[128], sigpath[256], mime[32];
char agent[64], hostname[64], urlpath[128], sigpath[256];
OSVERSIONINFOA os_version = {sizeof(OSVERSIONINFOA), 0, 0, 0, 0, ""};
HINTERNET hSession = NULL, hConnection = NULL, hRequest = NULL;
URL_COMPONENTSA UrlParts = {sizeof(URL_COMPONENTSA), NULL, 1, (INTERNET_SCHEME)0,
@ -680,15 +680,7 @@ static DWORD WINAPI CheckForUpdatesThread(LPVOID param)
}
vuprintf("Found match for %s on server %s", urlpath, server_url);
// IMPORTANT: You might need to edit your server's MIME conf so that it returns
// 'text/plain' for .ver files. Use 'curl -I' to check that you get something
// like 'Content-Type: text/plain; charset=UTF-8' when fetching your .ver files.
dwSize = sizeof(mime);
pfHttpQueryInfoA(hRequest, HTTP_QUERY_CONTENT_TYPE, (LPVOID)&mime, &dwSize, NULL);
if (strncmp(mime, "text/plain", sizeof("text/plain")-1) != 0)
goto out;
// We also get a date from Apache, which we'll use to avoid out of sync check,
// We also get a date from the web server, which we'll use to avoid out of sync check,
// in case some set their clock way into the future and back.
// On the other hand, if local clock is set way back in the past, we will never check.
dwSize = sizeof(ServerTime);

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.4.1407"
CAPTION "Rufus 3.4.1408"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -392,8 +392,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,4,1407,0
PRODUCTVERSION 3,4,1407,0
FILEVERSION 3,4,1408,0
PRODUCTVERSION 3,4,1408,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -411,13 +411,13 @@ BEGIN
VALUE "Comments", "https://akeo.ie"
VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.4.1407"
VALUE "FileVersion", "3.4.1408"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus-3.4.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.4.1407"
VALUE "ProductVersion", "3.4.1408"
END
END
BLOCK "VarFileInfo"