…ompat Conflicts: src/polarssl
Merge into feature/sni-improvements Conflicts: src/polarssl
Pull request #166 Conflicts: tools/filters/Makefile
Just jkarneges pull-request #182 with cleaned-up history
jkarneges pull request #183 Merge commit '3f6070ef8ddd2a05300e542041b56d9d0142fe73' into feature/keep-alive
…remote-addr Pull request #181 In handler mode, set special header REMOTE_ADDR containing the IP address of the requesting client. Setting no_clobber_xff prevents X-FORWARDED-FOR from being touched in handler mode. Proxy mode remains unchanged. REMOTE_ADDR is not set in that context, and X-FORWARDED-FOR is always set/replaced (no_clobber_xff has no effect on proxy mode).
That's what I get for not running tests after merge; bad Jason.
Conflicts: src/connection.c src/connection.h
There really should be a better way, but that will require significant changes to io.c so that we can interrupt a task doing a read. This should work, and will complain in the log when it isn't working.