nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mr_175_squashed'

Browse Source
This commit is contained in:
Nick Mathewson 2020-10-20 09:03:26 -04:00
commit 579f200efc
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket40053 Normal file
View File

@ -0,0 +1,5 @@
o Minor features (logging):
- Consider 301 as an error like a 404 when processing the response to a
request for a group of server descriptors or an extrainfo documents.
Closes ticket 40053.

7
src/feature/dirclient/dirclient.c
View File

@ -2509,9 +2509,12 @@ handle_response_fetch_desc(dir_connection_t *conn,
}
if (status_code != 200) {
int dir_okay = status_code == 404 ||
(status_code == 400 && !strcmp(reason, "Servers unavailable."));
(status_code == 400 && !strcmp(reason, "Servers unavailable.")) ||
status_code == 301;
/* 404 means that it didn't have them; no big deal.
* Older (pre-0.1.1.8) servers said 400 Servers unavailable instead. */
* Older (pre-0.1.1.8) servers said 400 Servers unavailable instead.
* 301 is considered as an error since Tor does not follow redirects,
* which means we failed to reach the server we wanted. */
log_fn(dir_okay ? LOG_INFO : LOG_WARN, LD_DIR,
"Received http status code %d (%s) from server %s "
"while fetching \"/tor/server/%s\". I'll try again soon.",