Skip to content

[0.17 MERGE] test merge with upstream #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 23, 2019
Merged

[0.17 MERGE] test merge with upstream #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2da54f5
Cleanup StartRest()
DesWurstes Aug 10, 2018
58efc49
build: bump version to 0.17.99
laanwj Aug 13, 2018
f083ec1
Merge #13938: refactoring: Cleanup StartRest()
Aug 13, 2018
263b377
gitian: bump descriptors for (0.)18
fanquake Aug 13, 2018
62d40f1
Merge #13955: gitian: bump descriptors for (0.)18
Aug 13, 2018
e3388ec
UPSTREAM MERGE: Merge commit '62d40f19836349787ab2d19e1c5213bdf7e0db3…
instagibbs Jan 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "bitcoin-linux-0.17"
name: "bitcoin-linux-0.18"
enable_cache: true
suites:
- "bionic"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "bitcoin-osx-0.17"
name: "bitcoin-osx-0.18"
enable_cache: true
suites:
- "bionic"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "bitcoin-win-0.17"
name: "bitcoin-win-0.18"
enable_cache: true
suites:
- "bionic"
Expand Down
1,049 changes: 6 additions & 1,043 deletions doc/release-notes.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/httprpc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void StopHTTPRPC();
/** Start HTTP REST subsystem.
* Precondition; HTTP and RPC has been started.
*/
bool StartREST();
void StartREST();
/** Interrupt RPC REST subsystem.
*/
void InterruptREST();
Expand Down
3 changes: 1 addition & 2 deletions src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,8 +767,7 @@ static bool AppInitServers()
StartRPC();
if (!StartHTTPRPC())
return false;
if (gArgs.GetBoolArg("-rest", DEFAULT_REST_ENABLE) && !StartREST())
return false;
if (gArgs.GetBoolArg("-rest", DEFAULT_REST_ENABLE)) StartREST();
StartHTTPServer();
return true;
}
Expand Down
3 changes: 1 addition & 2 deletions src/rest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,11 +591,10 @@ static const struct {
{"/rest/getutxos", rest_getutxos},
};

bool StartREST()
void StartREST()
{
for (unsigned int i = 0; i < ARRAYLEN(uri_prefixes); i++)
RegisterHTTPHandler(uri_prefixes[i].prefix, false, uri_prefixes[i].handler);
return true;
}

void InterruptREST()
Expand Down