mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-19 18:00:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix torrc-format documentation corner cases

Browse Source 
We don't require that the final line be terminated, and we open
windows torrc files in text mode.

Closes ticket 22795.
This commit is contained in:
Nick Mathewson 2017-09-12 16:32:56 -04:00
parent 6ff6738963
commit 9c27f56cd9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/torrc_format.txt
View File

@ -18,9 +18,10 @@ does, not what it should do.
; specified in RFC5234. ; specified in RFC5234.
; A file is interpreted as every Entry in the file, in order. ; A file is interpreted as every Entry in the file, in order.
TorrcFile = *Line TorrcFile = *Line [ UnterminatedLine ]
Line = BlankLine / Entry Line = BlankLine LF / Entry LF
UnterminatedLine = BlankLine / Entry
BlankLine = *WSP OptComment LF BlankLine = *WSP OptComment LF
BlankLine =/ *WSP LF BlankLine =/ *WSP LF
@ -69,6 +70,12 @@ does, not what it should do.
; Anything besides NUL and LF ; Anything besides NUL and LF
NonLF = %x01-%x09 / %x0b - %xff NonLF = %x01-%x09 / %x0b - %xff
; Note that on windows, we open our configuration files in "text" mode,
; which causes CRLF pairs to be interpreted as LF. So, on windows:
; LF = [ %x0d ] %x0a
; but everywhere else,
LF = %0x0a
OCTDIG = '0' - '7' OCTDIG = '0' - '7'
KC = Any character except an isspace() character or '#' or NUL KC = Any character except an isspace() character or '#' or NUL