Skip to content

Commit df8ee33

Browse files
committed
Fix two cases where sphinx detected URLs where it should not.
1 parent a104a2b commit df8ee33

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

doc/sphinx/phk/ipv6suckage.rst

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,16 @@ webserver on the same machine.
3737
No worries, says the power that controls what URLs look like, we
3838
will just stick the port number after the IP# with a colon:
3939

40+
.. code-block:: text
41+
4042
http://192.168.0.1:8080/...
4143
4244
That obviously does not work with IPv6, so RFC3986 comes around and
4345
says "darn, we didn't think of that" and puts the IPV6 address in
4446
[...] giving us:
4547

48+
.. code-block:: text
49+
4650
http://[1080::8:800:200C:417A]:8080/
4751
4852
Remember that "harmless in shells" detail ? Yeah, sorry about that.
@@ -55,11 +59,15 @@ even need to know if it is a IPv4 or IPv6 address in the first place.
5559
But it returns the IP# in one buffer and the port number in another,
5660
so if you want to format the sockaddr in the by RFC5952 recommended
5761
way (the same as RFC3986), you need to inspect the version field
58-
in the sockaddr to see if you should do
62+
in the sockaddr to see if you should do:
63+
64+
.. code-block:: text
5965
6066
"%s:%s", host, port
6167
62-
or
68+
or:
69+
70+
.. code-block:: text
6371
6472
"[%s]:%s", host, port
6573

doc/sphinx/reference/varnishncsa.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ SIGNALS
237237
NOTES
238238
=====
239239

240-
The %r formatter is equivalent to "%m http://%{Host}i%U%q %H". This
240+
The %r formatter is equivalent to ``%m http://%{Host}i%U%q %H``. This
241241
differs from apache's %r behavior, equivalent to "%m %U%q %H".
242242
Furthermore, when using the %r formatter, if the Host header appears
243243
multiple times in a single transaction, the first occurrence is used.

0 commit comments

Comments
 (0)