Improved handling of request URI to prevent endless looping.
Authored by: aktion-hip 2009-01-21
Parent: [r544]
Child: [r546]