改进代码，使之与servlet 2.5兼容。
Merge branch 'dev-3.2.2' into dev-3.1.4
Merge branch 'dev-3.1.4' into dev-3.0.12