follow r46491, [Feature #2542] RFC3986