mod_http: Optimize proxy IP check No need to do a subnet match comparison to see if two IP addresses match exactly.

mod_websocket: Inherit security status from http request Allows requests considered secure becasue of a proxy header to carry over to the client session. mod_bosh does this too.

mod_http: Consider x-forwarded-proto from trusted proxies Should be better than setting consider_{bosh,websocket}_secure as that may end up causing actually insecure requests to be considered secure. Doing it here, as with IP, should make this apply to all HTTP modules.

Merge 0.11->trunk

mod_http: Skip IP resolution in non-proxied case Skips doing the whole get_ip_from_request() dance if the request isn't from a proxy at all, even if the client sent the header for some reason.

mod_csi_simple: Fire event when flushing queue To let other plugins know and take some action, e.g. flushing other buffers or whatnot.

mod_csi_simple: Set session state to 'flushing' while doing so May be useful for 3rd party modules.

Merge 0.11->trunk

Tag 0.11.8

mod_pep: Advertise base pubsub feature (fixes #1632) Noticed while discussing feature discovery in Gajim Thanks lovetox