0c32ff2 httpd/http: pulled changes from downstream

Authored and Committed by jheger 6 years ago
    httpd/http: pulled changes from downstream
    
        
file modified
+17 -5