mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-20 21:16:22 +02:00
Merge remote-tracking branch 'tor-gitlab/mr/406'
This commit is contained in:
commit
e79d73de9b
3
changes/ticket40421
Normal file
3
changes/ticket40421
Normal file
@ -0,0 +1,3 @@
|
||||
o Minor bugfixes (onion service):
|
||||
- Send back the extended SOCKS error 0xF6 for a v2 onion address. Fixes bug
|
||||
40421; bugfix on 0.4.6.2-alpha.
|
@ -2536,6 +2536,10 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
|
||||
"https://blog.torproject.org/v2-deprecation-timeline.");
|
||||
control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
|
||||
escaped(socks->address));
|
||||
/* Send back the 0xF6 extended code indicating a bad hostname. This is
|
||||
* mostly so Tor Browser can make a proper UX with regards to v2
|
||||
* addresses. */
|
||||
conn->socks_request->socks_extended_error_code = SOCKS5_HS_BAD_ADDRESS;
|
||||
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
|
||||
return -1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user