Merge branch 'upstream-2.17.0'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/commit/999f464e Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/999f464e Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/999f464e Branch: refs/heads/master Commit: 999f464ec79a9a54f59bfeff21728d0bba6e857a Parents: cb521b3 0ab4804 Author: Joan Touzet <jo...@atypical.net> Authored: Sun Feb 18 12:30:55 2018 -0500 Committer: Joan Touzet <jo...@atypical.net> Committed: Sun Feb 18 12:30:55 2018 -0500 ---------------------------------------------------------------------- .editorconfig | 17 +++ .travis.yml | 7 +- CHANGES.md | 74 +++++++++- Makefile | 1 + rebar.config | 7 +- src/mochifmt.erl | 18 +++ src/mochifmt_records.erl | 18 +++ src/mochifmt_std.erl | 18 +++ src/mochiglobal.erl | 20 +++ src/mochihex.erl | 18 +++ src/mochijson.erl | 18 +++ src/mochijson2.erl | 144 +++++++++++++++---- src/mochilists.erl | 18 +++ src/mochilogfile2.erl | 18 +++ src/mochinum.erl | 18 +++ src/mochitemp.erl | 20 ++- src/mochiutf8.erl | 18 +++ src/mochiweb.app.src | 10 +- src/mochiweb.erl | 18 +++ src/mochiweb_acceptor.erl | 18 +++ src/mochiweb_base64url.erl | 22 +++ src/mochiweb_charref.erl | 18 +++ src/mochiweb_clock.erl | 101 +++++++++++++ src/mochiweb_cookies.erl | 18 +++ src/mochiweb_cover.erl | 18 +++ src/mochiweb_echo.erl | 18 +++ src/mochiweb_headers.erl | 18 +++ src/mochiweb_html.erl | 83 ++++++++--- src/mochiweb_http.erl | 77 +++++++--- src/mochiweb_io.erl | 18 +++ src/mochiweb_mime.erl | 18 +++ src/mochiweb_multipart.erl | 22 ++- src/mochiweb_request.erl | 75 +++++++--- src/mochiweb_response.erl | 18 +++ src/mochiweb_session.erl | 23 ++- src/mochiweb_socket.erl | 6 +- src/mochiweb_socket_server.erl | 121 ++++++++-------- src/mochiweb_util.erl | 55 +++++++ src/mochiweb_websocket.erl | 6 +- src/reloader.erl | 20 ++- support/templates/mochiwebapp.template | 2 + support/templates/mochiwebapp_skel/bench.sh | 19 +++ .../mochiwebapp_skel/src/mochiapp_web.erl | 3 + test/mochiweb_base64url_tests.erl | 7 +- test/mochiweb_html_tests.erl | 69 ++++++++- test/mochiweb_test_util.erl | 22 ++- test/mochiweb_test_util.hrl | 2 +- test/mochiweb_tests.erl | 21 ++- 48 files changed, 1220 insertions(+), 178 deletions(-) ----------------------------------------------------------------------
