Improve the algorithm for command line options in Server.
Authored by: debiadastra 2012-01-31
Parent: [r17]
Child: [r19]