Skip to content

Commit afed2e9

Browse files
committed
Merge #18810: doc: update rest info on block size and json
ff6549c fix: update rest info on block size and json (Chris Abrams) Pull request description: Addressing the ambiguous block size text in rest docs: bitcoin/bitcoin#18703 Also makes sure to let developers know there is `.json` option for the rest output format. ACKs for top commit: MarcoFalke: ACK ff6549c promag: ACK ff6549c. Tree-SHA512: 9ef93c1432d650b1f9599778ba092c1ca5b084a537af257078e1c713c76c5d3a4cc4b1ede8a2489964be8ed0303ad8bea58c1cb4759bbb9b24dbdebfec8001d3
2 parents 35ef3c1 + ff6549c commit afed2e9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

doc/REST-interface.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ To query for a confirmed transaction, enable the transaction index via "txindex=
3030
Given a block hash: returns a block, in binary, hex-encoded binary or JSON formats.
3131
Responds with 404 if the block doesn't exist.
3232

33-
The HTTP request and response are both handled entirely in-memory, thus making maximum memory usage at least 2.66MB (1 MB max block, plus hex encoding) per request.
33+
The HTTP request and response are both handled entirely in-memory.
3434

3535
With the /notxdetails/ option JSON response will only contain the transaction hash instead of the complete transaction details. The option only affects the JSON response.
3636

src/rest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ static bool rest_headers(HTTPRequest* req,
206206
return true;
207207
}
208208
default: {
209-
return RESTERR(req, HTTP_NOT_FOUND, "output format not found (available: .bin, .hex)");
209+
return RESTERR(req, HTTP_NOT_FOUND, "output format not found (available: .bin, .hex, .json)");
210210
}
211211
}
212212
}

0 commit comments

Comments
 (0)