Skip to content
Snippets Groups Projects
Unverified Commit a6ecf8d4 authored by psychocrypt's avatar psychocrypt Committed by GitHub
Browse files

Merge pull request #1860 from Spudz76/dev-spellfix248

spelling+typo touch-ups
parents 91aa3794 b926a476
No related branches found
No related tags found
No related merge requests found
......@@ -70,7 +70,7 @@ public:
{
conf += std::string(" { \"low_power_mode\" : ");
conf += std::string((id & 0x8000000) != 0 ? "true" : "false");
conf += std::string(", \"no_prefetch\" : true, \"asm\" : \"off\", \"affine_to_cpu\" : ");
conf += std::string(", \"no_prefetch\" : true, \"asm\" : \"off\", \"affine_to_cpu\" : ");
conf += std::to_string(id & 0x7FFFFFF);
conf += std::string(" },\n");
}
......@@ -78,7 +78,8 @@ public:
catch(const std::runtime_error& err)
{
// \todo add fallback to default auto adjust
conf += std::string(" { \"low_power_mode\" : false, \"no_prefetch\" : true, \"affine_to_cpu\" : false },\n");
conf += std::string(" { \"low_power_mode\" : false");
conf += std::string(", \"no_prefetch\" : true, \"asm\" : \"off\", \"affine_to_cpu\" : false },\n");
printer::inst()->print_msg(L0, "Autoconf FAILED: %s. Create config for a single thread.", err.what());
}
......
......@@ -277,7 +277,7 @@ void minethd::work_main()
if((round_ctr++ & 0xF) == 0)
{
globalStates::inst().calc_start_nonce(iNonce, oWork.bNiceHash, h_per_round * 16);
// check if the job is still valid, there is a small posibility that the job is switched
// check if the job is still valid, there is a small possibility that the job is switched
if(globalStates::inst().iGlobalJobNo.load(std::memory_order_relaxed) != iJobNo)
break;
}
......
......@@ -71,17 +71,17 @@ int httpd::req_handler(void * cls,
if (username == NULL)
{
rsp = MHD_create_response_from_buffer(sHtmlAccessDeniedSize, (void*)sHtmlAccessDenied, MHD_RESPMEM_PERSISTENT);
ret = MHD_queue_auth_fail_response(connection, sHttpAuthRelam, sHttpAuthOpaque, rsp, MHD_NO);
ret = MHD_queue_auth_fail_response(connection, sHttpAuthRealm, sHttpAuthOpaque, rsp, MHD_NO);
MHD_destroy_response(rsp);
return ret;
}
free(username);
ret = MHD_digest_auth_check(connection, sHttpAuthRelam, jconf::inst()->GetHttpUsername(), jconf::inst()->GetHttpPassword(), 300);
ret = MHD_digest_auth_check(connection, sHttpAuthRealm, jconf::inst()->GetHttpUsername(), jconf::inst()->GetHttpPassword(), 300);
if (ret == MHD_INVALID_NONCE || ret == MHD_NO)
{
rsp = MHD_create_response_from_buffer(sHtmlAccessDeniedSize, (void*)sHtmlAccessDenied, MHD_RESPMEM_PERSISTENT);
ret = MHD_queue_auth_fail_response(connection, sHttpAuthRelam, sHttpAuthOpaque, rsp, (ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO);
ret = MHD_queue_auth_fail_response(connection, sHttpAuthRealm, sHttpAuthOpaque, rsp, (ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO);
MHD_destroy_response(rsp);
return ret;
}
......
......@@ -113,7 +113,7 @@ extern const char sHtmlCssFile [] =
size_t sHtmlCssSize = sizeof(sHtmlCssFile) - 1;
extern const char sHttpAuthRelam[] = "XMR-Stak-Miner";
extern const char sHttpAuthRealm[] = "XMR-Stak-Miner";
extern const char sHttpAuthOpaque[] = "6c071f0df539e234cadbcd79164af7a594e23ab42bccb834df796aead6ce96e4";
extern const char sHtmlAccessDenied[] =
......
......@@ -7,7 +7,7 @@ extern size_t sHtmlCssSize;
extern const char sHtmlAccessDenied[];
extern size_t sHtmlAccessDeniedSize;
extern const char sHttpAuthRelam[];
extern const char sHttpAuthRealm[];
extern const char sHttpAuthOpaque[];
extern const char sHtmlCommonHeader[];
......
......@@ -23,7 +23,7 @@ POOLCONF],
*
* aeon7 (use this for Aeon's new PoW)
* bbscoin (automatic switch with block version 3 to cryptonight_v7)
* bittube (uses cyrptonight_bittube2 algorithm)
* bittube (uses cryptonight_bittube2 algorithm)
* graft
* haven (automatic switch with block version 3 to cryptonight_haven)
* intense
......@@ -45,7 +45,7 @@ POOLCONF],
* cryptonight_v7
* cryptonight_v8
* # 4MiB scratchpad memory
* cyrptonight_bittube2
* cryptonight_bittube2
* cryptonight_haven
* cryptonight_heavy
*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment