Merge remote branch 'github/pr/101' This closes #101
Signed-off-by: ILYA Khlopotov <iil...@ca.ibm.com> Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/ad754a38 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/ad754a38 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/ad754a38 Branch: refs/heads/master Commit: ad754a387aa884daa0e3c1ff255f51e18ba75c0e Parents: 41ac33a 02bdd77 Author: ILYA Khlopotov <iil...@ca.ibm.com> Authored: Thu Mar 3 12:01:54 2016 -0800 Committer: ILYA Khlopotov <iil...@ca.ibm.com> Committed: Thu Mar 3 12:01:54 2016 -0800 ---------------------------------------------------------------------- src/chttpd.erl | 29 ++++++++++++++--------------- src/chttpd_cors.erl | 41 +++++++++++++++++++++++++++++++++-------- src/chttpd_external.erl | 9 ++++----- 3 files changed, 51 insertions(+), 28 deletions(-) ----------------------------------------------------------------------