Merge branch 'master' of github.com:jedisct1/dnscrypt-proxy

dnscrypt-proxy/sources_test.go

@@ -264,7 +264,7 @@ func setupSourceTest(t *testing.T) (func(), *SourceTestData) {
 		"no-urls":              {},
 	}
 	d.xTransport.rebuildTransport()
-	d.timeNow = time.Now().AddDate(0, 0, 0)
+	d.timeNow = time.Now().AddDate(0, 0, 0).Truncate(time.Second)
 	d.timeOld = d.timeNow.Add(DefaultPrefetchDelay * -4)
 	d.timeUpd = d.timeNow.Add(DefaultPrefetchDelay)
 	timeNow = func() time.Time { return d.timeNow } // originally defined in sources.go, replaced during testing to ensure consistent results

windows/service-install.bat

@@ -1,35 +1,35 @@
-@set @_cmd=1 /*
-@echo off
-setlocal EnableExtensions
-title DNSCrypt-Proxy
-
-whoami /groups | findstr "S-1-16-12288" >nul && goto :admin
-if "%~1"=="RunAsAdmin" goto :error
-
-echo Requesting privileges elevation for managing the dnscrypt-proxy service . . .
-cscript /nologo /e:javascript "%~f0" || goto :error
-exit /b
-
-:error
-echo.
-echo Error: Administrator privileges elevation failed,
-echo        please manually run this script as administrator.
-echo.
-goto :end
-
-:admin
-pushd "%~dp0"
-dnscrypt-proxy.exe -service install
-dnscrypt-proxy.exe -service start
-popd
-echo.
-echo Thank you for using DNSCrypt-Proxy!
-
-:end
-set /p =Press [Enter] to exit . . .
-exit /b */
-
-// JScript, restart batch script as administrator
-var objShell = WScript.CreateObject('Shell.Application');
-var ComSpec = WScript.CreateObject('WScript.Shell').ExpandEnvironmentStrings('%ComSpec%');
-objShell.ShellExecute(ComSpec, '/c ""' + WScript.ScriptFullName + '" RunAsAdmin"', '', 'runas', 1);
+@set @_cmd=1 /*
+@echo off
+setlocal EnableExtensions
+title DNSCrypt-Proxy
+
+whoami /groups | findstr "S-1-16-12288" >nul && goto :admin
+if "%~1"=="RunAsAdmin" goto :error
+
+echo Requesting privileges elevation for managing the dnscrypt-proxy service . . .
+cscript /nologo /e:javascript "%~f0" || goto :error
+exit /b
+
+:error
+echo.
+echo Error: Administrator privileges elevation failed,
+echo        please manually run this script as administrator.
+echo.
+goto :end
+
+:admin
+pushd "%~dp0"
+dnscrypt-proxy.exe -service install
+dnscrypt-proxy.exe -service start
+popd
+echo.
+echo Thank you for using DNSCrypt-Proxy!
+
+:end
+set /p =Press [Enter] to exit . . .
+exit /b */
+
+// JScript, restart batch script as administrator
+var objShell = WScript.CreateObject('Shell.Application');
+var ComSpec = WScript.CreateObject('WScript.Shell').ExpandEnvironmentStrings('%ComSpec%');
+objShell.ShellExecute(ComSpec, '/c ""' + WScript.ScriptFullName + '" RunAsAdmin"', '', 'runas', 1);

windows/service-restart.bat

@@ -1,35 +1,35 @@
-@set @_cmd=1 /*
-@echo off
-setlocal EnableExtensions
-title DNSCrypt-Proxy
-
-whoami /groups | findstr "S-1-16-12288" >nul && goto :admin
-if "%~1"=="RunAsAdmin" goto :error
-
-echo Requesting privileges elevation for managing the dnscrypt-proxy service . . .
-cscript /nologo /e:javascript "%~f0" || goto :error
-exit /b
-
-:error
-echo.
-echo Error: Administrator privileges elevation failed,
-echo        please manually run this script as administrator.
-echo.
-goto :end
-
-:admin
-pushd "%~dp0"
-dnscrypt-proxy.exe -service stop
-dnscrypt-proxy.exe -service start
-popd
-echo.
-echo Thank you for using DNSCrypt-Proxy!
-
-:end
-set /p =Press [Enter] to exit . . .
-exit /b */
-
-// JScript, restart batch script as administrator
-var objShell = WScript.CreateObject('Shell.Application');
-var ComSpec = WScript.CreateObject('WScript.Shell').ExpandEnvironmentStrings('%ComSpec%');
-objShell.ShellExecute(ComSpec, '/c ""' + WScript.ScriptFullName + '" RunAsAdmin"', '', 'runas', 1);
+@set @_cmd=1 /*
+@echo off
+setlocal EnableExtensions
+title DNSCrypt-Proxy
+
+whoami /groups | findstr "S-1-16-12288" >nul && goto :admin
+if "%~1"=="RunAsAdmin" goto :error
+
+echo Requesting privileges elevation for managing the dnscrypt-proxy service . . .
+cscript /nologo /e:javascript "%~f0" || goto :error
+exit /b
+
+:error
+echo.
+echo Error: Administrator privileges elevation failed,
+echo        please manually run this script as administrator.
+echo.
+goto :end
+
+:admin
+pushd "%~dp0"
+dnscrypt-proxy.exe -service stop
+dnscrypt-proxy.exe -service start
+popd
+echo.
+echo Thank you for using DNSCrypt-Proxy!
+
+:end
+set /p =Press [Enter] to exit . . .
+exit /b */
+
+// JScript, restart batch script as administrator
+var objShell = WScript.CreateObject('Shell.Application');
+var ComSpec = WScript.CreateObject('WScript.Shell').ExpandEnvironmentStrings('%ComSpec%');
+objShell.ShellExecute(ComSpec, '/c ""' + WScript.ScriptFullName + '" RunAsAdmin"', '', 'runas', 1);

windows/service-uninstall.bat

@@ -1,35 +1,35 @@
-@set @_cmd=1 /*
-@echo off
-setlocal EnableExtensions
-title DNSCrypt-Proxy
-
-whoami /groups | findstr "S-1-16-12288" >nul && goto :admin
-if "%~1"=="RunAsAdmin" goto :error
-
-echo Requesting privileges elevation for managing the dnscrypt-proxy service . . .
-cscript /nologo /e:javascript "%~f0" || goto :error
-exit /b
-
-:error
-echo.
-echo Error: Administrator privileges elevation failed,
-echo        please manually run this script as administrator.
-echo.
-goto :end
-
-:admin
-pushd "%~dp0"
-dnscrypt-proxy.exe -service stop
-dnscrypt-proxy.exe -service uninstall
-popd
-echo.
-echo Thank you for using DNSCrypt-Proxy!
-
-:end
-set /p =Press [Enter] to exit . . .
-exit /b */
-
-// JScript, restart batch script as administrator
-var objShell = WScript.CreateObject('Shell.Application');
-var ComSpec = WScript.CreateObject('WScript.Shell').ExpandEnvironmentStrings('%ComSpec%');
-objShell.ShellExecute(ComSpec, '/c ""' + WScript.ScriptFullName + '" RunAsAdmin"', '', 'runas', 1);
+@set @_cmd=1 /*
+@echo off
+setlocal EnableExtensions
+title DNSCrypt-Proxy
+
+whoami /groups | findstr "S-1-16-12288" >nul && goto :admin
+if "%~1"=="RunAsAdmin" goto :error
+
+echo Requesting privileges elevation for managing the dnscrypt-proxy service . . .
+cscript /nologo /e:javascript "%~f0" || goto :error
+exit /b
+
+:error
+echo.
+echo Error: Administrator privileges elevation failed,
+echo        please manually run this script as administrator.
+echo.
+goto :end
+
+:admin
+pushd "%~dp0"
+dnscrypt-proxy.exe -service stop
+dnscrypt-proxy.exe -service uninstall
+popd
+echo.
+echo Thank you for using DNSCrypt-Proxy!
+
+:end
+set /p =Press [Enter] to exit . . .
+exit /b */
+
+// JScript, restart batch script as administrator
+var objShell = WScript.CreateObject('Shell.Application');
+var ComSpec = WScript.CreateObject('WScript.Shell').ExpandEnvironmentStrings('%ComSpec%');
+objShell.ShellExecute(ComSpec, '/c ""' + WScript.ScriptFullName + '" RunAsAdmin"', '', 'runas', 1);