Holy Cow.  Completely reengineered the web server so that it is based on Apache HTTPCore, not my hokey attempt at manually parsing HTTP feeds.  It also split out where the data was arriving from so that p2p and http can be treated agnostically.

Now to get the P2P actually working with it.