[Pkg-ocaml-maint-commits] [ocsigenserver] 02/11: Merge tag 'upstream/2.5'

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository ocsigenserver.

commit b22a50acc19843a4612bf73d4a01f46fe7c77f49
Merge: 1ac123a 6774986
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Oct 18 11:00:17 2015 +0200

    Merge tag 'upstream/2.5'
    
    Upstream version 2.5

 .jenkins.sh                                        |   17 +
 .ocp-indent                                        |    1 +
 CHANGES                                            |   26 +
 VERSION                                            |    2 +-
 doc/manual-wiki/outputfilter.wiki                  |   15 +-
 doc/manual-wiki/rewritemod.wiki                    |    7 +
 .../ocsigenserver.install => ocsigenserver.install |    0
 opam/opam => opam                                  |   27 +-
 opam/descr                                         |    6 -
 opam/url                                           |    1 -
 src/baselib/dynlink_wrapper.natdynlink.ml          |    2 +-
 src/baselib/dynlink_wrapper.nonatdynlink.ml        |    2 +-
 src/baselib/ocsigen_cache.ml                       |  516 +++----
 src/baselib/ocsigen_cache.mli                      |   88 +-
 src/baselib/ocsigen_commandline.ml                 |    2 +-
 src/baselib/ocsigen_config.ml.in                   |    1 -
 src/baselib/ocsigen_config.mli                     |    6 +-
 src/baselib/ocsigen_lib.ml                         |  138 +-
 src/baselib/ocsigen_lib.mli                        |   18 +-
 src/baselib/ocsigen_lib_base.ml                    |   80 +-
 src/baselib/ocsigen_lib_base.mli                   |    6 +-
 src/baselib/ocsigen_loader.ml                      |   78 +-
 src/baselib/ocsigen_loader.mli                     |   62 +-
 src/baselib/ocsigen_messages.ml                    |  110 +-
 src/baselib/ocsigen_messages.mli                   |   14 +-
 src/baselib/ocsigen_stream.ml                      |  138 +-
 src/baselib/ocsigen_stream.mli                     |   18 +-
 src/baselib/polytables.ml                          |   12 +-
 src/baselib/polytables.mli                         |    2 +-
 src/baselib/tests/test_wrapping.ml                 |   70 +-
 src/extensions/accesscontrol.ml                    |  618 +++++----
 src/extensions/accesscontrol.mli                   |    2 +-
 src/extensions/authbasic.ml                        |  152 +--
 src/extensions/authbasic.mli                       |   38 +-
 src/extensions/cgimod.ml                           |  426 +++---
 src/extensions/cors.ml                             |  213 +--
 src/extensions/deflatemod.ml                       |  318 ++---
 src/extensions/extendconfiguration.ml              |  240 ++--
 src/extensions/extensiontemplate.ml                |  116 +-
 src/extensions/ocsigen_comet.ml                    |  419 +++---
 src/extensions/ocsigen_comet.mli                   |   28 +-
 src/extensions/ocsipersist-dbm/ocsidbm.ml          |  126 +-
 src/extensions/ocsipersist-dbm/ocsidbmtypes.mli    |    2 +-
 src/extensions/ocsipersist-dbm/ocsipersist.ml      |  166 +--
 src/extensions/ocsipersist-sqlite/ocsipersist.ml   |   92 +-
 src/extensions/ocsipersist.mli                     |   32 +-
 src/extensions/outputfilter.ml                     |  182 +--
 src/extensions/redirectmod.ml                      |  186 +--
 src/extensions/revproxy.ml                         |  431 +++---
 src/extensions/rewritemod.ml                       |  149 +-
 src/extensions/staticmod.ml                        |  308 ++---
 src/extensions/userconf.ml                         |  183 +--
 src/http/Makefile                                  |    5 +
 src/http/framepp.ml                                |   96 +-
 src/http/framepp.mli                               |    2 +-
 src/http/http_headers.ml                           |   28 +-
 src/http/http_headers.mli                          |   16 +-
 src/http/http_lexer.mll                            |  194 +--
 src/http/multipart.ml                              |  218 +--
 src/http/multipart.mli                             |   12 +-
 src/http/ocsigen_charset_mime.ml                   |   46 +-
 src/http/ocsigen_charset_mime.mli                  |    2 +-
 src/http/ocsigen_cookies.ml                        |   18 +-
 src/http/ocsigen_cookies.mli                       |   16 +-
 src/http/ocsigen_headers.ml                        |   98 +-
 src/http/ocsigen_headers.mli                       |    6 +-
 src/http/ocsigen_http_com.ml                       |  624 ++++-----
 src/http/ocsigen_http_com.mli                      |   28 +-
 src/http/ocsigen_http_frame.ml                     |  506 +++----
 src/http/ocsigen_http_frame.mli                    |  165 +--
 src/http/ocsigen_senders.ml                        |  854 ++++++------
 src/http/ocsigen_senders.mli                       |   39 +-
 src/http/test_parser.ml                            |    6 +-
 src/http/test_pp.ml                                |   10 +-
 src/server/.depend                                 |   60 +-
 src/server/Makefile                                |    3 +-
 src/server/ocsigen_extensions.ml                   | 1090 +++++++--------
 src/server/ocsigen_extensions.mli                  |  344 ++---
 src/server/ocsigen_http_client.ml                  |  626 +++++----
 src/server/ocsigen_http_client.mli                 |   76 +-
 src/server/ocsigen_local_files.ml                  |   84 +-
 src/server/ocsigen_local_files.mli                 |    6 +-
 src/server/ocsigen_parseconfig.ml                  |  973 ++++++-------
 src/server/ocsigen_parseconfig.mli                 |    7 +-
 src/server/ocsigen_range.ml                        |  243 ++--
 src/server/ocsigen_range.mli                       |    2 +-
 src/server/ocsigen_request_info.ml                 |  347 +++++
 src/server/ocsigen_request_info.mli                |  264 ++++
 src/server/ocsigen_server.ml                       | 1424 ++++++++++----------
 src/server/ocsigen_server.mli                      |    2 +-
 90 files changed, 7552 insertions(+), 6880 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocsigenserver.git